fix(types): mapWritableState array

Fix #2014
vuejs · Feb 20, 2023 · 07eaf99 · 07eaf99
1 parent 4674900
commit 07eaf99
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 9 deletions.
diff --git a/packages/pinia/src/mapHelpers.ts b/packages/pinia/src/mapHelpers.ts
@@ -462,11 +462,12 @@ export function mapWritableState<
   Id extends string,
   S extends StateTree,
   G extends _GettersTree<S>,
-  A
+  A,
+  Keys extends keyof S
 >(
   useStore: StoreDefinition<Id, S, G, A>,
-  keys: Array<keyof S>
-): _MapWritableStateReturn<S>
+  keys: readonly Keys[]
+): { [K in Keys]: S[K] }
 /**
  * Allows using state and getters from one store without using the composition
  * API (`setup()`) by generating an object to be spread in the `computed` field

diff --git a/packages/pinia/test-dts/mapHelpers.test-d.ts b/packages/pinia/test-dts/mapHelpers.test-d.ts
@@ -90,12 +90,9 @@ expectType<{
   newToggleA: () => void
 }>(mapActions(useStore, { newSetToggle: 'setToggle', newToggleA: 'toggleA' }))
 
-expectType<{
-  a: {
-    get: () => 'on' | 'off'
-    set: (v: 'on' | 'off') => any
-  }
-}>(mapWritableState(useStore, ['a']))
+expectType<{ a: 'on' | 'off' }>(mapWritableState(useStore, ['a']))
+// @ts-expect-error: only defined in array
+mapWritableState(useStore, ['a']).b
 
 expectType<{
   newA: {