@ryneex/api-client 1.0.0-beta.3 → 1.1.0

package/index.d.ts

@@ -9,14 +9,14 @@ type ClientPayload<TInput, TVariables> = {} & (unknown extends TInput ? unknown
     variables: TVariables;
 });
 type OptionalPayload<T> = object extends T ? void : T;
-type ClientOptions<TOutputSchema extends z.ZodType, TInputSchema extends z.ZodType, TVariablesSchema extends z.ZodType, TOutput = z.output<TOutputSchema>, TInput = z.input<TInputSchema>, TVariables = z.input<TVariablesSchema>> = {
+type ClientOptions<TOutputSchema extends z.ZodType, TInputSchema extends z.ZodType, TVariablesSchema extends z.ZodType, TOutput = z.output<TOutputSchema>, TInputCoerced = z.output<TInputSchema>, TVariablesCoerced = z.output<TVariablesSchema>> = {
     method: "GET" | "POST" | "PUT" | "PATCH" | "DELETE";
-    path: string | ((payload: ClientPayload<TInput, TVariables>) => string);
-    axiosOptions?: (payload: ClientPayload<TInput, TVariables>) => AxiosRequestConfig;
+    path: string | ((payload: ClientPayload<TInputCoerced, TVariablesCoerced>) => string);
+    axiosOptions?: (payload: ClientPayload<TInputCoerced, TVariablesCoerced>) => AxiosRequestConfig;
     variablesSchema?: TVariablesSchema;
     inputSchema?: TInputSchema;
     outputSchema: TOutputSchema;
-    transform?: (data: z.output<TOutputSchema>, payload: ClientPayload<TInput, TVariables>) => TOutput;
+    transform?: (data: z.output<TOutputSchema>, payload: ClientPayload<TInputCoerced, TVariablesCoerced>) => TOutput;
 };
 
 type ReactQueryOptions<TOutput, TInput, TVariables> = Omit<UseQueryOptions<TOutput, ClientError>, "queryFn" | "queryKey"> & {
@@ -40,9 +40,11 @@ type Err<E> = {
     error: E;
 };
 type Result<T, E> = Ok<T> | Err<E>;
+type InferOk<T> = T extends Ok<infer K> ? K : never;
+type InferErr<T> = T extends Err<infer K> ? K : never;
 
 declare function createClient(axios: AxiosInstance): {
-    create: <TOutputSchema extends z.ZodType, TInputSchema extends z.ZodType, TVariablesSchema extends z.ZodType, TOutput = z.core.output<TOutputSchema>, TInput = z.core.input<TInputSchema>, TVariables = z.core.input<TVariablesSchema>>(opts: ClientOptions<TOutputSchema, TInputSchema, TVariablesSchema, TOutput, TInput, TVariables>) => ((_payload: OptionalPayload<ClientPayload<TInput, TVariables>>) => Promise<Result<TOutput, ClientError>>) & {
+    create: <TOutputSchema extends z.ZodType, TInputSchema extends z.ZodType, TVariablesSchema extends z.ZodType, TOutput = z.core.output<TOutputSchema>, TInput = z.core.input<TInputSchema>, TInputCoerced = z.core.output<TInputSchema>, TVariables = z.core.input<TVariablesSchema>, TVariablesCoerced = z.core.output<TVariablesSchema>>(opts: ClientOptions<TOutputSchema, TInputSchema, TVariablesSchema, TOutput, TInputCoerced, TVariablesCoerced>) => ((_payload: OptionalPayload<ClientPayload<TInput, TVariables>>) => Promise<Result<TOutput, ClientError>>) & {
         call: (_payload: OptionalPayload<ClientPayload<TInput, TVariables>>) => Promise<Result<TOutput, ClientError>>;
         queryOptions: (_opts: object extends ClientPayload<TInput, TVariables> ? ReactQueryOptions<TOutput, TInput, TVariables> | void : ReactQueryOptions<TOutput, TInput, TVariables>) => UseQueryOptions<TOutput, ClientError>;
         mutationOptions: (_opts: ReactMutationOptions<TOutput, TInput, TVariables> | void) => UseMutationOptions<TOutput, ClientError, object extends ClientPayload<TInput, TVariables> ? void : ClientPayload<TInput, TVariables>>;
@@ -53,18 +55,18 @@ declare function createClient(axios: AxiosInstance): {
             variablesSchema: undefined extends TVariablesSchema ? undefined : NonNullable<TVariablesSchema>;
             axios: AxiosInstance;
             method: "GET" | "POST" | "PUT" | "PATCH" | "DELETE";
-            path: string | ((payload: ClientPayload<TInput, TVariables>) => string);
-            axiosOptions?: ((payload: ClientPayload<TInput, TVariables>) => axios.AxiosRequestConfig) | undefined;
+            path: string | ((payload: ClientPayload<TInputCoerced, TVariablesCoerced>) => string);
+            axiosOptions?: ((payload: ClientPayload<TInputCoerced, TVariablesCoerced>) => axios.AxiosRequestConfig) | undefined;
             outputSchema: TOutputSchema;
-            transform?: ((data: z.core.output<TOutputSchema>, payload: ClientPayload<TInput, TVariables>) => TOutput) | undefined;
+            transform?: ((data: z.core.output<TOutputSchema>, payload: ClientPayload<TInputCoerced, TVariablesCoerced>) => TOutput) | undefined;
         };
     };
 };
 
-declare function callApi<TOutputSchema extends z.ZodType, TInputSchema extends z.ZodType, TVariablesSchema extends z.ZodType, TOutput = z.output<TOutputSchema>, TInput = z.input<TInputSchema>, TVariables = z.input<TVariablesSchema>>(opts: ClientOptions<TOutputSchema, TInputSchema, TVariablesSchema, TOutput, TInput, TVariables> & {
+declare function callApi<TOutputSchema extends z.ZodType, TInputSchema extends z.ZodType, TVariablesSchema extends z.ZodType, TOutput = z.output<TOutputSchema>, TInputCoerced = z.output<TInputSchema>, TInput = z.input<TInputSchema>, TVariablesCoerced = z.output<TVariablesSchema>, TVariables = z.input<TVariablesSchema>>(opts: ClientOptions<TOutputSchema, TInputSchema, TVariablesSchema, TOutput, TInputCoerced, TVariablesCoerced> & {
     axios: AxiosInstance;
-}, data: ClientPayload<TInput, TVariables>): Promise<Result<TOutput, ClientError>>;
-declare function getResponse<TOutputSchema extends z.ZodType, TInputSchema extends z.ZodType, TVariablesSchema extends z.ZodType, TOutput = z.output<TOutputSchema>, TInput = z.input<TInputSchema>, TVariables = z.input<TVariablesSchema>>(request: Promise<AxiosResponse<TOutput>>, opts: ClientOptions<TOutputSchema, TInputSchema, TVariablesSchema, TOutput, TInput, TVariables>, payload: ClientPayload<TInput, TVariables>): Promise<Result<TOutput, ClientError>>;
+}, _data: ClientPayload<TInput, TVariables>): Promise<Result<TOutput, ClientError>>;
+declare function getResponse<TOutputSchema extends z.ZodType, TInputSchema extends z.ZodType, TVariablesSchema extends z.ZodType, TOutput = z.output<TOutputSchema>, TInputCoerced = z.output<TInputSchema>, TVariablesCoerced = z.output<TVariablesSchema>>(request: Promise<AxiosResponse<TOutput>>, opts: ClientOptions<TOutputSchema, TInputSchema, TVariablesSchema, TOutput, TInputCoerced, TVariablesCoerced>, payload: ClientPayload<TInputCoerced, TVariablesCoerced>): Promise<Result<TOutput, ClientError>>;
 
 declare const VALIDATION_ERROR_NAMES: {
     readonly INPUT: "InputValidationError";
@@ -81,4 +83,4 @@ declare class ValidationError extends ZodError {
 declare function ok<T>(data: T, response: AxiosResponse): Ok<T>;
 declare function err<E>(error: E): Err<E>;
 
-export { type ApiClientErrorProps, type ClientError, type ClientOptions, type ClientPayload, type Err, type Ok, type OptionalPayload, type ReactMutationOptions, type ReactQueryOptions, type Result, VALIDATION_ERROR_NAMES, ValidationError, callApi, createClient, err, getResponse, ok };
+export { type ApiClientErrorProps, type ClientError, type ClientOptions, type ClientPayload, type Err, type InferErr, type InferOk, type Ok, type OptionalPayload, type ReactMutationOptions, type ReactQueryOptions, type Result, VALIDATION_ERROR_NAMES, ValidationError, callApi, createClient, err, getResponse, ok };

package/index.js

@@ -59,7 +59,8 @@ function createClient(axios) {
 
 // src/lib/call-api.ts
 import "zod";
-async function callApi(opts, data) {
+async function callApi(opts, _data) {
+  const data = {};
   if (typeof data !== "object")
     throw new Error("API_CLIENT_INTERNAL_ERROR: Data must be an object");
   if (opts.inputSchema && "input" in data) {
@@ -71,6 +72,7 @@ async function callApi(opts, data) {
           issues: parsedResult.error.issues
         })
       );
+    data.input = parsedResult.data;
   }
   if (opts.variablesSchema && "variables" in data) {
     const parsedResult = opts.variablesSchema.safeParse(data.variables);
@@ -81,6 +83,7 @@ async function callApi(opts, data) {
           issues: parsedResult.error.issues
         })
       );
+    data.variables = parsedResult.data;
   }
   const axiosOptions = opts.axiosOptions?.(data);
   const url = typeof opts.path === "function" ? opts.path(data) : opts.path;

package/package.json

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