fix: vuejs/pinia#2771

soc221b · Dec 15, 2024 · 64ce13a · 64ce13a
1 parent 609fc9a
commit 64ce13a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/type.ts b/src/type.ts
@@ -1,4 +1,5 @@
 import { StateTree, SubscriptionCallback } from 'pinia'
+import { UnwrapRef } from 'vue'
 
 export interface IStorage {
   getItem: (key: string) => any | Promise<any>
@@ -47,7 +48,7 @@ export interface CommonOptions<S extends StateTree = StateTree> {
    *
    * @default (state, savedState) => savedState
    */
-  merge?: (state: S, savedState: S) => S
+  merge?: (state: S, savedState: UnwrapRef<S>) => UnwrapRef<S>
 
   /**
    * When rehydrating, overwrite initial state (patch otherwise).

diff --git a/tests/index.test.ts b/tests/index.test.ts
@@ -298,7 +298,7 @@ describe('hydrate', () => {
       {
         persistedState: {
           merge: (state, savedState) => {
-            return { values: [...state.values, ...savedState.values] }
+            return { values: [...state.values.value, ...savedState.values] }
           },
         },
       },