fix(types): implemented a workaround to be TS 4.9.x compatible (#1818)

vuejs · Nov 21, 2022 · c42a54c · c42a54c
1 parent 3e4e63c
commit c42a54c
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 48 deletions.
diff --git a/packages/pinia/package.json b/packages/pinia/package.json
@@ -69,7 +69,7 @@
   ],
   "license": "MIT",
   "devDependencies": {
-    "@microsoft/api-extractor": "7.28.6",
+    "@microsoft/api-extractor": "7.33.6",
     "@vue/test-utils": "^2.2.3"
   },
   "dependencies": {

diff --git a/packages/pinia/src/mapHelpers.ts b/packages/pinia/src/mapHelpers.ts
@@ -29,14 +29,17 @@ export type _StoreObject<S> = S extends StoreDefinition<
   infer Actions
 >
   ? {
-      [Id in `${Ids}${MapStoresCustomization extends Record<'suffix', string>
-        ? MapStoresCustomization['suffix']
+      [Id in `${Ids}${MapStoresCustomization extends Record<
+        'suffix',
+        infer Suffix extends string
+      >
+        ? Suffix
         : 'Store'}`]: () => Store<
         Id extends `${infer RealId}${MapStoresCustomization extends Record<
           'suffix',
-          string
+          infer Suffix extends string
         >
-          ? MapStoresCustomization['suffix']
+          ? Suffix
           : 'Store'}`
           ? RealId
           : string,
@@ -64,8 +67,11 @@ export let mapStoreSuffix = 'Store'
  * @param suffix - new suffix
  */
 export function setMapStoreSuffix(
-  suffix: MapStoresCustomization extends Record<'suffix', string>
-    ? MapStoresCustomization['suffix']
+  suffix: MapStoresCustomization extends Record<
+    'suffix',
+    infer Suffix extends string
+  >
+    ? Suffix
     : string // could be 'Store' but that would be annoying for JS
 ): void {
   mapStoreSuffix = suffix

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml