fix: fix merge child module bug

imtaotao · Dec 21, 2019 · 6cdb303 · 6cdb303
1 parent 6be8cbf
commit 6cdb303
Show file tree

Hide file tree

Showing 18 changed files with 400 additions and 137 deletions.
diff --git a/demo/app.js b/demo/app.js
@@ -1,10 +1,37 @@
-import createStore from './store/mpstore.esm'
-
-const store = createStore(null, {
-  createBefore (isPage, config) {
-    // console.log(isPage, config)
-  },
-})
-
-//app.js
+import createStore, { createModule } from './store/mpstore.esm'
+
+const store = createStore(null, {
+  createBefore (isPage, config) {
+    // console.log(isPage, config)
+  },
+})
+
+store.addModule('a', {
+  clear: {
+    setter() {
+      return {
+        // b: createModule({
+        //   c: createModule({})
+        // })
+      }
+    },
+  }
+})
+
+store.addModule('a.b.c', {
+  setB: {
+    partialState: {
+      name: 'tao'
+    }
+  }
+})
+
+console.clear()
+setTimeout(() => {
+  store.dispatch('clear')
+  console.log(store.state)
+}, 500)
+
+
+//app.js
 App({})
diff --git a/demo/app.json b/demo/app.json
@@ -2,7 +2,8 @@
   "pages": [
     "pages/index/index",
     "pages/module/index",
-    "pages/time-travel/index"
+    "pages/time-travel/index",
+    "pages/module-two/index"
   ],
   "window": {
     "backgroundTextStyle": "light",

diff --git a/demo/pages/module-two/index.js b/demo/pages/module-two/index.js
@@ -0,0 +1,47 @@
+import { createModule } from '../../store/mpstore.esm'
+
+Page({
+  storeConfig: {
+    defineReducer (store) {
+      store.add('one', {
+        partialState: {
+          name: 'chen',
+        },
+        setter (state, payload) {
+          return {
+            name: payload,
+            a: createModule({
+              age: 20,
+              b: store.getModule('a.b'),
+            }),
+          }
+        },
+      })
+      store.add('two', {
+        namespace: 'a.b',
+        partialState: {
+          sex: 'man',
+        },
+        setter (state, payload) {
+          return { sex: payload }
+        },
+      })
+    },
+    useState () {
+      return ['a.b', {
+        sex: s => s.sex,
+        name: (s, r) => r.name,
+        age: (s, r) => r.a.age,
+      }]
+    },
+  },
+
+  onLoad() {
+    setTimeout(() => {
+      this.store.dispatch('one', 'imtaotao')
+    }, 1000)
+    setTimeout(() => {
+      this.store.dispatch('two', 'women')
+    }, 2000)
+  }
+})
diff --git a/demo/pages/module-two/index.json b/demo/pages/module-two/index.json
@@ -0,0 +1,3 @@
+{
+  "usingComponents": {}
+}
diff --git a/demo/pages/module-two/index.wxml b/demo/pages/module-two/index.wxml
@@ -0,0 +1,2 @@
+<view>{{ global.sex }}-{{ global.name }}-{{ global.age }}</view>
+
diff --git a/demo/pages/module-two/index.wxss b/demo/pages/module-two/index.wxss
@@ -0,0 +1 @@
+/* pages/module-two/index.wxss */
diff --git a/demo/pages/module/index.js b/demo/pages/module/index.js
@@ -5,19 +5,19 @@ let i = 0
 Page({
   storeConfig: {
     travelLimit: 5,
-    defineReducer (store) {
-      store.add('action', {
-        partialState: {
-          a: createModule({})
-        },
-        setter (state, payload) {
-          // 这会报错，因为 b 原本不是一个模块，所以你不能新增 b 模块
-          return {
-            b: createModule({}),
-          }
-        },
-      })
-      store.dispatch('action')
+    // defineReducer (store) {
+      // store.add('action', {
+      //   partialState: {
+      //     a: createModule({})
+      //   },
+      //   setter (state, payload) {
+      //     // 这会报错，因为 b 原本不是一个模块，所以你不能新增 b 模块
+      //     return {
+      //       b: createModule({}),
+      //     }
+      //   },
+      // })
+      // store.dispatch('action')
       // store.add('one', {
       //   partialState: {
       //     name: 'chen',
@@ -137,7 +137,7 @@ Page({
       //     'taotao': 1221
       //   }
       // })
-    },
+    // },
 
     // useState: () => (['taoo.tao', {
     //   index: state => state.index,

diff --git a/demo/pages/time-travel/index.js b/demo/pages/time-travel/index.js
@@ -1,40 +1,40 @@
-// this is a demo for time travel
-Page({
-  storeConfig: {
-    travelLimit: 5,
-    defineReducer (store) {
-      store.add('TIMETRAVEL', {
-        partialState: {
-          index: 0,
-        },
-        setter (state, payload) {
-          return { index: payload }
-        },
-      })
-    },
-
-    useState: () => ({
-      index: state => state.index,
-    }),
-  },
-
-  changed () {
-    this.store.dispatch('TIMETRAVEL', this.data.global.index + 1)
-  },
-
-  forward () {
-    this.timeTravel.forward()
-  },
-
-  back () {
-    this.timeTravel.back()
-  },
-
-  toStart () {
-    this.timeTravel.toStart()
-  },
-
-  toEnd () {
-    this.timeTravel.toEnd()
-  },
+// this is a demo for time travel
+Page({
+  storeConfig: {
+    travelLimit: 5,
+    defineReducer (store) {
+      // store.add('TIMETRAVEL', {
+      //   partialState: {
+      //     index: 0,
+      //   },
+      //   setter (state, payload) {
+      //     return { index: payload }
+      //   },
+      // })
+    },
+
+    useState: () => ({
+      index: state => state.index,
+    }),
+  },
+
+  changed () {
+    this.store.dispatch('TIMETRAVEL', this.data.global.index + 1)
+  },
+
+  forward () {
+    this.timeTravel.forward()
+  },
+
+  back () {
+    this.timeTravel.back()
+  },
+
+  toStart () {
+    this.timeTravel.toStart()
+  },
+
+  toEnd () {
+    this.timeTravel.toEnd()
+  },
 })
diff --git a/demo/project.config.json b/demo/project.config.json
@@ -35,7 +35,7 @@
 			"list": []
 		},
 		"miniprogram": {
-			"current": 2,
+			"current": 3,
 			"list": [
 				{
 					"id": -1,
@@ -57,6 +57,13 @@
 					"pathName": "pages/module/index",
 					"query": "",
 					"scene": null
+				},
+				{
+					"id": -1,
+					"name": "模块嵌套",
+					"pathName": "pages/module-two/index",
+					"query": "",
+					"scene": null
 				}
 			]
 		}

diff --git a/demo/store/mpstore.esm.js b/demo/store/mpstore.esm.js
@@ -1,5 +1,5 @@
 /*!
- * Mpstore.js v0.1.11
+ * Mpstore.js v0.1.12
  * (c) 2019-2019 Imtaotao
  * Released under the MIT License.
  */
@@ -269,6 +269,39 @@ function getModule(state, namespace) {
 
   return isModule(module) ? module : null;
 }
+
+function assertChildModule(a, b, key) {
+  var isModuleForOrigin = isModule(a);
+  var isModuleForCurrent = isModule(b);
+  assert(!(isModuleForOrigin && !isModuleForCurrent), "The namespace [".concat(key, "] is a module that you can change to other value, ") + 'You can use `createModule` method to recreate a module.' + '\n\n  --- from setter function.');
+  assert(!(!isModuleForOrigin && isModuleForCurrent), "The namespace [".concat(key, "] is not a module, you can't create it as a module, ") + 'you must define the module in `reducer`.' + '\n\n  --- from setter function.');
+  return isModuleForOrigin && isModuleForCurrent;
+}
+
+function checkChildModule(a, b) {
+  var keys = Object.keys(b);
+  var len = keys.length;
+
+  while (~--len) {
+    var key = keys[len];
+
+    if (assertChildModule(a[key], b[key], key)) {
+      checkChildModule(a[key], b[key]);
+    }
+  }
+
+  keys = Object.keys(a);
+  len = keys.length;
+
+  while (~--len) {
+    var _key = keys[len];
+
+    if (!(_key in b)) {
+      assertChildModule(a[_key], b[_key], _key);
+    }
+  }
+}
+
 function mergeModule(module, partialModule, moduleName, createMsg) {
   var keys = Object.keys(partialModule);
   var len = keys.length;
@@ -281,13 +314,9 @@ function mergeModule(module, partialModule, moduleName, createMsg) {
     } else {
       var originItem = module[key];
       var currentPartialItem = partialModule[key];
-      var isModuleForOrigin = isModule(originItem);
-      var isModuleForCurrent = isModule(currentPartialItem);
-      assert(!(isModuleForOrigin && !isModuleForCurrent), "The namespace [".concat(key, "] is a module that you can change to other value, ") + 'You can use `createModule` method to recreate a module.' + '\n\n  --- from setter function.');
-      assert(!(!isModuleForOrigin && isModuleForCurrent), "The namespace [".concat(key, "] is not a module, you can't create it as a module, ") + 'you must define the module in `reducer`.' + '\n\n  --- from setter function.');
 
-      if (isModuleForOrigin && isModuleForCurrent) {
-        partialModule[key] = mergeModule(originItem, currentPartialItem);
+      if (assertChildModule(originItem, currentPartialItem, key)) {
+        checkChildModule(originItem, currentPartialItem);
       }
     }
   }
@@ -818,7 +847,7 @@ function () {
     this.depComponents = [];
     this.GLOBALWORD = 'global';
     this.isDispatching = false;
-    this.version = '0.1.11';
+    this.version = '0.1.12';
     this.state = Object.freeze(createModule({}));
     this.middleware = new Middleware(this);
   }
@@ -1082,7 +1111,7 @@ function () {
   return Store;
 }();
 
-var version = '0.1.11';
+var version = '0.1.12';
 var nativePage = Page;
 var nativeComponent = Component;
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		<view>{{ global.sex }}-{{ global.name }}-{{ global.age }}</view>