redux-vue 0.8.0 → 0.8.1

package/.babelrc

@@ -1,3 +1,4 @@
 {
-  "presets": [["@babel/preset-env", { "targets": { "node": "current" } }]]
+  "presets": [["@babel/preset-env", { "targets": { "node": "current" } }]],
+  "plugins": ["@babel/plugin-proposal-export-default-from"]
 }

package/lib/connect.js

@@ -0,0 +1,128 @@
+import normalizeProps from './normalizeProps';
+function noop() {}
+function getStore(component) {
+  return component.$store;
+}
+function getAttrs(component) {
+  // issue #6: guard against missing attrs (root component has no _parentVnode attrs)
+  const vnode = component._self.$options._parentVnode;
+  return vnode && vnode.data && vnode.data.attrs || {};
+}
+function getStates(component, mapStateToProps) {
+  const store = getStore(component);
+  const attrs = getAttrs(component);
+  return mapStateToProps(store.getState(), attrs) || {};
+}
+function getActions(component, mapActionsToProps) {
+  const store = getStore(component);
+  return mapActionsToProps(store.dispatch, getAttrs.bind(null, component)) || {};
+}
+function getProps(component) {
+  const attrs = getAttrs(component);
+  const stateNames = component.vuaReduxStateNames;
+  const actionNames = component.vuaReduxActionNames;
+  const mergedNames = component.vuaReduxMergedNames;
+
+  // mergeProps path: only expose merged keys
+  if (mergedNames) {
+    const props = {};
+    for (let ii = 0; ii < mergedNames.length; ii++) {
+      props[mergedNames[ii]] = component[mergedNames[ii]];
+    }
+    return {
+      ...props,
+      ...attrs
+    };
+  }
+  const props = {};
+  for (let ii = 0; ii < stateNames.length; ii++) {
+    props[stateNames[ii]] = component[stateNames[ii]];
+  }
+  for (let ii = 0; ii < actionNames.length; ii++) {
+    props[actionNames[ii]] = component[actionNames[ii]];
+  }
+  return {
+    ...props,
+    ...attrs
+  };
+}
+
+/**
+ * @param mapStateToProps
+ * @param mapActionsToProps
+ * @param mergeProps - optional; receives (stateProps, dispatchProps) -> props
+ * @returns Function (children) => VueComponentDescriptor
+ */
+export default function connect(mapStateToProps, mapActionsToProps, mergeProps) {
+  mapStateToProps = mapStateToProps || noop;
+  mapActionsToProps = mapActionsToProps || noop;
+  return children => {
+    /** @namespace children.collect */
+    if (children.collect) {
+      children.props = {
+        ...normalizeProps(children.props || {}),
+        ...normalizeProps(children.collect || {})
+      };
+      const msg = `vua-redux: collect is deprecated, use props ` + `in ${children.name || 'anonymous'} component`;
+      console.warn(msg);
+    }
+    return {
+      name: `ConnectVuaRedux-${children.name || 'children'}`,
+      render(h) {
+        const props = getProps(this);
+        // issue #3: forward $slots to child
+        return h(children, {
+          props,
+          slots: this.$slots
+        });
+      },
+      data() {
+        const state = getStates(this, mapStateToProps);
+        const actions = getActions(this, mapActionsToProps);
+        if (mergeProps) {
+          // PR #5: mergeProps support
+          const merged = mergeProps(state, actions) || {};
+          const mergedNames = Object.keys(merged);
+          return {
+            ...merged,
+            vuaReduxMergedNames: mergedNames,
+            vuaReduxStateNames: [],
+            vuaReduxActionNames: []
+          };
+        }
+        const stateNames = Object.keys(state);
+        const actionNames = Object.keys(actions);
+        return {
+          ...state,
+          ...actions,
+          vuaReduxStateNames: stateNames,
+          vuaReduxActionNames: actionNames
+        };
+      },
+      created() {
+        const store = getStore(this);
+        this.vuaReduxUnsubscribe = store.subscribe(() => {
+          const state = getStates(this, mapStateToProps);
+          const actions = getActions(this, mapActionsToProps);
+          if (mergeProps) {
+            const merged = mergeProps(state, actions) || {};
+            const mergedNames = Object.keys(merged);
+            this.vuaReduxMergedNames = mergedNames;
+            for (let ii = 0; ii < mergedNames.length; ii++) {
+              this[mergedNames[ii]] = merged[mergedNames[ii]];
+            }
+            return;
+          }
+          const stateNames = Object.keys(state);
+          this.vuaReduxStateNames = stateNames;
+          for (let ii = 0; ii < stateNames.length; ii++) {
+            this[stateNames[ii]] = state[stateNames[ii]];
+          }
+        });
+      },
+      beforeDestroy() {
+        this.vuaReduxUnsubscribe();
+      }
+    };
+  };
+}

package/lib/index.js

@@ -0,0 +1,2 @@
+export { default as connect } from './connect';
+export { default as reduxStorePlugin } from './reduxStorePlugin';

package/lib/normalizeProps.js

@@ -0,0 +1,34 @@
+const isArray = Array.isArray;
+const isPlainObject = v => v !== null && typeof v === 'object' && Object.getPrototypeOf(v) === Object.prototype;
+
+// https://github.com/vuejs/vue/blob/dev/src/util/options.js
+export default function normalizeProps(props) {
+  var i,
+    val,
+    normalizedProps = {};
+  if (isArray(props)) {
+    i = props.length;
+    while (i--) {
+      val = props[i];
+      if (typeof val === 'string') {
+        normalizedProps[val] = null;
+      } else if (val.name) {
+        normalizedProps[val.name] = val;
+      }
+    }
+  } else if (isPlainObject(props)) {
+    var keys = Object.keys(props);
+    i = keys.length;
+    while (i--) {
+      let key = keys[i];
+      val = props[key];
+      normalizedProps[key] = props[key];
+      if (typeof val === 'function') {
+        normalizedProps[key] = {
+          type: val
+        };
+      }
+    }
+  }
+  return normalizedProps;
+}

package/lib/reduxStorePlugin.js

@@ -0,0 +1,13 @@
+export default function reduxStorePlugin(Vue, storeId = 'store') {
+  Vue.mixin({
+    beforeCreate() {
+      const options = this.$options;
+      // store injection
+      if (options[storeId]) {
+        this.$store = options.store;
+      } else if (options.parent && options.parent.$store) {
+        this.$store = options.parent.$store;
+      }
+    }
+  });
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "redux-vue",
-  "version": "0.8.0",
+  "version": "0.8.1",
   "description": "Vue Redux binding higher order component",
   "author": "Nadim Tuhin",
   "repository": {
@@ -26,7 +26,9 @@
     "immutable"
   ],
   "devDependencies": {
+    "@babel/cli": "^8.0.1",
     "@babel/core": "^8.0.1",
+    "@babel/plugin-proposal-export-default-from": "^8.0.1",
     "@babel/preset-env": "^8.0.2",
     "@babel/register": "^8.0.1",
     "expect": "^1.20.2",