rouzer 1.0.0-beta.4 → 1.0.0-beta.6

package/dist/client/index.js

@@ -1,12 +1,14 @@
 import { shake } from '../common.js';
 export function createClient(config) {
+    const baseURL = config.baseURL.replace(/\/$/, '');
     return {
         config,
         request({ pathPattern, method, args: { path, query, body, headers }, route, }) {
             if (route.path) {
                 path = route.path.parse(path);
             }
-            const url = new URL(pathPattern.href(path), config.baseURL);
+            const url = new URL(baseURL);
+            url.pathname += pathPattern.href(path);
             if (route.query) {
                 query = route.query.parse(query ?? {});
                 url.search = new URLSearchParams(query).toString();

package/dist/server/router.d.ts

@@ -31,12 +31,16 @@ 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<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<Response | InferRouteResponse<T>> : never : never : never; }; }) => import("alien-middleware").ApplyMiddleware<TMiddleware, (context: AdapterRequestContext<TMiddleware extends MiddlewareChain<infer T extends {
     initial: {
@@ -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

@@ -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.4",
+  "version": "1.0.0-beta.6",
   "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 }
     },
   },