v0.5.8

* fix(orderedReducer): `CLEAR_DATA` action correctly clears `ordered` state for actions dispatched without meta - #114
* fix(tests): update orderedReducer tests to include case of `CLEAR_DATA` action dispatched without `meta` - #114
* fix(typings): make `otherConfig` optional for `reduxFirestore` (store enhancer) in typings - @am17torres

Author: prescottprue

index.d.ts

@@ -85,12 +85,12 @@ export const constants: {
  * A redux store enhancer that adds store.firebase (passed to React component
  * context through react-redux's <Provider>).
  */
-export function reduxFirestore(firebaseInstance: object, otherConfig: object): any;
+export function reduxFirestore(firebaseInstance: object, otherConfig?: object): any;
 
 /**
  * Get extended firestore instance (attached to store.firestore)
  */
-export function getFirestore(firebaseInstance: object, otherConfig: object): any;
+export function getFirestore(firebaseInstance: object, otherConfig?: object): any;
 
 /**
  * A redux store reducer for Firestore state

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "redux-firestore",
-  "version": "0.5.7",
+  "version": "0.5.8",
   "description": "Redux bindings for Firestore.",
   "main": "lib/index.js",
   "module": "es/index.js",

package.json

@@ -230,12 +230,8 @@ const orderedCollectionReducer = createReducer(undefined, actionHandlers);
  * @return {Object} Ordered state after reduction
  */
 export default function orderedReducer(state = {}, action) {
-  // Return state if action is malformed (i.e. no type, or valid meta)
-  if (
-    !action.type ||
-    !action.meta ||
-    (!action.meta.storeAs && !action.meta.collection)
-  ) {
+  // Return state if action is malformed (i.e. no type)
+  if (!action.type) {
     return state;
   }
 
@@ -253,6 +249,11 @@ export default function orderedReducer(state = {}, action) {
     return state;
   }
 
+  // Return state if action does not contain valid meta
+  if (!action.meta || (!action.meta.storeAs && !action.meta.collection)) {
+    return state;
+  }
+
   const storeUnderKey = action.meta.storeAs || action.meta.collection;
   const collectionStateSlice = get(state, storeUnderKey);
   return {

src/reducers/orderedReducer.js

@@ -587,17 +587,14 @@ describe('orderedReducer', () => {
       it('removes all data from state', () => {
         action = {
           type: actionTypes.CLEAR_DATA,
-          meta: { collection: 'testing' }, // meta is required to trigger ordered reducer
         };
-        state = {};
-        expect(orderedReducer(state, action)).to.be.empty;
+        state = { some: [{ id: 'thing' }] };
         expect(orderedReducer(state, action)).to.be.empty;
       });
 
       it('sets a new reference when clearing', () => {
         action = {
           type: actionTypes.CLEAR_DATA,
-          meta: { collection: 'testing' }, // meta is required to trigger ordered reducer
         };
         state = {};
         expect(orderedReducer(state, action)).to.not.equal(state);
@@ -606,9 +603,7 @@ describe('orderedReducer', () => {
       describe('preserve parameter', () => {
         it('array saves keys from state', () => {
           action = {
-            meta: { collection: 'testing' }, // meta is required to trigger ordered reducer
             type: actionTypes.CLEAR_DATA,
-            payload: {},
             preserve: { ordered: ['some'] },
           };
           state = { some: 'value' };
@@ -617,9 +612,7 @@ describe('orderedReducer', () => {
 
         it('function returns state to save', () => {
           action = {
-            meta: { collection: 'testing' }, // meta is required to trigger ordered reducer
             type: actionTypes.CLEAR_DATA,
-            payload: {},
             preserve: { ordered: currentState => currentState },
           };
           state = { some: 'value' };