rouzer 1.2.3 → 1.4.0

package/dist/server/router.js

@@ -47,6 +47,11 @@ class RouterObject extends MiddlewareChain {
                 };
             }),
         }));
+        const addDebugHeaders = config.debug
+            ? (context, route) => {
+                context.setHeader('X-Route-Name', route.name);
+            }
+            : null;
         return super.use(async function (context) {
             const request = context.request;
             const origin = request.headers.get('Origin');
@@ -60,7 +65,9 @@ class RouterObject extends MiddlewareChain {
                         'GET';
             }
             for (const route of routes) {
-                const props = route.methods[method] ?? route.methods.ALL;
+                const props = route.methods.hasOwnProperty(method)
+                    ? route.methods[method]
+                    : route.methods.ALL;
                 if (!props) {
                     continue;
                 }
@@ -73,6 +80,13 @@ class RouterObject extends MiddlewareChain {
                     continue;
                 }
                 if (isPreflight) {
+                    const optionsHandler = handlers[route.name].OPTIONS;
+                    if (optionsHandler) {
+                        const response = await optionsHandler(context);
+                        if (response) {
+                            return response;
+                        }
+                    }
                     return new Response(null, {
                         headers: {
                             'Access-Control-Allow-Origin': origin ?? '',
@@ -87,6 +101,7 @@ class RouterObject extends MiddlewareChain {
                 if (schema.path) {
                     const error = parsePathParams(context, enableStringParsing(schema.path), match.params);
                     if (error) {
+                        addDebugHeaders?.(context, route);
                         return httpClientError(error, 'Invalid path parameter', config);
                     }
                 }
@@ -96,22 +111,26 @@ class RouterObject extends MiddlewareChain {
                 if (schema.headers) {
                     const error = parseHeaders(context, enableStringParsing(schema.headers));
                     if (error) {
+                        addDebugHeaders?.(context, route);
                         return httpClientError(error, 'Invalid request headers', config);
                     }
                 }
                 if (schema.query) {
                     const error = parseQueryString(context, enableStringParsing(schema.query));
                     if (error) {
+                        addDebugHeaders?.(context, route);
                         return httpClientError(error, 'Invalid query string', config);
                     }
                 }
                 if (schema.body) {
                     const error = await parseRequestBody(context, schema.body);
                     if (error) {
+                        addDebugHeaders?.(context, route);
                         return httpClientError(error, 'Invalid request body', config);
                     }
                 }
                 const result = await handler(context);
+                addDebugHeaders?.(context, route);
                 if (result instanceof Response) {
                     return result;
                 }

package/dist/server/types.d.ts

@@ -1,33 +1,37 @@
 import type { Params } from '@remix-run/route-pattern';
 import type { AnyMiddlewareChain, MiddlewareChain, MiddlewareContext } from 'alien-middleware';
 import type * as z from 'zod/mini';
-import type { InferRouteResponse, MutationRouteSchema, Promisable, QueryRouteSchema, Routes } from '../types.js';
+import type { InferRouteResponse, Promisable, Routes, RouteSchema } from '../types.js';
 type RequestContext<TMiddleware extends AnyMiddlewareChain> = MiddlewareContext<TMiddleware>;
 type RouteRequestHandler<TMiddleware extends AnyMiddlewareChain, TArgs extends object, TResult> = (context: RequestContext<TMiddleware> & TArgs) => Promisable<TResult | Response>;
-type InferRouteRequestHandler<TMiddleware extends AnyMiddlewareChain, T, P extends string> = T extends QueryRouteSchema ? RouteRequestHandler<TMiddleware, {
-    path: T extends {
+type InferRouteRequestHandler<TMiddleware extends AnyMiddlewareChain, TSchema extends RouteSchema, TMethod extends string, TPath extends string> = TMethod extends 'GET' ? RouteRequestHandler<TMiddleware, {
+    path: TSchema extends {
         path: any;
-    } ? z.infer<T['path']> : Params<P>;
-    query: T extends {
+    } ? z.infer<TSchema['path']> : Params<TPath>;
+    query: TSchema extends {
         query: any;
-    } ? z.infer<T['query']> : undefined;
-    headers: T extends {
+    } ? z.infer<TSchema['query']> : undefined;
+    headers: TSchema extends {
         headers: any;
-    } ? z.infer<T['headers']> : undefined;
-}, InferRouteResponse<T>> : T extends MutationRouteSchema ? RouteRequestHandler<TMiddleware, {
-    path: T extends {
+    } ? z.infer<TSchema['headers']> : undefined;
+}, InferRouteResponse<TSchema>> : RouteRequestHandler<TMiddleware, {
+    path: TSchema extends {
         path: any;
-    } ? z.infer<T['path']> : Params<P>;
-    body: T extends {
+    } ? z.infer<TSchema['path']> : Params<TPath>;
+    body: TSchema extends {
         body: any;
-    } ? z.infer<T['body']> : undefined;
-    headers: T extends {
+    } ? z.infer<TSchema['body']> : undefined;
+    headers: TSchema extends {
         headers: any;
-    } ? z.infer<T['headers']> : undefined;
-}, InferRouteResponse<T>> : never;
+    } ? z.infer<TSchema['headers']> : undefined;
+}, InferRouteResponse<TSchema>>;
 export type RouteRequestHandlerMap<TRoutes extends Routes = Routes, TMiddleware extends AnyMiddlewareChain = MiddlewareChain> = {
     [K in keyof TRoutes]: {
-        [M in keyof TRoutes[K]['methods']]: InferRouteRequestHandler<TMiddleware, TRoutes[K]['methods'][M], TRoutes[K]['path']['source']>;
+        [TMethod in keyof TRoutes[K]['methods']]: InferRouteRequestHandler<TMiddleware, Extract<TRoutes[K]['methods'][TMethod], RouteSchema>, Extract<TMethod, string>, TRoutes[K]['path']['source']>;
+    } & {
+        OPTIONS?: RouteRequestHandler<TMiddleware, {
+            path: Params<TRoutes[K]['path']['source']>;
+        }, void>;
     };
 };
 export {};

package/dist/types.d.ts

@@ -32,7 +32,6 @@ export type RouteSchemaMap = {
         response?: never;
     };
 };
-export type Method = string & keyof RouteSchemaMap;
 export type RouteSchema = QueryRouteSchema | MutationRouteSchema;
 export type Routes = {
     [key: string]: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rouzer",
-  "version": "1.2.3",
+  "version": "1.4.0",
   "type": "module",
   "exports": {
     ".": {