@ryneex/api-client 0.0.51 → 0.0.85

package/index.d.ts

@@ -2,33 +2,50 @@ import { UseQueryOptions, UseMutationOptions } from '@tanstack/react-query';
 import { AxiosInstance, AxiosRequestConfig, AxiosResponse, AxiosError } from 'axios';
 import z, { ZodError } from 'zod';
 
-type ReactQueryOptions<TResponse, TData = void> = Omit<UseQueryOptions<TResponse, ZodError<TResponse> | AxiosError>, "queryFn" | "queryKey"> & {
+type ReactQueryOptions<TOutput, TInput, TVariables> = Omit<UseQueryOptions<TOutput, ZodError<TOutput> | AxiosError>, "queryFn" | "queryKey"> & {
     queryKey?: unknown[];
-} & (TData extends void ? {
-    data?: void;
+} & (object extends TData<TInput, TVariables> ? {
+    data?: undefined;
 } : {
-    data: TData;
+    data: TData<TInput, TVariables>;
 }) & {
-    onSuccess?: (data: TResponse, variables: TData) => void;
-    onError?: (error: ZodError<TResponse> | AxiosError, variables: TData) => void;
+    onSuccess?: (data: TOutput, payload: object extends TData<TInput, TVariables> ? void : TData<TInput, TVariables>) => void;
+    onError?: (error: ZodError<TOutput> | AxiosError, payload: object extends TData<TInput, TVariables> ? void : TData<TInput, TVariables>) => void;
 };
-type ReactMutationOptions<TResponse, TData = void> = Omit<UseMutationOptions<TResponse, ZodError<TResponse> | AxiosError, TData>, "mutationFn" | "mutationKey"> & {
+type ReactMutationOptions<TOutput, TInput, TVariables> = Omit<UseMutationOptions<TOutput, ZodError<TOutput> | AxiosError, OptionalTData<TInput, TVariables>>, "mutationFn" | "mutationKey"> & {
     mutationKey?: unknown[];
 };
+type TData<TInput, TVariables> = {} & (TInput extends void ? {
+    input?: undefined;
+} : {
+    input: TInput;
+}) & (TVariables extends void ? {
+    variables?: undefined;
+} : {
+    variables: TVariables;
+});
+type OptionalTData<TInput, TVariables> = object extends TData<TInput, TVariables> ? void : TData<TInput, TVariables>;
 declare class BaseApiClient {
     readonly axios: AxiosInstance;
     constructor(axios: AxiosInstance);
-    createEndpoint<TResponse, TData = void>({ method, path, axiosOptions: axiosOptionsFn, dataSchema, responseSchema, }: {
+    createEndpoint<TOutputSchema extends z.ZodType, TInputSchema extends z.ZodType | undefined, TVariablesSchema extends z.ZodType | undefined, TOutput = z.infer<TOutputSchema>, TInput = undefined extends TInputSchema ? void : z.infer<TInputSchema>, TVariables = undefined extends TVariablesSchema ? void : z.infer<TVariablesSchema>>({ method, path, axiosOptions: axiosOptionsFn, variablesSchema, inputSchema, outputSchema, }: {
         method: "GET" | "POST" | "PUT" | "PATCH" | "DELETE";
-        path: string | ((data: TData) => string);
-        axiosOptions?: (data: TData) => AxiosRequestConfig;
-        dataSchema?: z.ZodType<TData>;
-        responseSchema: z.ZodType<TResponse>;
-    }): ((data: TData) => Promise<AxiosResponse<TResponse>>) & {
-        queryKey: (data: TData | void) => (string | NonNullable<TData>)[];
-        queryOptions: (opts: TData extends void ? ReactQueryOptions<TResponse> | void : ReactQueryOptions<TResponse, TData>) => UseQueryOptions<TResponse, ZodError<TResponse> | AxiosError>;
+        path: string | ((data: TData<TInput, TVariables>) => string);
+        axiosOptions?: (data: TData<TInput, TVariables>) => AxiosRequestConfig;
+        variablesSchema?: TVariablesSchema;
+        inputSchema?: TInputSchema;
+        outputSchema: TOutputSchema;
+    }): ((opts: OptionalTData<TInput, TVariables>) => Promise<AxiosResponse<TOutput>>) & {
+        queryKey: (data: TInput | void) => (string | NonNullable<TInput>)[];
+        queryOptions: (opts: object extends TData<TInput, TVariables> ? ReactQueryOptions<TOutput, TInput, TVariables> | void : ReactQueryOptions<TOutput, TInput, TVariables>) => UseQueryOptions<TOutput, ZodError<TOutput> | AxiosError>;
         mutationKey: () => string[];
-        mutationOptions: (opts: ReactMutationOptions<TResponse, TData> | void) => UseMutationOptions<TResponse, ZodError<TResponse> | AxiosError, TData>;
+        mutationOptions: (opts: ReactMutationOptions<TOutput, TInput, TVariables> | void) => UseMutationOptions<TOutput, ZodError<TOutput> | AxiosError, OptionalTData<TInput, TVariables>>;
+        config: {
+            inputSchema: undefined extends TInputSchema ? undefined : NonNullable<TInputSchema>;
+            outputSchema: TOutputSchema;
+            method: "GET" | "POST" | "PUT" | "PATCH" | "DELETE";
+            path: string | ((data: TData<TInput, TVariables>) => string);
+        };
     };
 }
 

package/index.js

@@ -10,19 +10,24 @@ var BaseApiClient = class {
     method,
     path,
     axiosOptions: axiosOptionsFn,
-    dataSchema,
-    responseSchema
+    variablesSchema,
+    inputSchema,
+    outputSchema
   }) {
     const uuid = crypto.randomUUID();
-    const call = async (data) => {
-      if (dataSchema) {
-        dataSchema.parse(data);
+    const call = async (opts) => {
+      const data = opts ?? {};
+      if (inputSchema) {
+        inputSchema.parse(data.input);
+      }
+      if (variablesSchema) {
+        variablesSchema.parse(data.variables);
       }
       const axiosOptions = axiosOptionsFn?.(data);
       const url = typeof path === "function" ? path(data) : path;
       if (method === "GET") {
         const response = await this.axios.get(url, axiosOptions);
-        responseSchema.parse(response.data);
+        outputSchema.parse(response.data);
         return response;
       }
       if (method === "POST") {
@@ -31,7 +36,7 @@ var BaseApiClient = class {
           axiosOptions?.data,
           axiosOptions
         );
-        responseSchema.parse(response.data);
+        outputSchema.parse(response.data);
         return response;
       }
       if (method === "PUT") {
@@ -40,7 +45,7 @@ var BaseApiClient = class {
           axiosOptions?.data,
           axiosOptions
         );
-        responseSchema.parse(response.data);
+        outputSchema.parse(response.data);
         return response;
       }
       if (method === "PATCH") {
@@ -49,12 +54,12 @@ var BaseApiClient = class {
           axiosOptions?.data,
           axiosOptions
         );
-        responseSchema.parse(response.data);
+        outputSchema.parse(response.data);
         return response;
       }
       if (method === "DELETE") {
         const response = await this.axios.delete(url, axiosOptions);
-        responseSchema.parse(response.data);
+        outputSchema.parse(response.data);
         return response;
       }
       throw new Error(`API SDK: Unsupported method: ${method}`);
@@ -66,8 +71,13 @@ var BaseApiClient = class {
       return {
         queryFn: async () => {
           try {
-            const response = await call(data);
-            options.onSuccess?.(response.data, data);
+            const response = await call(
+              data
+            );
+            options.onSuccess?.(
+              response.data,
+              data
+            );
             return response.data;
           } catch (error) {
             options.onError?.(
@@ -96,7 +106,13 @@ var BaseApiClient = class {
       queryKey,
       queryOptions,
       mutationKey,
-      mutationOptions
+      mutationOptions,
+      config: {
+        inputSchema,
+        outputSchema,
+        method,
+        path
+      }
     });
   }
 };

package/package.json

@@ -2,7 +2,7 @@
   "name": "@ryneex/api-client",
   "module": "src/index.ts",
   "type": "module",
-  "version": "0.0.51",
+  "version": "0.0.85",
   "exports": {
     ".": "./index.js"
   },