From 6be93f2301a7711873f49c94999913947e3896b8 Mon Sep 17 00:00:00 2001
From: Derhelios66 <72966174+Derhelios66@users.noreply.github.com>
Date: Sun, 24 Jul 2022 18:19:46 +0200
Subject: [PATCH] fix: setupStore getter types (#1430) (#1444)

Co-authored-by: Michael Seid <michael.seid@boerse-go.de>
---
 packages/pinia/src/types.ts                  | 2 +-
 packages/pinia/test-dts/storeSetup.test-d.ts | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/packages/pinia/src/types.ts b/packages/pinia/src/types.ts
index 35bcae7a..0ae89bfa 100644
--- a/packages/pinia/src/types.ts
+++ b/packages/pinia/src/types.ts
@@ -601,7 +601,7 @@ export type _ExtractActionsFromSetupStore<SS> = SS extends undefined | void
 export type _ExtractGettersFromSetupStore<SS> = SS extends undefined | void
   ? {}
   : _ExtractGettersFromSetupStore_Keys<SS> extends keyof SS
-  ? _UnwrapAll<Pick<SS, _ExtractGettersFromSetupStore_Keys<SS>>>
+  ? Pick<SS, _ExtractGettersFromSetupStore_Keys<SS>>
   : never
 
 /**
diff --git a/packages/pinia/test-dts/storeSetup.test-d.ts b/packages/pinia/test-dts/storeSetup.test-d.ts
index 52ccb5db..0ffcda3e 100644
--- a/packages/pinia/test-dts/storeSetup.test-d.ts
+++ b/packages/pinia/test-dts/storeSetup.test-d.ts
@@ -11,13 +11,17 @@ const useSetupStore = defineStore('name', () => {
     },
   })
 
+  const multiply = computed(() => (n: number) => {
+    return count.value * n;
+  });
+
   function increment(amount = 1) {
     count.value += amount
 
     return count.value
   }
 
-  return { count, double, increment, triple }
+  return { count, double, increment, triple, multiply }
 })
 
 const setupStore = useSetupStore()
@@ -26,4 +30,5 @@ expectType<number>(setupStore.count)
 expectType<number>(setupStore.$state.count)
 expectType<number>(setupStore.double)
 expectType<number>(setupStore.triple)
+expectType<(n: number) => number>(setupStore.multiply);
 expectType<(amount?: number) => number>(setupStore.increment)
-- 
2.47.2