@taserjs/router 0.1.8 → 0.1.10

package/src/index.ts

@@ -14,6 +14,7 @@ export type {
   LayoutBuilder,
   LayoutId,
   LayoutMiddlewaresMap,
+  LayoutParams,
   LayoutTree,
   Method,
   MiddlewareBuilder,
@@ -42,22 +43,7 @@ export type {
 export { ValidationError, validationErrorSchema } from "@taserjs/router-utils";
 export type { ResponseValidationFailureHandler, SuccessStatusCode } from "@taserjs/router-utils";
 
-export {
-  all,
-  any,
-  del,
-  get,
-  head,
-  layout,
-  middleware,
-  options,
-  patch,
-  post,
-  put,
-  query,
-  t,
-  type TaserNamespace,
-} from "./builder/standalone.js";
+export { middleware, t, type TaserNamespace } from "./builder/standalone.js";
 
 export { createTaserApp, TaserRouter } from "./builder/router.js";
 export { TaserApp } from "./builder/app.js";
@@ -65,4 +51,4 @@ export { createContext } from "./context/create-context.js";
 export { honoMw } from "./middleware/hono-mw.js";
 export type { MiddlewareFn } from "./define/middleware.js";
 
-export type { TaserCookieJar, TaserHeaders } from "@taserjs/router-core";
+export type { TaserCookieJar, TaserCookieOptions, TaserHeaders } from "@taserjs/router-core";

package/src/middleware/hono-mw.ts

@@ -20,5 +20,8 @@ import type { NextFn } from "../types/units.js";
 export function honoMw<TState extends Record<string, unknown> = {}>(
   middleware: MiddlewareHandler,
 ): (ctx: unknown, next: NextFn<TState>) => Promise<Response> {
-  return createTaserCompatHandler(middleware) as (ctx: unknown, next: NextFn<TState>) => Promise<Response>;
+  return createTaserCompatHandler(middleware) as (
+    ctx: unknown,
+    next: NextFn<TState>,
+  ) => Promise<Response>;
 }

package/src/types/index.ts

@@ -1,9 +1,5 @@
 import type { Awaitable, TaserCookieJar, TaserHeaders } from "@taserjs/router-core";
-import type {
-  RouterMiddlewaresRegister,
-  RouterRegister,
-  RouterRoutesRegister,
-} from "../index.js";
+import type { RouterMiddlewaresRegister, RouterRegister, RouterRoutesRegister } from "../index.js";
 import type {
   MergeMiddlewareField,
   MergeMiddlewareInputField,
@@ -111,7 +107,9 @@ type ParseParamsFromSegments<S extends string> = S extends `${infer Segment}/${i
 
 export type PathParams<Path extends string> = Path extends `/${infer Rest}`
   ? ParseParamsFromSegments<Rest>
-  : {};
+  : ParseParamsFromSegments<Path>;
+
+export type LayoutParams<Layout extends string> = PathParams<Layout>;
 
 export type ResolveParams<TPathParams, TSchemaParams> =
   TSchemaParams extends Record<string, unknown>
@@ -517,7 +515,12 @@ export type MiddlewareChainContext<
     readonly headers: TaserHeaders;
     readonly cookies: TaserCookieJar;
     query: Simplify<MergePart<TQuery, MiddlewareChainField<Layout, Acc, "query">>>;
-    params: Simplify<MergePart<TParams, MiddlewareChainField<Layout, Acc, "params">>>;
+    params: Simplify<
+      ResolveParams<
+        LayoutParams<Layout>,
+        Simplify<MergePart<TParams, MiddlewareChainField<Layout, Acc, "params">>>
+      >
+    >;
     body: Simplify<MergePart<TBody, MiddlewareChainField<Layout, Acc, "body">>>;
     state: Simplify<MiddlewareChainField<Layout, Acc, "state">>;
   }
@@ -562,7 +565,12 @@ export type MiddlewareBuilder<
           readonly headers: TaserHeaders;
           readonly cookies: TaserCookieJar;
           query: Simplify<MergePart<unknown, MiddlewareChainField<Layout, Acc, "query">>>;
-          params: Simplify<MergePart<unknown, MiddlewareChainField<Layout, Acc, "params">>>;
+          params: Simplify<
+            ResolveParams<
+              LayoutParams<Layout>,
+              Simplify<MergePart<unknown, MiddlewareChainField<Layout, Acc, "params">>>
+            >
+          >;
           body: Simplify<MergePart<unknown, MiddlewareChainField<Layout, Acc, "body">>>;
           state: Simplify<MiddlewareChainField<Layout, Acc, "state">>;
         }

package/dist/cjs/builder/factories.cjs

@@ -1,31 +0,0 @@
-const require_route = require("./route.cjs");
-//#region src/builder/factories.ts
-function createWithoutBodyRoute(method) {
-	return ((path) => require_route.createRouteBuilder(path, method));
-}
-function createWithBodyRoute(method) {
-	return ((path) => require_route.createRouteBuilder(path, method));
-}
-var createGetRoute = createWithoutBodyRoute("GET");
-var createDeleteRoute = createWithoutBodyRoute("DELETE");
-var createOptionsRoute = createWithoutBodyRoute("OPTIONS");
-var createHeadRoute = createWithoutBodyRoute("HEAD");
-var createPostRoute = createWithBodyRoute("POST");
-var createPutRoute = createWithBodyRoute("PUT");
-var createPatchRoute = createWithBodyRoute("PATCH");
-var createQueryRoute = createWithBodyRoute("QUERY");
-var createAnyRoute = ((path, methods) => require_route.createRouteBuilder(path, "ANY", methods));
-var createAllRoute = ((path) => require_route.createRouteBuilder(path, "ALL"));
-//#endregion
-exports.createAllRoute = createAllRoute;
-exports.createAnyRoute = createAnyRoute;
-exports.createDeleteRoute = createDeleteRoute;
-exports.createGetRoute = createGetRoute;
-exports.createHeadRoute = createHeadRoute;
-exports.createOptionsRoute = createOptionsRoute;
-exports.createPatchRoute = createPatchRoute;
-exports.createPostRoute = createPostRoute;
-exports.createPutRoute = createPutRoute;
-exports.createQueryRoute = createQueryRoute;
-
-//# sourceMappingURL=factories.cjs.map

package/dist/cjs/builder/factories.cjs.map

@@ -1 +0,0 @@
-{"version":3,"file":"factories.cjs","names":[],"sources":["../../../src/builder/factories.ts"],"sourcesContent":["import { createRouteBuilder } from \"./route.js\";\nimport type { AppContext, RouteBuilder, RoutePath } from \"../types/index.js\";\nimport type { HttpMethod } from \"../types/units.js\";\n\nexport type CreateWithoutBodyRoute<\n  M extends \"GET\" | \"DELETE\" | \"OPTIONS\" | \"HEAD\",\n  TAppContext extends Record<string, unknown> = AppContext,\n> = <const Path extends RoutePath>(\n  path: Path,\n) => RouteBuilder<Path, M, readonly [], {}, {}, TAppContext>;\n\nexport type CreateWithBodyRoute<\n  M extends \"POST\" | \"PUT\" | \"PATCH\" | \"QUERY\",\n  TAppContext extends Record<string, unknown> = AppContext,\n> = <const Path extends RoutePath>(\n  path: Path,\n) => RouteBuilder<Path, M, readonly [], {}, {}, TAppContext>;\n\nexport type CreateAnyRoute<TAppContext extends Record<string, unknown> = AppContext> = <\n  const Path extends RoutePath,\n  const Methods extends readonly HttpMethod[],\n>(\n  path: Path,\n  methods: Methods,\n) => RouteBuilder<Path, Methods[number], readonly [], {}, {}, TAppContext>;\n\nexport type CreateAllRoute<TAppContext extends Record<string, unknown> = AppContext> = <\n  const Path extends RoutePath,\n>(\n  path: Path,\n) => RouteBuilder<Path, HttpMethod, readonly [], {}, {}, TAppContext>;\n\nfunction createWithoutBodyRoute<M extends \"GET\" | \"DELETE\" | \"OPTIONS\" | \"HEAD\">(\n  method: M,\n): CreateWithoutBodyRoute<M> {\n  return ((path: string) =>\n    createRouteBuilder(path, method)) as unknown as CreateWithoutBodyRoute<M>;\n}\n\nfunction createWithBodyRoute<M extends \"POST\" | \"PUT\" | \"PATCH\" | \"QUERY\">(\n  method: M,\n): CreateWithBodyRoute<M> {\n  return ((path: string) => createRouteBuilder(path, method)) as unknown as CreateWithBodyRoute<M>;\n}\n\nexport const createGetRoute = createWithoutBodyRoute(\"GET\");\nexport const createDeleteRoute = createWithoutBodyRoute(\"DELETE\");\nexport const createOptionsRoute = createWithoutBodyRoute(\"OPTIONS\");\nexport const createHeadRoute = createWithoutBodyRoute(\"HEAD\");\nexport const createPostRoute = createWithBodyRoute(\"POST\");\nexport const createPutRoute = createWithBodyRoute(\"PUT\");\nexport const createPatchRoute = createWithBodyRoute(\"PATCH\");\nexport const createQueryRoute = createWithBodyRoute(\"QUERY\");\n\nexport const createAnyRoute: CreateAnyRoute = ((path: string, methods: readonly HttpMethod[]) =>\n  createRouteBuilder(path, \"ANY\", methods)) as unknown as CreateAnyRoute;\n\nexport const createAllRoute: CreateAllRoute = ((path: string) =>\n  createRouteBuilder(path, \"ALL\")) as unknown as CreateAllRoute;\n"],"mappings":";;AAgCA,SAAS,uBACP,QAC2B;CAC3B,SAAS,SACP,cAAA,mBAAmB,MAAM,MAAM;AACnC;AAEA,SAAS,oBACP,QACwB;CACxB,SAAS,SAAiB,cAAA,mBAAmB,MAAM,MAAM;AAC3D;AAEA,IAAa,iBAAiB,uBAAuB,KAAK;AAC1D,IAAa,oBAAoB,uBAAuB,QAAQ;AAChE,IAAa,qBAAqB,uBAAuB,SAAS;AAClE,IAAa,kBAAkB,uBAAuB,MAAM;AAC5D,IAAa,kBAAkB,oBAAoB,MAAM;AACzD,IAAa,iBAAiB,oBAAoB,KAAK;AACvD,IAAa,mBAAmB,oBAAoB,OAAO;AAC3D,IAAa,mBAAmB,oBAAoB,OAAO;AAE3D,IAAa,mBAAmC,MAAc,YAC5D,cAAA,mBAAmB,MAAM,OAAO,OAAO;AAEzC,IAAa,mBAAmC,SAC9C,cAAA,mBAAmB,MAAM,KAAK"}

package/dist/cjs/builder/factories.d.cts

@@ -1,16 +0,0 @@
-import { AppContext, RouteBuilder, RoutePath } from '../types/index.js';
-import { HttpMethod } from '../types/units.js';
-export type CreateWithoutBodyRoute<M extends "GET" | "DELETE" | "OPTIONS" | "HEAD", TAppContext extends Record<string, unknown> = AppContext> = <const Path extends RoutePath>(path: Path) => RouteBuilder<Path, M, readonly [], {}, {}, TAppContext>;
-export type CreateWithBodyRoute<M extends "POST" | "PUT" | "PATCH" | "QUERY", TAppContext extends Record<string, unknown> = AppContext> = <const Path extends RoutePath>(path: Path) => RouteBuilder<Path, M, readonly [], {}, {}, TAppContext>;
-export type CreateAnyRoute<TAppContext extends Record<string, unknown> = AppContext> = <const Path extends RoutePath, const Methods extends readonly HttpMethod[]>(path: Path, methods: Methods) => RouteBuilder<Path, Methods[number], readonly [], {}, {}, TAppContext>;
-export type CreateAllRoute<TAppContext extends Record<string, unknown> = AppContext> = <const Path extends RoutePath>(path: Path) => RouteBuilder<Path, HttpMethod, readonly [], {}, {}, TAppContext>;
-export declare const createGetRoute: CreateWithoutBodyRoute<"GET", import('../types/units.js').EmptyAppContext>;
-export declare const createDeleteRoute: CreateWithoutBodyRoute<"DELETE", import('../types/units.js').EmptyAppContext>;
-export declare const createOptionsRoute: CreateWithoutBodyRoute<"OPTIONS", import('../types/units.js').EmptyAppContext>;
-export declare const createHeadRoute: CreateWithoutBodyRoute<"HEAD", import('../types/units.js').EmptyAppContext>;
-export declare const createPostRoute: CreateWithBodyRoute<"POST", import('../types/units.js').EmptyAppContext>;
-export declare const createPutRoute: CreateWithBodyRoute<"PUT", import('../types/units.js').EmptyAppContext>;
-export declare const createPatchRoute: CreateWithBodyRoute<"PATCH", import('../types/units.js').EmptyAppContext>;
-export declare const createQueryRoute: CreateWithBodyRoute<"QUERY", import('../types/units.js').EmptyAppContext>;
-export declare const createAnyRoute: CreateAnyRoute;
-export declare const createAllRoute: CreateAllRoute;

package/dist/esm/builder/factories.d.ts

@@ -1,16 +0,0 @@
-import { AppContext, RouteBuilder, RoutePath } from '../types/index.js';
-import { HttpMethod } from '../types/units.js';
-export type CreateWithoutBodyRoute<M extends "GET" | "DELETE" | "OPTIONS" | "HEAD", TAppContext extends Record<string, unknown> = AppContext> = <const Path extends RoutePath>(path: Path) => RouteBuilder<Path, M, readonly [], {}, {}, TAppContext>;
-export type CreateWithBodyRoute<M extends "POST" | "PUT" | "PATCH" | "QUERY", TAppContext extends Record<string, unknown> = AppContext> = <const Path extends RoutePath>(path: Path) => RouteBuilder<Path, M, readonly [], {}, {}, TAppContext>;
-export type CreateAnyRoute<TAppContext extends Record<string, unknown> = AppContext> = <const Path extends RoutePath, const Methods extends readonly HttpMethod[]>(path: Path, methods: Methods) => RouteBuilder<Path, Methods[number], readonly [], {}, {}, TAppContext>;
-export type CreateAllRoute<TAppContext extends Record<string, unknown> = AppContext> = <const Path extends RoutePath>(path: Path) => RouteBuilder<Path, HttpMethod, readonly [], {}, {}, TAppContext>;
-export declare const createGetRoute: CreateWithoutBodyRoute<"GET", import('../index.js').EmptyAppContext>;
-export declare const createDeleteRoute: CreateWithoutBodyRoute<"DELETE", import('../index.js').EmptyAppContext>;
-export declare const createOptionsRoute: CreateWithoutBodyRoute<"OPTIONS", import('../index.js').EmptyAppContext>;
-export declare const createHeadRoute: CreateWithoutBodyRoute<"HEAD", import('../index.js').EmptyAppContext>;
-export declare const createPostRoute: CreateWithBodyRoute<"POST", import('../index.js').EmptyAppContext>;
-export declare const createPutRoute: CreateWithBodyRoute<"PUT", import('../index.js').EmptyAppContext>;
-export declare const createPatchRoute: CreateWithBodyRoute<"PATCH", import('../index.js').EmptyAppContext>;
-export declare const createQueryRoute: CreateWithBodyRoute<"QUERY", import('../index.js').EmptyAppContext>;
-export declare const createAnyRoute: CreateAnyRoute;
-export declare const createAllRoute: CreateAllRoute;

package/dist/esm/builder/factories.js

@@ -1,22 +0,0 @@
-import { createRouteBuilder } from "./route.js";
-//#region src/builder/factories.ts
-function createWithoutBodyRoute(method) {
-	return ((path) => createRouteBuilder(path, method));
-}
-function createWithBodyRoute(method) {
-	return ((path) => createRouteBuilder(path, method));
-}
-var createGetRoute = createWithoutBodyRoute("GET");
-var createDeleteRoute = createWithoutBodyRoute("DELETE");
-var createOptionsRoute = createWithoutBodyRoute("OPTIONS");
-var createHeadRoute = createWithoutBodyRoute("HEAD");
-var createPostRoute = createWithBodyRoute("POST");
-var createPutRoute = createWithBodyRoute("PUT");
-var createPatchRoute = createWithBodyRoute("PATCH");
-var createQueryRoute = createWithBodyRoute("QUERY");
-var createAnyRoute = ((path, methods) => createRouteBuilder(path, "ANY", methods));
-var createAllRoute = ((path) => createRouteBuilder(path, "ALL"));
-//#endregion
-export { createAllRoute, createAnyRoute, createDeleteRoute, createGetRoute, createHeadRoute, createOptionsRoute, createPatchRoute, createPostRoute, createPutRoute, createQueryRoute };
-
-//# sourceMappingURL=factories.js.map

package/dist/esm/builder/factories.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"factories.js","names":[],"sources":["../../../src/builder/factories.ts"],"sourcesContent":["import { createRouteBuilder } from \"./route.js\";\nimport type { AppContext, RouteBuilder, RoutePath } from \"../types/index.js\";\nimport type { HttpMethod } from \"../types/units.js\";\n\nexport type CreateWithoutBodyRoute<\n  M extends \"GET\" | \"DELETE\" | \"OPTIONS\" | \"HEAD\",\n  TAppContext extends Record<string, unknown> = AppContext,\n> = <const Path extends RoutePath>(\n  path: Path,\n) => RouteBuilder<Path, M, readonly [], {}, {}, TAppContext>;\n\nexport type CreateWithBodyRoute<\n  M extends \"POST\" | \"PUT\" | \"PATCH\" | \"QUERY\",\n  TAppContext extends Record<string, unknown> = AppContext,\n> = <const Path extends RoutePath>(\n  path: Path,\n) => RouteBuilder<Path, M, readonly [], {}, {}, TAppContext>;\n\nexport type CreateAnyRoute<TAppContext extends Record<string, unknown> = AppContext> = <\n  const Path extends RoutePath,\n  const Methods extends readonly HttpMethod[],\n>(\n  path: Path,\n  methods: Methods,\n) => RouteBuilder<Path, Methods[number], readonly [], {}, {}, TAppContext>;\n\nexport type CreateAllRoute<TAppContext extends Record<string, unknown> = AppContext> = <\n  const Path extends RoutePath,\n>(\n  path: Path,\n) => RouteBuilder<Path, HttpMethod, readonly [], {}, {}, TAppContext>;\n\nfunction createWithoutBodyRoute<M extends \"GET\" | \"DELETE\" | \"OPTIONS\" | \"HEAD\">(\n  method: M,\n): CreateWithoutBodyRoute<M> {\n  return ((path: string) =>\n    createRouteBuilder(path, method)) as unknown as CreateWithoutBodyRoute<M>;\n}\n\nfunction createWithBodyRoute<M extends \"POST\" | \"PUT\" | \"PATCH\" | \"QUERY\">(\n  method: M,\n): CreateWithBodyRoute<M> {\n  return ((path: string) => createRouteBuilder(path, method)) as unknown as CreateWithBodyRoute<M>;\n}\n\nexport const createGetRoute = createWithoutBodyRoute(\"GET\");\nexport const createDeleteRoute = createWithoutBodyRoute(\"DELETE\");\nexport const createOptionsRoute = createWithoutBodyRoute(\"OPTIONS\");\nexport const createHeadRoute = createWithoutBodyRoute(\"HEAD\");\nexport const createPostRoute = createWithBodyRoute(\"POST\");\nexport const createPutRoute = createWithBodyRoute(\"PUT\");\nexport const createPatchRoute = createWithBodyRoute(\"PATCH\");\nexport const createQueryRoute = createWithBodyRoute(\"QUERY\");\n\nexport const createAnyRoute: CreateAnyRoute = ((path: string, methods: readonly HttpMethod[]) =>\n  createRouteBuilder(path, \"ANY\", methods)) as unknown as CreateAnyRoute;\n\nexport const createAllRoute: CreateAllRoute = ((path: string) =>\n  createRouteBuilder(path, \"ALL\")) as unknown as CreateAllRoute;\n"],"mappings":";;AAgCA,SAAS,uBACP,QAC2B;CAC3B,SAAS,SACP,mBAAmB,MAAM,MAAM;AACnC;AAEA,SAAS,oBACP,QACwB;CACxB,SAAS,SAAiB,mBAAmB,MAAM,MAAM;AAC3D;AAEA,IAAa,iBAAiB,uBAAuB,KAAK;AAC1D,IAAa,oBAAoB,uBAAuB,QAAQ;AAChE,IAAa,qBAAqB,uBAAuB,SAAS;AAClE,IAAa,kBAAkB,uBAAuB,MAAM;AAC5D,IAAa,kBAAkB,oBAAoB,MAAM;AACzD,IAAa,iBAAiB,oBAAoB,KAAK;AACvD,IAAa,mBAAmB,oBAAoB,OAAO;AAC3D,IAAa,mBAAmB,oBAAoB,OAAO;AAE3D,IAAa,mBAAmC,MAAc,YAC5D,mBAAmB,MAAM,OAAO,OAAO;AAEzC,IAAa,mBAAmC,SAC9C,mBAAmB,MAAM,KAAK"}

package/src/builder/factories.ts

@@ -1,59 +0,0 @@
-import { createRouteBuilder } from "./route.js";
-import type { AppContext, RouteBuilder, RoutePath } from "../types/index.js";
-import type { HttpMethod } from "../types/units.js";
-
-export type CreateWithoutBodyRoute<
-  M extends "GET" | "DELETE" | "OPTIONS" | "HEAD",
-  TAppContext extends Record<string, unknown> = AppContext,
-> = <const Path extends RoutePath>(
-  path: Path,
-) => RouteBuilder<Path, M, readonly [], {}, {}, TAppContext>;
-
-export type CreateWithBodyRoute<
-  M extends "POST" | "PUT" | "PATCH" | "QUERY",
-  TAppContext extends Record<string, unknown> = AppContext,
-> = <const Path extends RoutePath>(
-  path: Path,
-) => RouteBuilder<Path, M, readonly [], {}, {}, TAppContext>;
-
-export type CreateAnyRoute<TAppContext extends Record<string, unknown> = AppContext> = <
-  const Path extends RoutePath,
-  const Methods extends readonly HttpMethod[],
->(
-  path: Path,
-  methods: Methods,
-) => RouteBuilder<Path, Methods[number], readonly [], {}, {}, TAppContext>;
-
-export type CreateAllRoute<TAppContext extends Record<string, unknown> = AppContext> = <
-  const Path extends RoutePath,
->(
-  path: Path,
-) => RouteBuilder<Path, HttpMethod, readonly [], {}, {}, TAppContext>;
-
-function createWithoutBodyRoute<M extends "GET" | "DELETE" | "OPTIONS" | "HEAD">(
-  method: M,
-): CreateWithoutBodyRoute<M> {
-  return ((path: string) =>
-    createRouteBuilder(path, method)) as unknown as CreateWithoutBodyRoute<M>;
-}
-
-function createWithBodyRoute<M extends "POST" | "PUT" | "PATCH" | "QUERY">(
-  method: M,
-): CreateWithBodyRoute<M> {
-  return ((path: string) => createRouteBuilder(path, method)) as unknown as CreateWithBodyRoute<M>;
-}
-
-export const createGetRoute = createWithoutBodyRoute("GET");
-export const createDeleteRoute = createWithoutBodyRoute("DELETE");
-export const createOptionsRoute = createWithoutBodyRoute("OPTIONS");
-export const createHeadRoute = createWithoutBodyRoute("HEAD");
-export const createPostRoute = createWithBodyRoute("POST");
-export const createPutRoute = createWithBodyRoute("PUT");
-export const createPatchRoute = createWithBodyRoute("PATCH");
-export const createQueryRoute = createWithBodyRoute("QUERY");
-
-export const createAnyRoute: CreateAnyRoute = ((path: string, methods: readonly HttpMethod[]) =>
-  createRouteBuilder(path, "ANY", methods)) as unknown as CreateAnyRoute;
-
-export const createAllRoute: CreateAllRoute = ((path: string) =>
-  createRouteBuilder(path, "ALL")) as unknown as CreateAllRoute;