enhance: Add optional generic for fetch return value in shape types (#…

…311)
reactive · Apr 3, 2020 · 280fa3d · 280fa3d
1 parent bb75c15
commit 280fa3d
Showing 1 changed file with 18 additions and 10 deletions.
diff --git a/packages/rest-hooks/src/resource/shapes.ts b/packages/rest-hooks/src/resource/shapes.ts
@@ -8,10 +8,11 @@ export interface FetchShape<
   Params extends Readonly<object> = Readonly<object>,
   Body extends Readonly<object | string> | void =
     | Readonly<object | string>
-    | undefined
+    | undefined,
+  Response = any
 > {
   readonly type: 'read' | 'mutate' | 'delete';
-  fetch(params: Params, body: Body): Promise<any>;
+  fetch(params: Params, body: Body): Promise<Response>;
   getFetchKey(params: Params): string;
   readonly schema: S;
   readonly options?: FetchOptions;
@@ -32,20 +33,27 @@ export interface MutateShape<
   Params extends Readonly<object> = Readonly<object>,
   Body extends Readonly<object | string> | void =
     | Readonly<object | string>
-    | undefined
-> extends FetchShape<S, Params, Body> {
+    | undefined,
+  Response extends object | string | number | boolean =
+    | object
+    | string
+    | number
+    | boolean
+> extends FetchShape<S, Params, Body, Response> {
   readonly type: 'mutate';
-  fetch(
-    params: Params,
-    body: Body,
-  ): Promise<object | string | number | boolean>;
+  fetch(params: Params, body: Body): Promise<Response>;
 }
 
 /** For retrieval requests */
 export interface ReadShape<
   S extends Schema,
-  Params extends Readonly<object> = Readonly<object>
+  Params extends Readonly<object> = Readonly<object>,
+  Response extends object | string | number | boolean =
+    | object
+    | string
+    | number
+    | boolean
 > extends FetchShape<S, Params, undefined> {
   readonly type: 'read';
-  fetch(params: Params): Promise<object | string | number | boolean>;
+  fetch(params: Params): Promise<Response>;
 }