refactor(query): better extract types from endpoints

- fix(query): pick correct `ApiError` type inside `createApi` - `useCache` will automatically pull success type from endpoint.
neurosnap · Jan 11, 2024 · 531fbae · 531fbae
1 parent f43c20f
commit 531fbae
Show file tree

Hide file tree

Showing 6 changed files with 1,316 additions and 287 deletions.
diff --git a/api-type-template.ts b/api-type-template.ts
@@ -21,14 +21,15 @@ ${method}<P>(
 ): CreateActionWithPayload<Omit<Ctx, 'payload'> & Payload<P>, P>;
 ${method}<P extends never, ApiSuccess, ApiError = unknown>(
   req: { supervisor?: Supervisor }
-): CreateAction<Omit<Ctx, 'json'> & FetchJson<ApiSuccess, ApiError>>;
+): CreateAction<Omit<Ctx, 'json'> & FetchJson<ApiSuccess, ApiError extends unknown ? Ctx["_error"] : ApiError>, ApiSuccess>;
 ${method}<P, ApiSuccess, ApiError = unknown>(req: {
   supervisor?: Supervisor;
 }): CreateActionWithPayload<
   Omit<Ctx, 'payload' | 'json'> &
     Payload<P> &
-    FetchJson<ApiSuccess, ApiError>,
-  P
+    FetchJson<ApiSuccess, ApiError extends unknown ? Ctx["_error"] : ApiError>,
+  P,
+  ApiSuccess
 >;
 
 /**
@@ -45,15 +46,16 @@ ${method}<P, Gtx extends Ctx = Ctx>(
   fn: MiddlewareApiCo<Gtx>,
 ): CreateActionWithPayload<Gtx, P>;
 ${method}<P extends never, ApiSuccess, ApiError = unknown>(
-  fn: MiddlewareApiCo<Omit<Ctx, 'json'> & FetchJson<ApiSuccess, ApiError>>,
-): CreateAction<Omit<Ctx, 'json'> & FetchJson<ApiSuccess, ApiError>>;
+  fn: MiddlewareApiCo<Omit<Ctx, 'json'> & FetchJson<ApiSuccess, ApiError extends unknown ? Ctx["_error"] : ApiError>>,
+): CreateAction<Omit<Ctx, 'json'> & FetchJson<ApiSuccess, ApiError extends unknown ? Ctx["_error"] : ApiError>, ApiSuccess>;
 ${method}<P, ApiSuccess, ApiError = unknown>(
   fn: MiddlewareApiCo<Ctx>,
 ): CreateActionWithPayload<
   Omit<Ctx, 'payload' | 'json'> &
     Payload<P> &
-    FetchJson<ApiSuccess, ApiError>,
-  P
+    FetchJson<ApiSuccess, ApiError extends unknown ? Ctx["_error"] : ApiError>,
+  P,
+  ApiSuccess
 >;
 
 /**
@@ -74,16 +76,17 @@ ${method}<P, Gtx extends Ctx = Ctx>(
 ): CreateActionWithPayload<Gtx, P>;
 ${method}<P extends never, ApiSuccess, ApiError = unknown>(
   req: { supervisor?: Supervisor },
-  fn: MiddlewareApiCo<Omit<Ctx, 'json'> & FetchJson<ApiSuccess, ApiError>>,
-): CreateAction<Omit<Ctx, 'json'> & FetchJson<ApiSuccess, ApiError>>;
+  fn: MiddlewareApiCo<Omit<Ctx, 'json'> & FetchJson<ApiSuccess, ApiError extends unknown ? Ctx["_error"] : ApiError>>,
+): CreateAction<Omit<Ctx, 'json'> & FetchJson<ApiSuccess, ApiError extends unknown ? Ctx["_error"] : ApiError>, ApiSuccess>;
 ${method}<P, ApiSuccess, ApiError = unknown>(
   req: { supervisor?: Supervisor },
   fn: MiddlewareApiCo<Ctx>,
 ): CreateActionWithPayload<
   Omit<Ctx, 'payload' | 'json'> &
     Payload<P> &
-    FetchJson<ApiSuccess, ApiError>,
-  P
+    FetchJson<ApiSuccess, ApiError extends unknown ? Ctx["_error"] : ApiError>,
+  P,
+  ApiSuccess
 >;`;
   const uriMethods = methods.map((m) => uriTmpl(m)).join("\n\n");
 
@@ -97,14 +100,15 @@ ${method}<P>(
 ): CreateActionWithPayload<Omit<Ctx, 'payload'> & Payload<P>, P>;
 ${method}<P extends never, ApiSuccess, ApiError = unknown>(
   name: ApiName,
-): CreateAction<Omit<Ctx, 'json'> & FetchJson<ApiSuccess, ApiError>>;
+): CreateAction<Omit<Ctx, 'json'> & FetchJson<ApiSuccess, ApiError extends unknown ? Ctx["_error"] : ApiError>, ApiSuccess>;
 ${method}<P, ApiSuccess, ApiError = unknown>(
   name: ApiName,
 ): CreateActionWithPayload<
   Omit<Ctx, 'payload' | 'json'> &
     Payload<P> &
-    FetchJson<ApiSuccess, ApiError>,
-  P
+    FetchJson<ApiSuccess, ApiError extends unknown ? Ctx["_error"] : ApiError>,
+  P,
+  ApiSuccess
 >;
 
 /**
@@ -122,15 +126,16 @@ ${method}<P, Gtx extends Ctx = Ctx>(
 ${method}<P extends never, ApiSuccess, ApiError = unknown>(
   name: ApiName,
   req: { supervisor?: Supervisor }
-): CreateAction<Omit<Ctx, 'json'> & FetchJson<ApiSuccess, ApiError>>;
+): CreateAction<Omit<Ctx, 'json'> & FetchJson<ApiSuccess, ApiError extends unknown ? Ctx["_error"] : ApiError>, ApiSuccess>;
 ${method}<P, ApiSuccess, ApiError = unknown>(
   name: ApiName,
   req: { supervisor?: Supervisor },
 ): CreateActionWithPayload<
   Omit<Ctx, 'payload' | 'json'> &
     Payload<P> &
-    FetchJson<ApiSuccess, ApiError>,
-  P
+    FetchJson<ApiSuccess, ApiError extends unknown ? Ctx["_error"] : ApiError>,
+  P,
+  ApiSuccess
 >;
 
 /**
@@ -151,20 +156,21 @@ ${method}<P, Gtx extends Ctx = Ctx>(
 ): CreateActionWithPayload<Gtx, P>;
 ${method}<P extends never, ApiSuccess, ApiError = unknown>(
   name: ApiName,
-  fn: MiddlewareApiCo<Omit<Ctx, 'json'> & FetchJson<ApiSuccess, ApiError>>,
-): CreateAction<Omit<Ctx, 'json'> & FetchJson<ApiSuccess, ApiError>>;
+  fn: MiddlewareApiCo<Omit<Ctx, 'json'> & FetchJson<ApiSuccess, ApiError extends unknown ? Ctx["_error"] : ApiError>>,
+): CreateAction<Omit<Ctx, 'json'> & FetchJson<ApiSuccess, ApiError extends unknown ? Ctx["_error"] : ApiError>, ApiSuccess>;
 ${method}<P, ApiSuccess, ApiError = unknown>(
   name: ApiName,
   fn: MiddlewareApiCo<
     Omit<Ctx, 'payload' | 'json'> &
       Payload<P> &
-      FetchJson<ApiSuccess, ApiError>
+      FetchJson<ApiSuccess, ApiError extends unknown ? Ctx["_error"] : ApiError>,
   >,
 ): CreateActionWithPayload<
   Omit<Ctx, 'payload' | 'json'> &
     Payload<P> &
-    FetchJson<ApiSuccess, ApiError>,
-  P
+    FetchJson<ApiSuccess, ApiError extends unknown ? Ctx["_error"] : ApiError>,
+  P,
+  ApiSuccess
 >;
 
 /**
@@ -193,21 +199,22 @@ ${method}<P, Gtx extends Ctx = Ctx>(
 ${method}<P extends never, ApiSuccess, ApiError = unknown>(
   name: ApiName,
   req: { supervisor?: Supervisor },
-  fn: MiddlewareApiCo<Omit<Ctx, 'json'> & FetchJson<ApiSuccess, ApiError>>,
-): CreateAction<Omit<Ctx, 'json'> & FetchJson<ApiSuccess, ApiError>>;
+  fn: MiddlewareApiCo<Omit<Ctx, 'json'> & FetchJson<ApiSuccess, ApiError extends unknown ? Ctx["_error"] : ApiError>>,
+): CreateAction<Omit<Ctx, 'json'> & FetchJson<ApiSuccess, ApiError extends unknown ? Ctx["_error"] : ApiError>, ApiSuccess>;
 ${method}<P, ApiSuccess, ApiError = unknown>(
   name: ApiName,
   req: { supervisor?: Supervisor },
   fn: MiddlewareApiCo<
     Omit<Ctx, 'payload' | 'json'> &
       Payload<P> &
-      FetchJson<ApiSuccess, ApiError>
+      FetchJson<ApiSuccess, ApiError extends unknown ? Ctx["_error"] : ApiError>
   >,
 ): CreateActionWithPayload<
   Omit<Ctx, 'payload' | 'json'> &
     Payload<P> &
-    FetchJson<ApiSuccess, ApiError>,
-  P
+    FetchJson<ApiSuccess, ApiError extends unknown ? Ctx["_error"] : ApiError>,
+  P,
+  ApiSuccess
 >;`;
   const regMethods = methods.map((m) => methodTmpl(m)).join("\n\n");