rouzer 1.0.0-beta.16 → 1.0.0-beta.18

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]: RouteRequestFunction<Extract<TMethods[M], RouteSchema>, TRoutes[K]["path"]["source"]>; } : never; } & {
     config: {
         /**
          * Base URL to use for all requests.
@@ -54,7 +54,7 @@ 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 {
+type RouteRequestFunction<T extends RouteSchema, P extends string> = (args: RouteArgs<T, P>) => Promise<T extends {
     response: any;
 } ? InferRouteResponse<T> : Response>;
 export {};

package/dist/route.d.ts

@@ -5,6 +5,6 @@ export type Route<P extends string = string, T extends RouteSchemaMap = RouteSch
     path: RoutePattern<P>;
     methods: T;
 } & {
-    [K in keyof T]: RouteFunction<Extract<T[K], RouteSchema>>;
+    [K in keyof T]: RouteFunction<Extract<T[K], RouteSchema>, P>;
 };
 export declare function route<P extends string, T extends RouteSchemaMap>(pattern: P, methods: T): Route<P, T>;

package/dist/server/router.d.ts

@@ -86,14 +86,22 @@ export declare function createRouter<TRoutes extends Routes, TMiddleware extends
     path: T extends {
         path: any;
     } ? z.infer<T["path"]> : Params<TRoutes[K]["path"]["source"]>;
-    query: z.infer<T["query"]>;
-    headers: z.infer<T["headers"]>;
+    query: T extends {
+        query: any;
+    } ? z.infer<T["query"]> : undefined;
+    headers: T extends {
+        headers: any;
+    } ? z.infer<T["headers"]> : undefined;
 }) => Promisable<Response | InferRouteResponse<T>> : T extends MutationRouteSchema ? (context: MiddlewareContext<TMiddleware> & {
     path: T extends {
         path: any;
     } ? z.infer<T["path"]> : Params<TRoutes[K]["path"]["source"]>;
-    body: z.infer<T["body"]>;
-    headers: z.infer<T["headers"]>;
+    body: T extends {
+        body: any;
+    } ? z.infer<T["body"]> : undefined;
+    headers: T extends {
+        headers: any;
+    } ? z.infer<T["headers"]> : undefined;
 }) => Promisable<Response | InferRouteResponse<T>> : never : never : never; }; }) => import("alien-middleware").ApplyMiddleware<TMiddleware, (context: HattipContext<TMiddleware extends MiddlewareChain<infer T extends {
     initial: {
         env: object;

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> ? {
@@ -50,18 +54,20 @@ type QueryArgs<T> = T extends QueryRouteSchema & {
 } : {
     query: z.infer<TQuery>;
 } : unknown;
-type MutationArgs<T> = T extends MutationRouteSchema & {
+type MutationArgs<T> = T extends MutationRouteSchema ? T extends {
     body: infer TBody;
 } ? {} extends z.infer<TBody> ? {
     body?: z.infer<TBody>;
 } : {
     body: z.infer<TBody>;
+} : {
+    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> = {
@@ -77,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 RouteFunction<T extends RouteSchema, P extends string> = {
+    (args: RouteArgs<T, P>): 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.16",
+  "version": "1.0.0-beta.18",
   "type": "module",
   "exports": {
     ".": {