refactor: Revert "fix(types): fix storeToRefs state return type (#2574) (#2604)"

This reverts commit c8f727a0a2187c591134bd467efe426fb747ea40.

diff --git a/packages/pinia/src/storeToRefs.ts b/packages/pinia/src/storeToRefs.ts
index a6b91217e264aae4e10a5e3bae523525b230cf06..76e91c333b3aa426d2ae22ce77b56e92c03acc6c 100644 (file)
--- a/packages/pinia/src/storeToRefs.ts
+++ b/packages/pinia/src/storeToRefs.ts
@@ -11,15 +11,7 @@ import {
   toRefs,
 } from 'vue-demi'
 import { StoreGetters, StoreState } from './store'
-import type {
-  _ActionsTree,
-  _GettersTree,
-  _UnwrapAll,
-  PiniaCustomStateProperties,
-  StateTree,
-  Store,
-  StoreGeneric,
-} from './types'
+import type { PiniaCustomStateProperties, StoreGeneric } from './types'
 
 type ToComputedRefs<T> = {
   [K in keyof T]: ToRef<T[K]> extends Ref<infer U>
@@ -27,31 +19,13 @@ type ToComputedRefs<T> = {
     : ToRef<T[K]>
 }
 
-/**
- * Extracts the refs of a state object from a store. If the state value is a Ref or type that extends ref, it will be kept as is.
- * Otherwise, it will be converted into a Ref.
- * @internal
- */
-type ToStateRefs<SS> =
-  SS extends Store<
-    string,
-    infer UnwrappedState,
-    _GettersTree<StateTree>,
-    _ActionsTree
-  >
-    ? UnwrappedState extends _UnwrapAll<Pick<infer State, infer Key>>
-      ? {
-          [K in Key]: ToRef<State[K]>
-        }
-      : ToRefs<UnwrappedState>
-    : ToRefs<StoreState<SS>>
-
 /**
  * Extracts the return type for `storeToRefs`.
  * Will convert any `getters` into `ComputedRef`.
  */
-export type StoreToRefs<SS extends StoreGeneric> = ToStateRefs<SS> &
-  ToRefs<PiniaCustomStateProperties<StoreState<SS>>> &
+export type StoreToRefs<SS extends StoreGeneric> = ToRefs<
+  StoreState<SS> & PiniaCustomStateProperties<StoreState<SS>>
+> &
   ToComputedRefs<StoreGetters<SS>>
 
 /**

diff --git a/packages/pinia/test-dts/customizations.test-d.ts b/packages/pinia/test-dts/customizations.test-d.ts
index 54bd5b303386dd071f7b0a7e5238bff2f218c2e5..b937c989a2276bcc76dc31de3d13ed4d46ad512b 100644 (file)
--- a/packages/pinia/test-dts/customizations.test-d.ts
+++ b/packages/pinia/test-dts/customizations.test-d.ts
@@ -193,76 +193,3 @@ expectType<{
     })()
   )
 )
-
-expectType<{
-  n: Ref<number>
-  customN: Ref<number> & { plusOne: () => void }
-  double: ComputedRef<number>
-  myState: Ref<number>
-  stateOnly: Ref<number>
-}>(
-  storeToRefs(
-    defineStore('a', () => {
-      const n = ref(1)
-      const customN = ref(1) as Ref<number> & { plusOne: () => void }
-      const double = computed(() => n.value * 2)
-      return {
-        n,
-        customN,
-        double,
-      }
-    })()
-  )
-)
-
-expectType<{
-  n: Ref<number>
-  customN: Ref<number> & { plusOne: () => void }
-  double: ComputedRef<number>
-  myState: Ref<number>
-  stateOnly: Ref<number>
-}>(
-  storeToRefs(
-    defineStore('a', () => {
-      const n = ref(1)
-      const customN = ref(1) as Ref<number> & { plusOne: () => void }
-      const double = computed(() => n.value * 2)
-
-      function plusOne() {
-        customN.value++
-      }
-
-      return {
-        n,
-        customN,
-        double,
-        plusOne,
-      }
-    })()
-  )
-)
-
-expectType<{
-  n: Ref<number>
-  customN: Ref<number> & { plusOne: () => void }
-  double: ComputedRef<number>
-  myState: Ref<number>
-  stateOnly: Ref<number>
-}>(
-  storeToRefs(
-    defineStore('a', {
-      state: () => ({
-        n: 1,
-        customN: ref(1) as Ref<number> & { plusOne: () => void },
-      }),
-      getters: {
-        double: (state) => state.n * 2,
-      },
-      actions: {
-        plusOne() {
-          this.n++
-        },
-      },
-    })()
-  )
-)