rouzer 1.0.0-beta.3 → 1.0.0-beta.5

package/dist/client/index.d.ts

@@ -1,3 +1,4 @@
+import type { Promisable, RouteRequest } from '../types.js';
 export declare function createClient(config: {
     /**
      * Base URL to use for all requests.
@@ -11,7 +12,7 @@ export declare function createClient(config: {
      * Custom handler for non-200 response to a `.json()` request. By default, the
      * response is always parsed as JSON, regardless of the HTTP status code.
      */
-    onJsonError?: (response: Response) => Response;
+    onJsonError?: (response: Response) => Promisable<Response>;
 }): {
     config: {
         /**
@@ -26,7 +27,7 @@ export declare function createClient(config: {
          * Custom handler for non-200 response to a `.json()` request. By default, the
          * response is always parsed as JSON, regardless of the HTTP status code.
          */
-        onJsonError?: (response: Response) => Response;
+        onJsonError?: (response: Response) => Promisable<Response>;
     };
     request<T extends RouteRequest>({ pathPattern, method, args: { path, query, body, headers }, route, }: T): Promise<Response & {
         json(): Promise<T["$result"]>;

package/dist/client/index.js

@@ -1,4 +1,4 @@
-import { shake } from '../common';
+import { shake } from '../common.js';
 export function createClient(config) {
     return {
         config,

package/dist/index.d.ts

@@ -1,5 +1,5 @@
-export * from './route';
-export * from './server/router';
-export * from './client/index';
-export type * from './types';
+export * from './route.js';
+export * from './server/router.js';
+export * from './client/index.js';
+export type * from './types.js';
 export * from 'alien-middleware';

package/dist/index.js

@@ -1,4 +1,4 @@
-export * from './route';
-export * from './server/router';
-export * from './client/index';
+export * from './route.js';
+export * from './server/router.js';
+export * from './client/index.js';
 export * from 'alien-middleware';

package/dist/route.d.ts

@@ -1,8 +1,8 @@
 import { RoutePattern } from '@remix-run/route-pattern';
-import type { Routes } from './types';
+import type { MutationRoute, QueryRoute, RouteFunction, Routes, Unchecked } from './types.js';
 export declare function $type<T>(): Unchecked<T>;
 export declare function route<P extends string, T extends Routes>(path: P, routes: T): {
     path: P;
     pathPattern: RoutePattern<string>;
     routes: T;
-} & { [K in keyof T]: RouteFunction<any>; };
+} & { [K in keyof T]: RouteFunction<Extract<T[K], MutationRoute | QueryRoute>>; };

package/dist/route.js

@@ -1,5 +1,5 @@
 import { RoutePattern } from '@remix-run/route-pattern';
-import { mapEntries } from './common';
+import { mapEntries } from './common.js';
 export function $type() {
     return null;
 }

package/dist/server/router.d.ts

@@ -2,7 +2,7 @@ import type { AdapterRequestContext } from '@hattip/core';
 import { type Params } from '@remix-run/route-pattern';
 import { chain, MiddlewareChain, type MiddlewareContext } from 'alien-middleware';
 import * as z from 'zod/mini';
-import type { Routes } from '../types';
+import type { InferRouteResponse, MutationRoute, Promisable, QueryRoute, Routes } from '../types.js';
 export { chain };
 type EmptyMiddlewareChain<TPlatform = unknown> = MiddlewareChain<{
     initial: {
@@ -31,14 +31,18 @@ export declare function createRouter<TRoutes extends Record<string, {
     middlewares?: TMiddleware;
     debug?: boolean;
 }): (handlers: { [K in keyof TRoutes]: { [M in keyof TRoutes[K]["routes"]]: TRoutes[K]["routes"][M] extends infer T ? T extends TRoutes[K]["routes"][M] ? T extends QueryRoute ? (context: MiddlewareContext<TMiddleware> & {
+    path: T extends {
+        path: any;
+    } ? z.infer<T["path"]> : Params<TRoutes[K]["path"]>;
     query: z.infer<T["query"]>;
-    params: Params<TRoutes[K]["path"]>;
     headers: z.infer<T["headers"]>;
-}) => Promisable<TResult | Response> : T extends MutationRoute ? (context: MiddlewareContext<TMiddleware> & {
+}) => Promisable<Response | InferRouteResponse<T>> : T extends MutationRoute ? (context: MiddlewareContext<TMiddleware> & {
+    path: T extends {
+        path: any;
+    } ? z.infer<T["path"]> : Params<TRoutes[K]["path"]>;
     body: z.infer<T["body"]>;
-    params: Params<TRoutes[K]["path"]>;
     headers: z.infer<T["headers"]>;
-}) => Promisable<TResult | Response> : never : never : never; }; }) => import("alien-middleware").ApplyMiddleware<TMiddleware, (context: AdapterRequestContext<TMiddleware extends MiddlewareChain<infer T extends {
+}) => Promisable<Response | InferRouteResponse<T>> : never : never : never; }; }) => import("alien-middleware").ApplyMiddleware<TMiddleware, (context: AdapterRequestContext<TMiddleware extends MiddlewareChain<infer T extends {
     initial: {
         env: object;
         properties: object;
@@ -50,5 +54,5 @@ export declare function createRouter<TRoutes extends Record<string, {
     platform: unknown;
 }> ? T["platform"] : never> & {
     url?: URL;
-    params?: {};
+    path?: {};
 }) => Promise<Response>>;

package/dist/server/router.js

@@ -1,6 +1,6 @@
 import { RoutePattern } from '@remix-run/route-pattern';
 import { chain, } from 'alien-middleware';
-import { mapValues } from '../common';
+import { mapValues } from '../common.js';
 import * as z from 'zod/mini';
 export { chain };
 export function createRouter(config) {
@@ -12,15 +12,30 @@ export function createRouter(config) {
         const method = request.method.toUpperCase();
         const url = (context.url ??= new URL(request.url));
         for (let i = 0; i < keys.length; i++) {
-            const pattern = patterns[keys[i]];
-            const match = pattern.match(url);
+            const route = config.routes[keys[i]].routes[method];
+            if (!route) {
+                continue;
+            }
+            const match = patterns[keys[i]].match(url);
             if (!match) {
                 continue;
             }
-            const route = config.routes[keys[i]].routes[method];
-            if (!route) {
+            const handler = handlers[keys[i]][method];
+            if (!handler) {
+                if (config.debug) {
+                    throw new Error(`Handler not found for route: ${keys[i]} ${method}`);
+                }
                 continue;
             }
+            if (route.path) {
+                const error = parsePathParams(context, enableStringParsing(route.path), match.params);
+                if (error) {
+                    return httpClientError(error, 'Invalid path parameter', config);
+                }
+            }
+            else {
+                context.path = match.params;
+            }
             if (route.headers) {
                 const error = parseHeaders(context, enableStringParsing(route.headers));
                 if (error) {
@@ -39,11 +54,6 @@ export function createRouter(config) {
                     return httpClientError(error, 'Invalid request body', config);
                 }
             }
-            const handler = handlers[keys[i]][method];
-            if (!handler) {
-                continue;
-            }
-            context.params = match.params;
             const result = await handler(context);
             if (result instanceof Response) {
                 return result;
@@ -58,6 +68,14 @@ function httpClientError(error, message, config) {
         message: config.debug ? `${message}: ${error.message}` : message,
     }, { status: 400 });
 }
+function parsePathParams(context, schema, params) {
+    const result = schema.safeParse(params);
+    if (!result.success) {
+        return result.error;
+    }
+    context.path = result.data;
+    return null;
+}
 function parseHeaders(context, schema) {
     const headers = Object.fromEntries(context.request.headers);
     const result = schema.safeParse(headers);

package/package.json

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

package/readme.md

@@ -59,7 +59,7 @@ export const handler = createRouter({
 })({
   helloRoute: {
     GET(ctx) {
-      const message = `Hello, ${ctx.params.name}${ctx.query.excited ? '!' : '.'}`
+      const message = `Hello, ${ctx.path.name}${ctx.query.excited ? '!' : '.'}`
       return { message }
     },
   },