@cushin/api-codegen 1.0.4 → 1.0.6

package/dist/index.js

@@ -90,8 +90,8 @@ var APIClient = class {
     this.authCallbacks = authCallbacks;
     this.hooks = {
       beforeRequest: [
-        (request) => {
-          const tokens = this.authCallbacks?.getTokens();
+        async (request) => {
+          const tokens = await this.authCallbacks?.getTokens();
           if (tokens?.accessToken) {
             request.headers.set(
               "Authorization",
@@ -106,7 +106,7 @@ var APIClient = class {
             if (retryCount === 1 && this.authCallbacks) {
               try {
                 await this.refreshTokens();
-                const tokens = this.authCallbacks.getTokens();
+                const tokens = await this.authCallbacks.getTokens();
                 if (tokens?.accessToken) {
                   request.headers.set(
                     "Authorization",
@@ -114,12 +114,10 @@ var APIClient = class {
                   );
                 }
               } catch (refreshError) {
-                this.authCallbacks.clearTokens();
                 this.authCallbacks.onAuthError?.();
                 throw new AuthError();
               }
             } else {
-              this.authCallbacks?.clearTokens();
               this.authCallbacks?.onAuthError?.();
               throw new AuthError();
             }
@@ -168,10 +166,7 @@ var APIClient = class {
     this.refreshPromise = (async () => {
       try {
         if (this.authCallbacks?.onRefreshToken) {
-          const newAccessToken = await this.authCallbacks.onRefreshToken();
-          this.authCallbacks.setTokens({
-            accessToken: newAccessToken
-          });
+          await this.authCallbacks.onRefreshToken();
         } else {
           throw new AuthError("No refresh token handler provided");
         }
@@ -443,24 +438,12 @@ var HooksGenerator = class extends BaseGenerator {
     const endpointsPath = path6.join(this.context.config.endpointsPath);
     const relativePath = path6.relative(path6.dirname(outputPath), endpointsPath).replace(/\\/g, "/");
     const content = `${useClientDirective ? "'use client';\n" : ""}
-import { useQuery, useMutation, useQueryClient } from '@tanstack/react-query';
-import type { 
-  UseQueryOptions, 
-  UseMutationOptions,
-  QueryKey 
-} from '@tanstack/react-query';
-import { apiClient } from './client';
-import type { 
-  APIEndpoints, 
-  ExtractBody, 
-  ExtractParams, 
-  ExtractQuery, 
-  ExtractResponse 
-} from './types';
-import { queryKeys } from './query-keys';
-${this.hasQueryOptions() ? "import { apiQueryOptions } from './query-options';" : ""}
-import { z } from 'zod';
-import { apiConfig } from '${relativePath}';
+import { useQuery, useMutation, useQueryClient } from "@tanstack/react-query";
+import { apiClient } from "./client";
+import { queryKeys } from "./query-keys";
+import { apiQueryOptions } from "./query-options";
+import { z } from "zod";
+import { apiConfig } from "${relativePath}";
 
 ${this.generateQueryHooks()}
 ${this.generateMutationHooks()}
@@ -771,25 +754,27 @@ ${this.generateEndpointTypes()}
   }
   generateEndpointTypes() {
     const types = [];
-    Object.entries(this.context.apiConfig.endpoints).forEach(([name, endpoint]) => {
-      const cap = this.capitalize(name);
-      if (endpoint.response)
-        types.push(
-          `export type ${cap}Response = ${this.inferNonNull(`typeof apiConfig.endpoints.${name}.response`)};`
-        );
-      if (endpoint.body)
-        types.push(
-          `export type ${cap}Input = ${this.inferNonNull(`typeof apiConfig.endpoints.${name}.body`)};`
-        );
-      if (endpoint.query)
-        types.push(
-          `export type ${cap}Query = ${this.inferNonNull(`typeof apiConfig.endpoints.${name}.query`)};`
-        );
-      if (endpoint.params)
-        types.push(
-          `export type ${cap}Params = ${this.inferNonNull(`typeof apiConfig.endpoints.${name}.params`)};`
-        );
-    });
+    Object.entries(this.context.apiConfig.endpoints).forEach(
+      ([name, endpoint]) => {
+        const cap = this.capitalize(name);
+        if (endpoint.response)
+          types.push(
+            `export type ${cap}Response = ${this.inferNonNull(`typeof apiConfig.endpoints.${name}.response`)};`
+          );
+        if (endpoint.body)
+          types.push(
+            `export type ${cap}Input = ${this.inferNonNull(`typeof apiConfig.endpoints.${name}.body`)};`
+          );
+        if (endpoint.query)
+          types.push(
+            `export type ${cap}Query = ${this.inferNonNull(`typeof apiConfig.endpoints.${name}.query`)};`
+          );
+        if (endpoint.params)
+          types.push(
+            `export type ${cap}Params = ${this.inferNonNull(`typeof apiConfig.endpoints.${name}.params`)};`
+          );
+      }
+    );
     return types.join("\n");
   }
 };
@@ -808,7 +793,10 @@ var ClientGenerator = class extends BaseGenerator {
   }
   async generateServerClientFile() {
     const content = this.generateServerClientContent();
-    const outputPath = path6.join(this.context.config.outputDir, "server-client.ts");
+    const outputPath = path6.join(
+      this.context.config.outputDir,
+      "server-client.ts"
+    );
     await fs5.mkdir(path6.dirname(outputPath), { recursive: true });
     await fs5.writeFile(outputPath, content, "utf-8");
   }
@@ -821,36 +809,36 @@ var ClientGenerator = class extends BaseGenerator {
 import { createAPIClient } from '@cushin/api-codegen/client';
 import type { AuthCallbacks } from '@cushin/api-codegen/client';
 import { apiConfig } from '${relativePath}';
-import type { APIEndpoints } from './types';
 import { z } from 'zod';
 
-// Type-safe API client methods
+// Type the methods based on endpoints
 type APIClientMethods = {
-  [K in keyof APIEndpoints]: APIEndpoints[K] extends {
+  [K in keyof typeof apiConfig.endpoints]: (typeof apiConfig.endpoints)[K] extends {
     method: infer M;
     params?: infer P;
     query?: infer Q;
     body?: infer B;
     response: infer R;
   }
-    ? M extends 'GET'
-      ? P extends { _type: any }
-        ? Q extends { _type: any }
-          ? (params: P['_type'], query?: Q['_type']) => Promise<R['_type']>
-          : (params: P['_type']) => Promise<R['_type']>
-        : Q extends { _type: any }
-          ? (query?: Q['_type']) => Promise<R['_type']>
-          : () => Promise<R['_type']>
-      : P extends { _type: any }
-        ? B extends { _type: any }
-          ? (params: P['_type'], body: B['_type']) => Promise<R['_type']>
-          : (params: P['_type']) => Promise<R['_type']>
-        : B extends { _type: any }
-          ? (body: B['_type']) => Promise<R['_type']>
-          : () => Promise<R['_type']>
+    ? M extends "GET"
+      ? P extends z.ZodJSONSchema
+        ? Q extends z.ZodJSONSchema
+          ? (params: z.infer<P>, query?: z.infer<Q>) => Promise<z.infer<R>>
+          : (params: z.infer<P>) => Promise<z.infer<R>>
+        : Q extends z.ZodJSONSchema
+          ? (query?: z.infer<Q>) => Promise<z.infer<R>>
+          : () => Promise<z.infer<R>>
+      : P extends z.ZodJSONSchema
+        ? B extends z.ZodJSONSchema
+          ? (params: z.infer<P>, body: z.infer<B>) => Promise<z.infer<R>>
+          : (params: z.infer<P>) => Promise<z.infer<R>>
+        : B extends z.ZodJSONSchema
+          ? (body: z.infer<B>) => Promise<z.infer<R>>
+          : () => Promise<z.infer<R>>
     : never;
 };
 
+
 // Export singleton instance (will be initialized later)
 export let baseClient: APIClientMethods & {
   refreshAuth: () => Promise<void>;
@@ -930,49 +918,51 @@ export const serverClient = createAPIClient(apiConfig) as APIClientMethods;
   }
   generateApiClientMethods() {
     const methods = [];
-    Object.entries(this.context.apiConfig.endpoints).forEach(([name, endpoint]) => {
-      const inferParams = this.inferNonNull(
-        `typeof apiConfig.endpoints.${name}.params`
-      );
-      const inferQuery = this.inferNonNull(
-        `typeof apiConfig.endpoints.${name}.query`
-      );
-      const inferBody = this.inferNonNull(
-        `typeof apiConfig.endpoints.${name}.body`
-      );
-      const inferResponse = this.inferNonNull(
-        `typeof apiConfig.endpoints.${name}.response`
-      );
-      if (endpoint.method === "GET") {
-        if (endpoint.params && endpoint.query) {
-          methods.push(`  ${name}: (params: ${inferParams}, query?: ${inferQuery}): Promise<${inferResponse}> => 
+    Object.entries(this.context.apiConfig.endpoints).forEach(
+      ([name, endpoint]) => {
+        const inferParams = this.inferNonNull(
+          `typeof apiConfig.endpoints.${name}.params`
+        );
+        const inferQuery = this.inferNonNull(
+          `typeof apiConfig.endpoints.${name}.query`
+        );
+        const inferBody = this.inferNonNull(
+          `typeof apiConfig.endpoints.${name}.body`
+        );
+        const inferResponse = this.inferNonNull(
+          `typeof apiConfig.endpoints.${name}.response`
+        );
+        if (endpoint.method === "GET") {
+          if (endpoint.params && endpoint.query) {
+            methods.push(`  ${name}: (params: ${inferParams}, query?: ${inferQuery}): Promise<${inferResponse}> => 
     (baseClient as any).${name}(params, query),`);
-        } else if (endpoint.params) {
-          methods.push(`  ${name}: (params: ${inferParams}): Promise<${inferResponse}> => 
+          } else if (endpoint.params) {
+            methods.push(`  ${name}: (params: ${inferParams}): Promise<${inferResponse}> => 
     (baseClient as any).${name}(params),`);
-        } else if (endpoint.query) {
-          methods.push(`  ${name}: (query?: ${inferQuery}): Promise<${inferResponse}> => 
+          } else if (endpoint.query) {
+            methods.push(`  ${name}: (query?: ${inferQuery}): Promise<${inferResponse}> => 
     (baseClient as any).${name}(query),`);
-        } else {
-          methods.push(`  ${name}: (): Promise<${inferResponse}> => 
+          } else {
+            methods.push(`  ${name}: (): Promise<${inferResponse}> => 
     (baseClient as any).${name}(),`);
-        }
-      } else {
-        if (endpoint.params && endpoint.body) {
-          methods.push(`  ${name}: (params: ${inferParams}, body: ${inferBody}): Promise<${inferResponse}> => 
+          }
+        } else {
+          if (endpoint.params && endpoint.body) {
+            methods.push(`  ${name}: (params: ${inferParams}, body: ${inferBody}): Promise<${inferResponse}> => 
     (baseClient as any).${name}(params, body),`);
-        } else if (endpoint.params) {
-          methods.push(`  ${name}: (params: ${inferParams}): Promise<${inferResponse}> => 
+          } else if (endpoint.params) {
+            methods.push(`  ${name}: (params: ${inferParams}): Promise<${inferResponse}> => 
     (baseClient as any).${name}(params),`);
-        } else if (endpoint.body) {
-          methods.push(`  ${name}: (body: ${inferBody}): Promise<${inferResponse}> => 
+          } else if (endpoint.body) {
+            methods.push(`  ${name}: (body: ${inferBody}): Promise<${inferResponse}> => 
     (baseClient as any).${name}(body),`);
-        } else {
-          methods.push(`  ${name}: (): Promise<${inferResponse}> => 
+          } else {
+            methods.push(`  ${name}: (): Promise<${inferResponse}> => 
     (baseClient as any).${name}(),`);
+          }
         }
       }
-    });
+    );
     return methods.join("\n");
   }
 };