feat: allow actions to be destructured

diff --git a/__tests__/actions.spec.ts b/__tests__/actions.spec.ts
index ecd507ab14769c1aa1a70f531e549935fda70385..36d7e2c775425d9ba2fdf3fdb2a39b9e02c5a47d 100644 (file)
--- a/__tests__/actions.spec.ts
+++ b/__tests__/actions.spec.ts
@@ -25,6 +25,11 @@ describe('Actions', () => {
         async getNonA() {
           return this.nonA
         },
+        simple() {
+          this.toggle()
+          return 'simple'
+        },
+
         toggle() {
           return (this.a = !this.a)
         },
@@ -211,4 +216,23 @@ describe('Actions', () => {
     })
     await expect(store.getNonA()).resolves.toBe('hello')
   })
+
+  it('can destructure actions', () => {
+    const store = useStore()
+    const { simple } = store
+    expect(simple()).toBe('simple')
+    // works with the wrong this
+    expect({ simple }.simple()).toBe('simple')
+    // special this check
+    expect({ $id: 'o', simple }.simple()).toBe('simple')
+    // override the function like devtools do
+    expect(
+      {
+        $id: store.$id,
+        simple,
+        // otherwise it would faial
+        toggle() {},
+      }.simple()
+    ).toBe('simple')
+  })
 })

diff --git a/src/store.ts b/src/store.ts
index b8ca5857eb19cc5155a1b08c96ff2aca4800da90..87dc9ea4de50745ea73ec73eb50bc6c492096f4d 100644 (file)
--- a/src/store.ts
+++ b/src/store.ts
@@ -310,7 +310,7 @@ function createSetupStore<
 
       let ret: any
       try {
-        ret = action.apply(this || store, args)
+        ret = action.apply(this && this.$id === $id ? this : store, args)
         // handle sync errors
       } catch (error) {
         if (onErrorCallback(error) !== false) {