Fix the remaining dependency on the Store function name (#16)

Author: gaearon

examples/counter/App.js

@@ -8,7 +8,8 @@ import Counter from './Counter';
 export default class CounterApp extends Component {
   render() {
     return (
-      <Container stores={[stores.counterStore]} actions={{ increment, decrement }}>
+      <Container stores={[stores.counterStore]}
+                 actions={{ increment, decrement }}>
         {props => <Counter {...props} />}
       </Container>
     );

examples/counter/stores/index.js

@@ -1 +1 @@
-export counterStore from './counterStore';
+export counterStore from './counterStore';

src/Container.js

@@ -1,6 +1,8 @@
 import { Component, PropTypes } from 'react';
 import mapValues from 'lodash/object/mapValues';
 import identity from 'lodash/utility/identity';
+import invariant from 'invariant';
+import isPlainObject from 'lodash/lang/isPlainObject';
 
 export default class ReduxContainer extends Component {
   static contextTypes = {
@@ -33,18 +35,29 @@ export default class ReduxContainer extends Component {
   }
 
   update(props) {
-    const { wrapActionCreator, observeStores } = this.context.redux;
+    const { stores, actions } = props;
+    invariant(
+      isPlainObject(actions) &&
+      Object.keys(actions).every(key => typeof actions[key] === 'function'),
+      '"actions" must be a plain object with functions as values. Did you misspell an import?'
+    );
+    invariant(
+      Array.isArray(stores) &&
+      stores.every(s => typeof s === 'function'),
+      '"stores" must be an array of functions. Did you misspell an import?'
+    );
+
+    const { wrapActionCreator, observeStores, getStoreKey } = this.context.redux;
     this.actions = mapValues(props.actions, wrapActionCreator);
+
     if (this.unsubscribe) {
       this.unsubscribe();
     }
 
-    const { stores } = props;
-    const mapState = (stores.length === 1) ?
-      state => state[stores[0].name] :
+    this.mapState = (stores.length === 1) ?
+      state => state[getStoreKey(stores[0])] :
       identity;
 
-    this.mapState = mapState;
     this.unsubscribe = observeStores(stores, this.handleChange);
   }
 

src/createDispatcher.js

@@ -81,13 +81,16 @@ export default function createDispatcher() {
     dispatch(BOOTSTRAP_STORE);
   }
 
+  // Get the key a store was registered with
+  function getStoreKey(store) {
+    const key = storeKeys[store];
+    invariant(key, 'This store is not registered with the Redux root: %s', store);
+    return key;
+  }
+
   // Provide subscription and unsubscription
   function observeStores(observedStores, onChange) {
-    const observedKeys = observedStores.map(store => {
-      const key = storeKeys[store];
-      invariant(key, 'This store is not registered with the Redux root: %s', store);
-      return key;
-    });
+    const observedKeys = observedStores.map(getStoreKey);
 
     // Emit the state update
     function handleChange() {
@@ -128,6 +131,7 @@ export default function createDispatcher() {
   return {
     wrapActionCreator,
     observeStores,
-    receiveStores
+    receiveStores,
+    getStoreKey
   };
 }