Rename arguments

Author: gaearon

src/components/createConnect.js

@@ -5,11 +5,11 @@ import isPlainObject from '../utils/isPlainObject';
 import wrapActionCreators from '../utils/wrapActionCreators';
 import invariant from 'invariant';
 
-const emptySelector = () => ({});
-const defaultBinder = dispatch => ({ dispatch });
-const identityMerge = (slice, actionsCreators, props) => ({
+const defaultMapState = () => ({});
+const defaultMapDispatch = dispatch => ({ dispatch });
+const defaultMergeProps = (stateSlice, actionsCreators, props) => ({
   ...props,
-  ...slice,
+  ...stateSlice,
   ...actionsCreators
 });
 
@@ -22,16 +22,14 @@ export default function createConnect(React) {
   const storeShape = createStoreShape(PropTypes);
 
   return function connect(
-    select,
-    dispatchBinder = defaultBinder,
-    mergeHandler = identityMerge
+    mapState = defaultMapState,
+    mapDispatchOrActionCreators = defaultMapDispatch,
+    mergeProps = defaultMergeProps
   ) {
-    const shouldSubscribe = select ? true : false;
-    const selectState = select || emptySelector;
-    const bindDispatch = isPlainObject(dispatchBinder) ?
-      wrapActionCreators(dispatchBinder) :
-      dispatchBinder;
-    const merge = mergeHandler;
+    const shouldSubscribe = mapState !== defaultMapState;
+    const mapDispatch = isPlainObject(mapDispatchOrActionCreators) ?
+      wrapActionCreators(mapDispatchOrActionCreators) :
+      mapDispatchOrActionCreators;
 
     return DecoratedComponent => class ConnectDecorator extends Component {
       static displayName = `Connect(${getDisplayName(DecoratedComponent)})`;
@@ -63,8 +61,8 @@ export default function createConnect(React) {
         super(props, context);
         this.setUnderlyingRef = ::this.setUnderlyingRef;
         this.state = {
-          ...this.selectState(props, context),
-          ...this.bindDispatch(context)
+          ...this.mapState(props, context),
+          ...this.mapDispatch(context)
         };
       }
 
@@ -82,32 +80,32 @@ export default function createConnect(React) {
       }
 
       handleChange(props = this.props) {
-        const nextState = this.selectState(props, this.context);
+        const nextState = this.mapState(props, this.context);
         if (!this.isSliceEqual(this.state.slice, nextState.slice)) {
           this.setState(nextState);
         }
       }
 
-      selectState(props = this.props, context = this.context) {
+      mapState(props = this.props, context = this.context) {
         const state = context.store.getState();
-        const slice = selectState(state);
+        const slice = mapState(state);
 
         invariant(
           isPlainObject(slice),
-          'The return value of `select` prop must be an object. Instead received %s.',
+          '`mapState` must return an object. Instead received %s.',
           slice
         );
 
         return { slice };
       }
 
-      bindDispatch(context = this.context) {
+      mapDispatch(context = this.context) {
         const { dispatch } = context.store;
-        const actionCreators = bindDispatch(dispatch);
+        const actionCreators = mapDispatch(dispatch);
 
         invariant(
           isPlainObject(actionCreators),
-          'The return value of `bindDispatch` prop must be an object. Instead received %s.',
+          '`mapDispatch` must return an object. Instead received %s.',
           actionCreators
         );
 
@@ -116,11 +114,11 @@ export default function createConnect(React) {
 
       merge(props = this.props, state = this.state) {
         const { slice, actionCreators } = state;
-        const merged = merge(slice, actionCreators, props);
+        const merged = mergeProps(slice, actionCreators, props);
 
         invariant(
           isPlainObject(merged),
-          'The return value of `merge` prop must be an object. Instead received %s.',
+          '`mergeProps` must return an object. Instead received %s.',
           merged
         );
 

test/components/connect.spec.js

@@ -244,7 +244,7 @@ describe('React', () => {
       expect(decorated.subscribed).toBe(true);
     });
 
-    it('should not subscribe to stores if select argument is falsy', () => {
+    it('should not subscribe to stores if mapState argument is falsy', () => {
       const store = createStore(() => ({
         foo: 'bar'
       }));
@@ -346,12 +346,12 @@ describe('React', () => {
       expect(spy.calls.length).toBe(3);
     });
 
-    it('should throw an error if select, bindDispatch, or merge returns anything but a plain object', () => {
+    it('should throw an error if mapState, mapDispatch, or mergeProps returns anything but a plain object', () => {
       const store = createStore(() => ({}));
 
-      function makeContainer(select, bindActionCreators, merge) {
+      function makeContainer(mapState, mapDispatch, mergeProps) {
         return React.createElement(
-          @connect(select, bindActionCreators, merge)
+          @connect(mapState, mapDispatch, mergeProps)
           class Container extends Component {
             render() {
               return <div />;
@@ -368,71 +368,71 @@ describe('React', () => {
             { () => makeContainer(() => 1, () => ({}), () => ({})) }
           </Provider>
         );
-      }).toThrow(/select/);
+      }).toThrow(/mapState/);
 
       expect(() => {
         TestUtils.renderIntoDocument(
           <Provider store={store}>
             { () => makeContainer(() => 'hey', () => ({}), () => ({})) }
           </Provider>
         );
-      }).toThrow(/select/);
+      }).toThrow(/mapState/);
 
       expect(() => {
         TestUtils.renderIntoDocument(
           <Provider store={store}>
             { () => makeContainer(() => new AwesomeMap(), () => ({}), () => ({})) }
           </Provider>
         );
-      }).toThrow(/select/);
+      }).toThrow(/mapState/);
 
       expect(() => {
         TestUtils.renderIntoDocument(
           <Provider store={store}>
             { () => makeContainer(() => ({}), () => 1, () => ({})) }
           </Provider>
         );
-      }).toThrow(/bindDispatch/);
+      }).toThrow(/mapDispatch/);
 
       expect(() => {
         TestUtils.renderIntoDocument(
           <Provider store={store}>
             { () => makeContainer(() => ({}), () => 'hey', () => ({})) }
           </Provider>
         );
-      }).toThrow(/bindDispatch/);
+      }).toThrow(/mapDispatch/);
 
       expect(() => {
         TestUtils.renderIntoDocument(
           <Provider store={store}>
             { () => makeContainer(() => ({}), () => new AwesomeMap(), () => ({})) }
           </Provider>
         );
-      }).toThrow(/bindDispatch/);
+      }).toThrow(/mapDispatch/);
 
       expect(() => {
         TestUtils.renderIntoDocument(
           <Provider store={store}>
             { () => makeContainer(() => ({}), () => ({}), () => 1) }
           </Provider>
         );
-      }).toThrow(/merge/);
+      }).toThrow(/mergeProps/);
 
       expect(() => {
         TestUtils.renderIntoDocument(
           <Provider store={store}>
             { () => makeContainer(() => ({}), () => ({}), () => 'hey') }
           </Provider>
         );
-      }).toThrow(/merge/);
+      }).toThrow(/mergeProps/);
 
       expect(() => {
         TestUtils.renderIntoDocument(
           <Provider store={store}>
             { () => makeContainer(() => ({}), () => ({}), () => new AwesomeMap()) }
           </Provider>
         );
-      }).toThrow(/merge/);
+      }).toThrow(/mergeProps/);
     });
 
     it('should set the displayName correctly', () => {