rouzer 1.0.0-beta.7 → 1.0.0-beta.8

package/dist/client/index.d.ts

@@ -29,7 +29,7 @@ export declare function createClient(config: {
          */
         onJsonError?: (response: Response) => Promisable<Response>;
     };
-    request<T extends RouteRequest>({ pathPattern, method, args: { path, query, body, headers }, route, }: T): Promise<Response & {
+    request<T extends RouteRequest>({ path: pathBuilder, method, args: { path, query, body, headers }, route, }: T): Promise<Response & {
         json(): Promise<T["$result"]>;
     }>;
     json<T extends RouteRequest>(request: T): Promise<T["$result"]>;

package/dist/client/index.js

@@ -3,12 +3,19 @@ export function createClient(config) {
     const baseURL = config.baseURL.replace(/\/$/, '');
     return {
         config,
-        request({ pathPattern, method, args: { path, query, body, headers }, route, }) {
+        request({ path: pathBuilder, method, args: { path, query, body, headers }, route, }) {
             if (route.path) {
                 path = route.path.parse(path);
             }
-            const url = new URL(baseURL);
-            url.pathname += pathPattern.href(path);
+            let url;
+            const href = pathBuilder.href(path);
+            if (href[0] === '/') {
+                url = new URL(baseURL);
+                url.pathname += pathBuilder.href(path);
+            }
+            else {
+                url = new URL(href);
+            }
             if (route.query) {
                 query = route.query.parse(query ?? {});
                 url.search = new URLSearchParams(query).toString();

package/dist/route.d.ts

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

package/dist/route.js

@@ -3,16 +3,16 @@ import { mapEntries } from './common.js';
 export function $type() {
     return null;
 }
-export function route(path, methods) {
-    const pathPattern = new RoutePattern(path);
+export function route(pattern, methods) {
+    const path = new RoutePattern(pattern);
     const createFetch = (method, route) => (args) => {
         return {
             route,
-            pathPattern,
+            path,
             method,
             args,
             $result: undefined,
         };
     };
-    return Object.assign({ path, pathPattern, methods }, mapEntries(methods, (method, route) => [method, createFetch(method, route)]));
+    return Object.assign({ path, methods }, mapEntries(methods, (method, route) => [method, createFetch(method, route)]));
 }

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 { InferRouteResponse, MutationMethod, Promisable, QueryMethod, RouteMethods } from '../types.js';
+import type { InferRouteResponse, MutationMethod, Promisable, QueryMethod, Routes } from '../types.js';
 export { chain };
 type EmptyMiddlewareChain<TPlatform = unknown> = MiddlewareChain<{
     initial: {
@@ -37,10 +37,7 @@ export type RouterConfig = {
      * })
      * ```
      */
-    routes: Record<string, {
-        path: string;
-        methods: RouteMethods;
-    }>;
+    routes: Routes;
     /**
      * Middleware to apply to all routes.
      * @see https://github.com/alien-rpc/alien-middleware#quick-start
@@ -65,22 +62,20 @@ export type RouterConfig = {
      */
     debug?: boolean;
 };
-export declare function createRouter<TRoutes extends Record<string, {
-    path: string;
-    methods: RouteMethods;
-}>, TMiddleware extends MiddlewareChain = EmptyMiddlewareChain>(config: RouterConfig & {
+interface CreateRouterConfig<TRoutes extends Routes, TMiddleware extends MiddlewareChain> extends RouterConfig {
     routes: TRoutes;
     middlewares?: TMiddleware;
-}): (handlers: { [K in keyof TRoutes]: { [M in keyof TRoutes[K]["methods"]]: TRoutes[K]["methods"][M] extends infer T ? T extends TRoutes[K]["methods"][M] ? T extends QueryMethod ? (context: MiddlewareContext<TMiddleware> & {
+}
+export declare function createRouter<TRoutes extends Routes, TMiddleware extends MiddlewareChain = EmptyMiddlewareChain>(config: CreateRouterConfig<TRoutes, TMiddleware>): (handlers: { [K in keyof TRoutes]: { [M in keyof TRoutes[K]["methods"]]: TRoutes[K]["methods"][M] extends infer T ? T extends TRoutes[K]["methods"][M] ? T extends QueryMethod ? (context: MiddlewareContext<TMiddleware> & {
     path: T extends {
         path: any;
-    } ? z.infer<T["path"]> : Params<TRoutes[K]["path"]>;
+    } ? z.infer<T["path"]> : Params<TRoutes[K]["path"]["source"]>;
     query: z.infer<T["query"]>;
     headers: z.infer<T["headers"]>;
 }) => Promisable<Response | InferRouteResponse<T>> : T extends MutationMethod ? (context: MiddlewareContext<TMiddleware> & {
     path: T extends {
         path: any;
-    } ? z.infer<T["path"]> : Params<TRoutes[K]["path"]>;
+    } ? z.infer<T["path"]> : Params<TRoutes[K]["path"]["source"]>;
     body: z.infer<T["body"]>;
     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 {

package/dist/server/router.js

@@ -6,10 +6,8 @@ export { chain };
 export function createRouter(config) {
     const keys = Object.keys(config.routes);
     const middlewares = config.middlewares ?? chain();
-    const basePath = config.basePath?.replace(/(^\/)|(\/$)/, '');
-    const patterns = mapValues(config.routes, basePath
-        ? ({ path }) => new RoutePattern(`${basePath}/${path}`)
-        : ({ path }) => new RoutePattern(path));
+    const basePath = config.basePath?.replace(/\/?$/, '/');
+    const patterns = mapValues(config.routes, ({ path }) => basePath ? new RoutePattern(path.source.replace(/^\/?/, basePath)) : path);
     return (handlers) => middlewares.use(async function (context) {
         const request = context.request;
         const method = request.method.toUpperCase();

package/dist/types.d.ts

@@ -25,6 +25,12 @@ export type RouteMethods = {
     PATCH?: MutationMethod;
     DELETE?: MutationMethod;
 };
+export type Routes = {
+    [key: string]: {
+        path: RoutePattern;
+        methods: RouteMethods;
+    };
+};
 declare class Any {
     private isAny;
 }
@@ -60,7 +66,7 @@ export type RouteArgs<T extends QueryMethod | MutationMethod = any> = ([
 };
 export type RouteRequest<TResult = any> = {
     route: QueryMethod | MutationMethod;
-    pathPattern: RoutePattern;
+    path: RoutePattern;
     method: string;
     args: RouteArgs;
     $result: TResult;

package/package.json

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