@mpxjs/core 2.7.18 → 2.7.25

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mpxjs/core",
-  "version": "2.7.18",
+  "version": "2.7.25",
   "description": "mpx runtime core",
   "keywords": [
     "miniprogram",
@@ -41,5 +41,5 @@
     "url": "https://github.com/didi/mpx/issues"
   },
   "sideEffects": false,
-  "gitHead": "5cca51d77d97143319c895dab301ef9a789ce40f"
+  "gitHead": "0bcd275c2d8a3fe33ba383b5c2b53e1988217f9e"
 }

package/src/core/mapStore.js

@@ -9,23 +9,34 @@ function mapFactory (type, store) {
   return function (depPath, maps) {
     maps = normalizeMap(depPath, maps)
     const result = {}
-    for (let key in maps) {
+    Object.entries(maps).forEach(([key, value]) => {
       result[key] = function (payload) {
-        const value = maps[key]
-        if (type === 'mutations') {
-          return store.commit(value, payload)
-        } else if (type === 'actions') {
-          return store.dispatch(value, payload)
-        } else {
-          let getterVal = getByPath(store.getters, value, '', '__NOTFOUND__')
-          if (getterVal === '__NOTFOUND__') {
-            warn(`Unknown getter named [${value}].`)
-            getterVal = ''
-          }
-          return getterVal
+        switch (type) {
+          case 'state':
+            if (typeof value === 'function') {
+              return value.call(this, store.state, store.getters)
+            } else {
+              let stateVal = getByPath(store.state, value, '', '__NOTFOUND__')
+              if (stateVal === '__NOTFOUND__') {
+                warn(`Unknown state named [${value}].`)
+                stateVal = ''
+              }
+              return stateVal
+            }
+          case 'getters':
+            let getterVal = getByPath(store.getters, value, '', '__NOTFOUND__')
+            if (getterVal === '__NOTFOUND__') {
+              warn(`Unknown getter named [${value}].`)
+              getterVal = ''
+            }
+            return getterVal
+          case 'mutations':
+            return store.commit(value, payload)
+          case 'actions':
+            return store.dispatch(value, payload)
         }
       }
-    }
+    })
     return result
   }
 }
@@ -35,20 +46,6 @@ export default function (store) {
     mapGetters: mapFactory('getters', store),
     mapMutations: mapFactory('mutations', store),
     mapActions: mapFactory('actions', store),
-    mapState: (depPath, maps) => {
-      maps = normalizeMap(depPath, maps)
-      const result = {}
-      Object.keys(maps).forEach(key => {
-        const value = maps[key]
-        result[key] = function () {
-          if (typeof value === 'function') {
-            return value.call(this, store.state, store.getters)
-          } else if (typeof value === 'string') {
-            return getByPath(store.state, value)
-          }
-        }
-      })
-      return result
-    }
+    mapState: mapFactory('state', store)
   }
 }