@mpxjs/store 2.8.23-alpha.2 → 2.8.40-test

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mpxjs/store",
-  "version": "2.8.23-alpha.2",
+  "version": "2.8.40-test",
   "description": "A store for mpx framework",
   "main": "src/index.js",
   "types": "@types/index.d.ts",
@@ -26,10 +26,10 @@
   },
   "homepage": "https://github.com/didi/mpx#readme",
   "dependencies": {
-    "@mpxjs/utils": "^2.8.23-alpha"
+    "@mpxjs/utils": "^2.8.40-test"
   },
   "peerDependencies": {
     "@mpxjs/core": "^2.8.0"
   },
-  "gitHead": "556f754c8b43cb825a8d5d5040b1cdf7a6fdd613"
+  "gitHead": "8524f9b69ebcfb0667ebff2608cf6f675f14f141"
 }

package/src/index.js

@@ -1,5 +1,4 @@
-import Mpx, { reactive, computed } from '@mpxjs/core'
-import createHummerPlugin from './builtInPlugins/hummerStorePlugin'
+import Mpx, { reactive, computed, effectScope } from '@mpxjs/core'
 import {
   getByPath,
   warn,
@@ -116,15 +115,10 @@ class Store {
     this.mutations = {}
     this.actions = {}
     this._subscribers = []
+    this._scope = effectScope(true)
     this.state = this.registerModule(options).state
     this.resetStoreVM()
     Object.assign(this, mapStore(this))
-    if (__mpx_mode__ === 'tenon') {
-      plugins.push(createHummerPlugin({
-        /* eslint-disable camelcase */
-        store_key: `MPX_STORE${options.__store_id}`
-      }))
-    }
     plugins.forEach(plugin => plugin(this))
   }
 
@@ -153,9 +147,9 @@ class Store {
 
   registerModule (module) {
     const state = module.state || {}
-    const reactiveModule = __mpx_mode__ === 'tenon'
-      ? Mpx.__vue.reactive({ state })
-      : { state }
+    const reactiveModule = {
+      state
+    }
     if (module.getters) {
       reactiveModule.getters = transformGetters(module.getters, reactiveModule, this)
     }
@@ -185,49 +179,28 @@ class Store {
   }
 
   resetStoreVM () {
-    if (__mpx_mode__ === 'web') {
-      const Vue = Mpx.__vue
-      const vm = new Vue({
-        data: {
-          __mpxState: this.state
-        },
-        computed: this.__wrappedGetters
-      })
-      const computedKeys = Object.keys(this.__wrappedGetters)
-      proxy(this.getters, vm, computedKeys)
-      proxy(this.getters, this.__depsGetters)
-    } else if (__mpx_mode__ === 'tenon') {
-      const computedObj = {}
-      Object.keys(this.__wrappedGetters).forEach(k => {
-        const getter = this.__wrappedGetters[k]
-        computedObj[k] = () => getter(this.state)
-        Object.defineProperty(this.getters, k, {
-          get: () => computedObj[k](),
-          enumerable: true // for local getters
+    this._scope.run(() => {
+      if (__mpx_mode__ === 'web') {
+        const Vue = Mpx.__vue
+        const vm = new Vue({
+          data: {
+            __mpxState: this.state
+          },
+          computed: this.__wrappedGetters
         })
-      })
-    } else {
-      reactive(this.state)
-      const computedObj = {}
-      Object.entries(this.__wrappedGetters).forEach(([key, value]) => {
-        computedObj[key] = computed(value)
-      })
-      proxy(this.getters, computedObj)
-      proxy(this.getters, this.__depsGetters)
-    }
-  }
-
-  /**
-   * 替换state，tenon环境中使用
-   */
-  replaceState (state) {
-    // todo 某些key可能无法删除
-    Object.assign(this.state, state)
-    // this.resetStoreVM()
-  }
-
-  _withCommit (fn) {
-    fn()
+        const computedKeys = Object.keys(this.__wrappedGetters)
+        proxy(this.getters, vm, computedKeys)
+        proxy(this.getters, this.__depsGetters)
+      } else {
+        reactive(this.state)
+        const computedObj = {}
+        Object.entries(this.__wrappedGetters).forEach(([key, value]) => {
+          computedObj[key] = computed(value)
+        })
+        proxy(this.getters, computedObj)
+        proxy(this.getters, this.__depsGetters)
+      }
+    })
   }
 }
 

package/src/builtInPlugins/hummerStorePlugin.js

@@ -1 +0,0 @@
-export default () => () => {} // mock plugin in other mode

package/src/builtInPlugins/hummerStorePlugin.tenon.js

@@ -1,3 +0,0 @@
-import { createHummerPlugin } from '@hummer/tenon-store'
-
-export default createHummerPlugin