@ryneex/api-client 0.0.8 → 0.0.85

package/index.d.ts

@@ -2,38 +2,49 @@ import { UseQueryOptions, UseMutationOptions } from '@tanstack/react-query';
 import { AxiosInstance, AxiosRequestConfig, AxiosResponse, AxiosError } from 'axios';
 import z, { ZodError } from 'zod';
 
-type ReactQueryOptions<TOutput, TInput = void> = Omit<UseQueryOptions<TOutput, ZodError<TOutput> | AxiosError>, "queryFn" | "queryKey"> & {
+type ReactQueryOptions<TOutput, TInput, TVariables> = Omit<UseQueryOptions<TOutput, ZodError<TOutput> | AxiosError>, "queryFn" | "queryKey"> & {
     queryKey?: unknown[];
-} & (TInput extends void ? {
-    data?: void;
+} & (object extends TData<TInput, TVariables> ? {
+    data?: undefined;
 } : {
-    data: TInput;
+    data: TData<TInput, TVariables>;
 }) & {
-    onSuccess?: (data: TOutput, variables: TInput) => void;
-    onError?: (error: ZodError<TOutput> | AxiosError, variables: TInput) => 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<TOutput, TInput = void> = Omit<UseMutationOptions<TOutput, ZodError<TOutput> | AxiosError, TInput>, "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<TOutputSchema extends z.ZodType, TInputSchema extends z.ZodType | undefined, TOutput = z.infer<TOutputSchema>, TInput = undefined extends TInputSchema ? void : z.infer<TInputSchema>>({ method, path, axiosOptions: axiosOptionsFn, inputSchema, outputSchema, }: {
+    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: TInput) => string);
-        axiosOptions?: (data: TInput) => AxiosRequestConfig;
+        path: string | ((data: TData<TInput, TVariables>) => string);
+        axiosOptions?: (data: TData<TInput, TVariables>) => AxiosRequestConfig;
+        variablesSchema?: TVariablesSchema;
         inputSchema?: TInputSchema;
         outputSchema: TOutputSchema;
-    }): ((data: TInput) => Promise<AxiosResponse<TOutput>>) & {
+    }): ((opts: OptionalTData<TInput, TVariables>) => Promise<AxiosResponse<TOutput>>) & {
         queryKey: (data: TInput | void) => (string | NonNullable<TInput>)[];
-        queryOptions: (opts: TInput extends void ? ReactQueryOptions<TOutput> | void : ReactQueryOptions<TOutput, TInput>) => UseQueryOptions<TOutput, ZodError<TOutput> | AxiosError>;
+        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<TOutput, TInput> | void) => UseMutationOptions<TOutput, ZodError<TOutput> | AxiosError, TInput>;
+        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: TInput) => string);
+            path: string | ((data: TData<TInput, TVariables>) => string);
         };
     };
 }

package/index.js

@@ -10,13 +10,18 @@ var BaseApiClient = class {
     method,
     path,
     axiosOptions: axiosOptionsFn,
+    variablesSchema,
     inputSchema,
     outputSchema
   }) {
     const uuid = crypto.randomUUID();
-    const call = async (data) => {
+    const call = async (opts) => {
+      const data = opts ?? {};
       if (inputSchema) {
-        inputSchema.parse(data);
+        inputSchema.parse(data.input);
+      }
+      if (variablesSchema) {
+        variablesSchema.parse(data.variables);
       }
       const axiosOptions = axiosOptionsFn?.(data);
       const url = typeof path === "function" ? path(data) : path;
@@ -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?.(

package/package.json

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