fix: avoid reusing context between stores (#365)

ktsn · Dec 22, 2020 · 30e5a36 · 30e5a36
1 parent 89fd9bc
commit 30e5a36
Show file tree

Hide file tree

Showing 2 changed files with 52 additions and 15 deletions.
diff --git a/src/module.ts b/src/module.ts
@@ -305,11 +305,10 @@ function initGetters<
     injectStore: (store) => {
       const context = module.context(store)
 
-      if (!getters.hasOwnProperty('__ctx__')) {
-        Object.defineProperty(getters, '__ctx__', {
-          get: () => context,
-        })
-      }
+      Object.defineProperty(getters, '__ctx__', {
+        get: () => context,
+        configurable: true,
+      })
 
       getters.$init(store)
     },
@@ -365,11 +364,10 @@ function initMutations<
     injectStore: (store) => {
       const context = module.context(store)
 
-      if (!mutations.hasOwnProperty('__ctx__')) {
-        Object.defineProperty(mutations, '__ctx__', {
-          get: () => context,
-        })
-      }
+      Object.defineProperty(mutations, '__ctx__', {
+        get: () => context,
+        configurable: true,
+      })
     },
   }
 }
@@ -430,11 +428,10 @@ function initActions<
     injectStore: (store) => {
       const context = module.context(store)
 
-      if (!actions.hasOwnProperty('__ctx__')) {
-        Object.defineProperty(actions, '__ctx__', {
-          get: () => context,
-        })
-      }
+      Object.defineProperty(actions, '__ctx__', {
+        get: () => context,
+        configurable: true,
+      })
 
       actions.$init(store)
     },

diff --git a/test/module.spec.ts b/test/module.spec.ts
@@ -760,6 +760,46 @@ describe('Module', () => {
 
       expect(foo.context(store).getters.test).toBe(1)
     })
+
+    it('does not access old store state via ctx', () => {
+      class FooState {
+        test: string | null = null
+      }
+
+      class FooMutations extends Mutations<FooState> {
+        update(value: string) {
+          this.state.test = value
+        }
+      }
+
+      class FooActions extends Actions<
+        FooState,
+        never,
+        FooMutations,
+        FooActions
+      > {
+        update(value: string) {
+          this.mutations.update(value)
+        }
+      }
+
+      const root = new Module({
+        state: FooState,
+        mutations: FooMutations,
+        actions: FooActions,
+      })
+
+      const storeA = createStore(root)
+      expect(storeA.state.test).toBe(null)
+      storeA.dispatch('update', 'a')
+      expect(storeA.state.test).toBe('a')
+
+      const storeB = createStore(root)
+      expect(storeB.state.test).toBe(null)
+      storeB.dispatch('update', 'b')
+      expect(storeA.state.test).toBe('a')
+      expect(storeB.state.test).toBe('b')
+    })
   })
 
   it("can be used in other module's action", () => {