fix: fix mergeConfigs function typing

edumudu · Jul 16, 2022 · 620c089 · 620c089
1 parent a32c921
commit 620c089
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 6 deletions.
diff --git a/lib/composables/swr/index.ts b/lib/composables/swr/index.ts
@@ -39,7 +39,7 @@ export const useSWR = <Data = any, Error = any>(
   const fetchedIn = hasCachedValue.value ? toRef(valueInCache.value, 'fetchedIn') : ref(new Date());
 
   const fetchData = async () => {
-    const timestampToDedupExpire = (fetchedIn.value?.getTime() || 0) + (dedupingInterval || 0);
+    const timestampToDedupExpire = (fetchedIn.value?.getTime() || 0) + dedupingInterval;
 
     if (hasCachedValue.value && timestampToDedupExpire > Date.now()) return;
 

diff --git a/lib/utils/merge-config/index.ts b/lib/utils/merge-config/index.ts
@@ -1,8 +1,8 @@
 import { SWRConfig } from '@/types';
 
-export const mergeConfig = (
-  fallbackConfig: Partial<SWRConfig>,
-  config: Partial<SWRConfig> = {},
+export const mergeConfig = <T extends Partial<SWRConfig>, D extends Partial<SWRConfig>>(
+  fallbackConfig: T,
+  config: D,
 ) => ({
   ...fallbackConfig,
   ...config,

diff --git a/lib/utils/merge-config/merge-config.spec.ts b/lib/utils/merge-config/merge-config.spec.ts
@@ -2,8 +2,6 @@ import { mergeConfig } from '.';
 
 describe('mergeConfig', () => {
   it.each([
-    [{}, {}, {}],
-    [{}, undefined, {}],
     [{}, { revalidateIfStale: true }, { revalidateIfStale: true }],
     [{ revalidateIfStale: true }, {}, { revalidateIfStale: true }],
     [{ revalidateIfStale: true }, { revalidateIfStale: true }, { revalidateIfStale: true }],