From f8c8e67537986aeee0a4c9145c13763a0e952148 Mon Sep 17 00:00:00 2001
From: Eduardo San Martin Morote <posva13@gmail.com>
Date: Wed, 28 Apr 2021 19:03:41 +0200
Subject: [PATCH] refactor: any type to correctly infer

---
 src/index.ts               |  1 -
 src/mapHelpers.ts          |  4 ++--
 test-dts/plugins.test-d.ts | 21 +--------------------
 3 files changed, 3 insertions(+), 23 deletions(-)

diff --git a/src/index.ts b/src/index.ts
index 6a09a0ce..1b1aad1c 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -10,7 +10,6 @@ export {
   StateTree,
   Store,
   GenericStore,
-  GenericStoreDefinition,
   StoreDefinition,
   StoreWithGetters,
   StoreWithActions,
diff --git a/src/mapHelpers.ts b/src/mapHelpers.ts
index 5763699a..1962d6e0 100644
--- a/src/mapHelpers.ts
+++ b/src/mapHelpers.ts
@@ -1,7 +1,6 @@
 import { ComponentInstance } from '@vue/devtools-api'
 import {
   GenericStore,
-  GenericStoreDefinition,
   Method,
   StateTree,
   Store,
@@ -99,7 +98,7 @@ export function setMapStoreSuffix(
  *
  * @param stores - list of stores to map to an object
  */
-export function mapStores<Stores extends GenericStoreDefinition[]>(
+export function mapStores<Stores extends any[]>(
   ...stores: [...Stores]
 ): Spread<Stores> {
   return stores.reduce((reduced, useStore) => {
@@ -426,6 +425,7 @@ export function mapWritableState<
 ): MapWritableStateReturn<S> | MapWritableStateObjectReturn<S, KeyMapper> {
   return Array.isArray(keysOrMapper)
     ? keysOrMapper.reduce((reduced, key) => {
+        // @ts-ignore
         reduced[key] = {
           get(this: ComponentInstance) {
             return getCachedStore(this, useStore)[key]
diff --git a/test-dts/plugins.test-d.ts b/test-dts/plugins.test-d.ts
index c1d542e2..aab882e8 100644
--- a/test-dts/plugins.test-d.ts
+++ b/test-dts/plugins.test-d.ts
@@ -1,23 +1,4 @@
-import {
-  defineStore,
-  expectType,
-  mapStores,
-  createPinia,
-  GenericStore,
-} from '.'
-
-const useCounter = defineStore({
-  id: 'counter',
-  state: () => ({ n: 0 }),
-})
-
-type CounterStore = ReturnType<typeof useCounter>
-
-const computedStores = mapStores(useCounter)
-
-expectType<{
-  counterStore: () => CounterStore
-}>(computedStores)
+import { expectType, createPinia, GenericStore } from '.'
 
 const pinia = createPinia()
 
-- 
2.47.3