v0.6.0

* feat(query): composite `storeAs` - @demoran23
* feat(build): publishing to npm now happens using node 10
* fix(reducers): correctly update state for docs with keys that contain a dot when using storeAs - @compojoom
* feat(query): consolidate oneListenerPerPath and allowMultipleListeners logic - @alexmattson
* feat(query): initial support for populate - #48, [RRF 362](prescottprue/react-redux-firebase#362)
* fix(deps): remove `@types/lodash` from dev dependencies
* fix(deps): update to babel7

Author: prescottprue

.babelrc

@@ -1,17 +1,24 @@
 {
   "presets": [
-    "react",
-    ["env", {
-      "targets": {
-        "chrome": 52,
-        "browsers": ["last 2 versions", "safari >= 7"]
+    "@babel/preset-react",
+    [
+      "@babel/preset-env",
+      {
+        "targets": {
+          "chrome": 52,
+          "browsers": [
+            "last 2 versions",
+            "safari >= 7"
+          ]
+        }
       }
-    }]
+    ]
   ],
   "plugins": [
     "lodash",
-    "transform-object-rest-spread",
-    "transform-object-assign",
+    "@babel/plugin-transform-runtime",
+    "@babel/plugin-transform-async-to-generator",
+    "@babel/plugin-transform-regenerator"
   ],
   "env": {
     "es": {
@@ -28,8 +35,6 @@
     },
     "test": {
       "plugins": [
-        "transform-runtime",
-        "transform-async-to-generator",
         ["module-resolver", {
          "root": ["./src"]
        }]

.editorconfig

@@ -0,0 +1,13 @@
+# EditorConfig is awesome: http://EditorConfig.org
+
+# top-most EditorConfig file
+root = true
+
+# Unix-style newlines with a newline ending every file
+[*]
+end_of_line = lf
+indent_style = space
+
+[*.{js,jsx}]
+insert_final_newline = true
+indent_size = 2

.eslintrc

@@ -20,3 +20,4 @@ rules:
   no-confusing-arrow: 0
   no-case-declarations: 0
   arrow-parens: [2, "as-needed"]
+  prefer-default-export: 0

.gitignore

@@ -5,3 +5,4 @@ es
 *.log
 coverage
 .idea
+.DS_Store

.travis.yml

@@ -3,9 +3,9 @@ sudo: false
 language: node_js
 
 node_js:
-  - 6.14.0 # Cloud Functions Runtime
-  - 9
-  - 10
+  - 6 # Maintenance
+  - 8 # Active
+  - 10 # Current release
 
 notifications:
   email:
@@ -14,21 +14,14 @@ notifications:
     on_success: change
 
 cache:
+  bundler: true
   directories:
-    - node_modules
+    - $HOME/.npm
 
 branches:
   only:
     - master
-
-deploy:
-  skip_cleanup: true
-  provider: npm
-  email: $NPM_EMAIL
-  api_key: $NPM_KEY
-  on:
-    node: '10'
-    branch: 'master'
+    - next
 
 script:
   - npm run lint
@@ -37,3 +30,20 @@ script:
 after_success:
   - codeclimate-test-reporter < coverage/lcov.info
   - npm run codecov
+
+deploy:
+  - provider: npm
+    skip_cleanup: true
+    email: $NPM_EMAIL
+    api_key: $NPM_TOKEN
+    on:
+      node: '10'
+      branch: 'master'
+  - provider: npm
+    skip_cleanup: true
+    email: $NPM_EMAIL
+    api_key: $NPM_TOKEN
+    tag: next
+    on:
+      node: '10'
+      branch: 'next'

README.md

@@ -114,7 +114,7 @@ const enhance = compose(
       props.store.firestore.add('todos', { ...newTodo, owner: 'Anonymous' }),
   }),
   lifecycle({
-    componentWillMount(props) {
+    componentDidMount(props) {
       props.loadData()
     }
   }),
@@ -142,7 +142,7 @@ class Todos extends Component {
     store: PropTypes.object.isRequired
   }
 
-  componentWillMount () {
+  componentDidMount () {
     const { firestore } = this.context.store
     firestore.get('todos')
   }
@@ -251,7 +251,7 @@ After setting a listener/multiple listeners, you can unset them with the followi
 ```js
 store.firestore.unsetListener({ collection: 'cities' }),
 // of for any number of listeners at once :
-store.firestore.unsetListeners([query1Options, query2Options]), 
+store.firestore.unsetListeners([query1Options, query2Options]),
 // here query1Options as in { collection: 'cities' } for example
 ```
 
@@ -305,6 +305,21 @@ Multiple `where` queries are as simple as passing multiple argument arrays (each
 },
 ```
 
+Firestore doesn't alow you to create `or` style queries.  Instead, you should pass in multiple queries and compose your data.
+
+``` javascript
+['sally', 'john', 'peter'].map(friendId => ({
+  collection: 'users',
+  where: [
+    ['id', '==', friendId],
+    ['isOnline', '==', true]
+  ]
+  storeAs: 'onlineFriends'
+}));
+```
+
+Since the results must be composed, a query like this is unable to be properly ordered.  The results should be pulled from `data`. 
+
 *Can only be used with collections*
 
 ##### orderBy
@@ -432,16 +447,16 @@ Storing data under a different path within redux is as easy as passing the `stor
 Other Firebase statics (such as [FieldValue](https://firebase.google.com/docs/reference/js/firebase.firestore.FieldValue)) are available through the firestore instance:
 
 ```js
+import PropTypes from 'prop-types'
 import { connect } from 'react-redux'
 import {
   compose,
   withHandlers,
-  lifecycle,
   withContext,
   getContext
 } from 'recompose'
 
-const withFirestore = compose(
+const withStore = compose(
   withContext({ store: PropTypes.object }, () => {}),
   getContext({ store: PropTypes.object }),
 )
@@ -462,6 +477,82 @@ const enhance = compose(
 export default enhance(SomeComponent)
 ```
 
+### Population
+Population, made popular in [react-redux-firebase](http://react-redux-firebase.com/docs/recipes/populate.html), also works with firestore.
+
+
+#### Automatic Listeners
+```js
+import { connect } from 'react-redux'
+import { firestoreConnect, populate } from 'react-redux-firebase'
+import {
+  compose,
+  withHandlers,
+  lifecycle,
+  withContext,
+  getContext
+} from 'recompose'
+
+const populates = [{ child: 'createdBy', root: 'users' }]
+const collection = 'projects'
+
+const withPopulatedProjects = compose(
+  firestoreConnect((props) => [
+    {
+      collection,
+      populates
+    }
+  ]),
+  connect((state, props) => ({
+    projects: populate(state.firestore, collection, populates)
+  }))
+)
+```
+
+#### Manually using setListeners
+```js
+import { withFirestore, populate } from 'react-redux-firebase'
+import { connect } from 'react-redux'
+import { compose, lifecycle } from 'recompose'
+
+const collection = 'projects'
+const populates = [{ child: 'createdBy', root: 'users' }]
+
+const enhance = compose(
+  withFirestore,
+  lifecycle({
+    componentDidMount() {
+      this.props.firestore.setListener({ collection, populates })
+    }
+  }),
+  connect(({ firestore }) => ({ // state.firestore
+    todos: firestore.ordered.todos,
+  }))
+)
+```
+
+#### Manually using get
+```js
+import { withFirestore, populate } from 'react-redux-firebase'
+import { connect } from 'react-redux'
+import { compose, lifecycle } from 'recompose'
+
+const collection = 'projects'
+const populates = [{ child: 'createdBy', root: 'users' }]
+
+const enhance = compose(
+  withFirestore,
+  lifecycle({
+    componentDidMount() {
+      this.props.store.firestore.get({ collection, populates })
+    }
+  }),
+  connect(({ firestore }) => ({ // state.firestore
+    todos: firestore.ordered.todos,
+  }))
+)
+```
+
 ## Config Options
 Optional configuration options for redux-firestore, provided to reduxFirestore enhancer as optional second argument. Combine any of them together in an object.
 
@@ -480,11 +571,6 @@ Default: `false`
 
 Whether or not to allow multiple listeners to be attached for the same query. If a function is passed the arguments it receives are `listenerToAttach`, `currentListeners`, and the function should return a boolean.
 
-#### oneListenerPerPath
-Default: `false`
-
-If set to true redux-firestore will attach a listener on the same path just once & will count how many the listener was set. When you try to unset the listener, it won't unset until you have less than 1 listeners on this path
-
 #### preserveOnDelete
 Default: `null`
 

examples/basic/jsconfig.json

@@ -0,0 +1,9 @@
+{
+  "compilerOptions": {
+    "baseUrl": "./src"
+  },
+  "exclude": [
+    "node_modules",
+    "public",
+  ]
+}

jsconfig.json

@@ -0,0 +1,17 @@
+{
+  "compilerOptions": {
+    "baseUrl": "./src",
+    "paths": {
+      "utils/*": [
+        "utils/*",
+      ]
+    }
+  },
+  "exclude": [
+    "node_modules",
+    "dist",
+    "es",
+    "lib",
+    "coverage"
+  ]
+}