From 26239d944a3c3268bc389a749328e73bdbefd163 Mon Sep 17 00:00:00 2001
From: YixuanXu <yixuanxu94@outlook.com>
Date: Sat, 25 Sep 2021 22:00:26 +0800
Subject: [PATCH] simplify the implementation of fetcher type

Author:    YixuanXu <yixuanxu94@outlook.com>
---
 infinite/index.ts |  8 +++-----
 src/types.ts      | 42 ++++++++++++++++--------------------------
 2 files changed, 19 insertions(+), 31 deletions(-)

diff --git a/infinite/index.ts b/infinite/index.ts
index 9880fec98..112077241 100644
--- a/infinite/index.ts
+++ b/infinite/index.ts
@@ -252,13 +252,11 @@ export const infinite = ((<Data, Error, Args extends ValueKey>(
 
 export type InfiniteFetcher<
   Args extends ValueKey = ValueKey,
-  Data = unknown
+  Data = any
 > = Args extends (readonly [...infer K])
   ? ((...args: [...K]) => Result<Data>)
-  : Args extends (string | null)
-  ? Args extends (Record<any, any> | null)
-    ? never
-    : (...args: [string]) => Result<Data>
+  : Args extends null
+  ? never
   : Args extends (infer T)
   ? (...args: [T]) => Result<Data>
   : never
diff --git a/src/types.ts b/src/types.ts
index 12a54823e..5ebf1e913 100644
--- a/src/types.ts
+++ b/src/types.ts
@@ -10,34 +10,24 @@ export type Fetcher<Data = unknown, Args extends Key = Key> =
    */
   Args extends (() => readonly [...infer K] | null)
     ? ((...args: [...K]) => Result<Data>)
-      /**
-       * [{ foo: string }, { bar: number } ] | null
-       *
-       * [{ foo: string }, { bar: number } ] as const | null
-       */
-    : Args extends (readonly [...infer K])
+    : /**
+     * [{ foo: string }, { bar: number } ] | null
+     *
+     * [{ foo: string }, { bar: number } ] as const | null
+     */
+    Args extends (readonly [...infer K])
     ? ((...args: [...K]) => Result<Data>)
-      /**
-       * () => string | null
-       * () => Record<any, any> | null
-       */
-    : Args extends (() => infer T | null)
+    : /**
+     * () => string | null
+     * () => Record<any, any> | null
+     */
+    Args extends (() => infer T | null)
     ? (...args: [T]) => Result<Data>
-      /**
-       *  string | null
-       */
-    : Args extends (string | null)
-      /**
-       * when key is Record<any, any> | null
-       * use { foo: string, bar: number } | null as example
-       *
-       * the fetcher would be
-       * (arg0: string) => any | (arg0: { foo: string, bar: number }) => any
-       * so we add this condition to make (arg0: string) => any to be never
-       */
-    ? Args extends (Record<any, any> | null)
-      ? never
-      : (...args: [string]) => Result<Data>
+    : /**
+     *  string | null | Record<any,any>
+     */
+    Args extends null
+    ? never
     : Args extends (infer T)
     ? (...args: [T]) => Result<Data>
     : never