fix(devOrProd): 类型优化

fjc0k · Sep 28, 2021 · 449f957 · 449f957
1 parent b611997
commit 449f957
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 deletions.
diff --git a/src/utils/devOrProd.test.ts b/src/utils/devOrProd.test.ts
@@ -42,4 +42,13 @@ describe('devOrProd', () => {
       ),
     ).toBe(4)
   })
+
+  test('正确推导类型', () => {
+    const obj: {
+      x: 'ppp' | 'ff' | '00'
+    } = {
+      x: devOrProd('00', () => 'ff'),
+    }
+    expect(obj).toBe(obj)
+  })
 })
diff --git a/src/utils/devOrProd.ts b/src/utils/devOrProd.ts
@@ -6,10 +6,10 @@
  * @param devValue 开发环境返回的值或调用的函数
  * @param prodValue 生产环境返回的值或调用的函数
  */
-export function devOrProd<T>(
-  devValue: T | (() => T),
-  prodValue: T | (() => T),
-): T {
+export function devOrProd<R, T extends R, F extends () => R>(
+  devValue: T | F,
+  prodValue: T | F,
+): R {
   const nodeEnv = process.env.NODE_ENV
   return !nodeEnv || nodeEnv === 'production' || nodeEnv === 'prod'
     ? typeof prodValue === 'function'