rouzer 1.0.0-beta.17 → 1.0.0-beta.19

package/dist/client/index.d.ts

@@ -24,7 +24,7 @@ export declare function createClient<TRoutes extends Record<string, Route> = Rec
      * response is always parsed as JSON, regardless of the HTTP status code.
      */
     onJsonError?: (response: Response) => Promisable<Response>;
-}): { [K in keyof TRoutes]: TRoutes[K]["methods"] extends infer TMethods ? { [M in keyof TMethods]: RouteRequestFunction<Extract<TMethods[M], RouteSchema>>; } : never; } & {
+}): { [K in keyof TRoutes]: TRoutes[K]["methods"] extends infer TMethods ? { [M in keyof TMethods]: RouteFunction<Extract<TMethods[M], RouteSchema>, TRoutes[K]["path"]["source"]>; } : never; } & {
     config: {
         /**
          * Base URL to use for all requests.
@@ -54,7 +54,11 @@ export declare function createClient<TRoutes extends Record<string, Route> = Rec
     }>;
     json: <T extends RouteRequest>(props: T) => Promise<T["$result"]>;
 };
-type RouteRequestFunction<T extends RouteSchema> = (args: RouteArgs<T>) => Promise<T extends {
+/**
+ * This function sends a request to a route of the same name. Such a function is
+ * accessible by setting the `routes` option when creating a Rouzer client,
+ * where it will exist as a method on the client.
+ */
+export type RouteFunction<T extends RouteSchema, P extends string> = (...p: RouteArgs<T, P> extends infer TArgs ? {} extends TArgs ? [args?: TArgs] : [args: TArgs] : never) => Promise<T extends {
     response: any;
 } ? InferRouteResponse<T> : Response>;
-export {};

package/dist/route.d.ts

@@ -1,10 +1,10 @@
 import { RoutePattern } from '@remix-run/route-pattern';
-import type { RouteFunction, RouteSchema, RouteSchemaMap, Unchecked } from './types.js';
+import type { RouteRequestFactory, RouteSchema, RouteSchemaMap, Unchecked } from './types.js';
 export declare function $type<T>(): Unchecked<T>;
 export type Route<P extends string = string, T extends RouteSchemaMap = RouteSchemaMap> = {
     path: RoutePattern<P>;
     methods: T;
 } & {
-    [K in keyof T]: RouteFunction<Extract<T[K], RouteSchema>>;
+    [K in keyof T]: RouteRequestFactory<Extract<T[K], RouteSchema>, P>;
 };
 export declare function route<P extends string, T extends RouteSchemaMap>(pattern: P, methods: T): Route<P, T>;

package/dist/types.d.ts

@@ -36,13 +36,17 @@ export type Routes = {
 declare class Any {
     private isAny;
 }
-type PathArgs<T> = T extends {
-    path: infer TPath extends string;
-} ? Params<TPath> extends infer TParams ? {} extends TParams ? {
+type PathArgs<T, P extends string> = T extends {
+    path: infer TPath;
+} ? {} extends z.infer<TPath> ? {
+    path?: z.infer<TPath>;
+} : {
+    path: z.infer<TPath>;
+} : Params<P> extends infer TParams ? {} extends TParams ? {
     path?: TParams;
 } : {
     path: TParams;
-} : unknown : unknown;
+} : unknown;
 type QueryArgs<T> = T extends QueryRouteSchema & {
     query: infer TQuery;
 } ? {} extends z.infer<TQuery> ? {
@@ -59,11 +63,11 @@ type MutationArgs<T> = T extends MutationRouteSchema ? T extends {
 } : {
     body?: unknown;
 } : unknown;
-export type RouteArgs<T extends RouteSchema = any> = ([T] extends [Any] ? {
+export type RouteArgs<T extends RouteSchema = any, P extends string = string> = ([T] extends [Any] ? {
     query?: any;
     body?: any;
     path?: any;
-} : QueryArgs<T> & MutationArgs<T> & PathArgs<T>) & Omit<RequestInit, 'method' | 'body' | 'headers'> & {
+} : QueryArgs<T> & MutationArgs<T> & PathArgs<T, P>) & Omit<RequestInit, 'method' | 'body' | 'headers'> & {
     headers?: Record<string, string | undefined>;
 };
 export type RouteRequest<TResult = any> = {
@@ -79,9 +83,9 @@ export type RouteResponse<TResult = any> = Response & {
 export type InferRouteResponse<T extends RouteSchema> = T extends {
     response: Unchecked<infer TResponse>;
 } ? TResponse : void;
-export type RouteFunction<T extends RouteSchema> = {
-    (args: RouteArgs<T>): RouteRequest<InferRouteResponse<T>>;
-    $args: RouteArgs<T>;
+export type RouteRequestFactory<T extends RouteSchema, P extends string> = {
+    (...p: RouteArgs<T, P> extends infer TArgs ? {} extends TArgs ? [args?: TArgs] : [args: TArgs] : never): RouteRequest<InferRouteResponse<T>>;
+    $args: RouteArgs<T, P>;
     $response: InferRouteResponse<T>;
 };
 export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rouzer",
-  "version": "1.0.0-beta.17",
+  "version": "1.0.0-beta.19",
   "type": "module",
   "exports": {
     ".": {