@taserjs/router 0.1.4 → 0.1.5

package/src/middleware/body-limit.ts

@@ -1,10 +1,10 @@
 import { bodyLimit as honoBodyLimit } from "hono/body-limit";
 
-import { defineMiddleware } from "../define/middleware.js";
+import { middleware } from "../define/middleware.js";
 import { honoMw } from "./hono-mw.js";
 
 export function bodyLimit(...args: Parameters<typeof honoBodyLimit>) {
-  return defineMiddleware(honoMw(honoBodyLimit(...args)));
+  return middleware(honoMw(honoBodyLimit(...args)));
 }
 
 export type BodyLimitOptions = Parameters<typeof honoBodyLimit>[0];

package/src/middleware/compress.ts

@@ -1,10 +1,10 @@
 import { compress as honoCompress } from "hono/compress";
 
-import { defineMiddleware } from "../define/middleware.js";
+import { middleware } from "../define/middleware.js";
 import { honoMw } from "./hono-mw.js";
 
 export function compress(...args: Parameters<typeof honoCompress>) {
-  return defineMiddleware(honoMw(honoCompress(...args)));
+  return middleware(honoMw(honoCompress(...args)));
 }
 
 export type CompressOptions = NonNullable<Parameters<typeof honoCompress>[0]>;

package/src/middleware/cors.ts

@@ -1,10 +1,10 @@
 import { cors as honoCors } from "hono/cors";
 
-import { defineMiddleware } from "../define/middleware.js";
+import { middleware } from "../define/middleware.js";
 import { honoMw } from "./hono-mw.js";
 
 export function cors(...args: Parameters<typeof honoCors>) {
-  return defineMiddleware(honoMw(honoCors(...args)));
+  return middleware(honoMw(honoCors(...args)));
 }
 
 export type CorsOptions = NonNullable<Parameters<typeof honoCors>[0]>;

package/src/middleware/csrf.ts

@@ -1,10 +1,10 @@
 import { csrf as honoCsrf } from "hono/csrf";
 
-import { defineMiddleware } from "../define/middleware.js";
+import { middleware } from "../define/middleware.js";
 import { honoMw } from "./hono-mw.js";
 
 export function csrf(...args: Parameters<typeof honoCsrf>) {
-  return defineMiddleware(honoMw(honoCsrf(...args)));
+  return middleware(honoMw(honoCsrf(...args)));
 }
 
 export type CsrfOptions = NonNullable<Parameters<typeof honoCsrf>[0]>;

package/src/middleware/etag.ts

@@ -1,10 +1,10 @@
 import { etag as honoEtag } from "hono/etag";
 
-import { defineMiddleware } from "../define/middleware.js";
+import { middleware } from "../define/middleware.js";
 import { honoMw } from "./hono-mw.js";
 
 export function etag(...args: Parameters<typeof honoEtag>) {
-  return defineMiddleware(honoMw(honoEtag(...args)));
+  return middleware(honoMw(honoEtag(...args)));
 }
 
 export type EtagOptions = NonNullable<Parameters<typeof honoEtag>[0]>;

package/src/middleware/hono-mw.ts

@@ -12,7 +12,7 @@ import type { MiddlewareHandler } from "hono";
  *
  * const app = t.get("/hello").use(honoMw(cors()));
  * // or
- * const customCors = defineMiddleware(honoMw(cors()));
+ * const customCors = middleware(honoMw(cors()));
  * ```
  */
 export function honoMw(

package/src/middleware/jwk.ts

@@ -1,6 +1,6 @@
 import { jwk as honoJwk } from "hono/jwk";
 
-import { defineMiddleware } from "../define/middleware.js";
+import { middleware } from "../define/middleware.js";
 import { honoMw } from "./hono-mw.js";
 import type { JwtMiddlewareUnit, JwtPayloadState } from "./jwt.js";
 
@@ -42,7 +42,7 @@ export function jwk<TPayload = Record<string, unknown>>(
   const safeInit = init?.headers !== undefined ? { headers: init.headers } : undefined;
   const mw = honoMw(honoJwk(honoOptions, safeInit));
 
-  return defineMiddleware<JwtPayloadState<TPayload>>((ctx, next) =>
+  return middleware<JwtPayloadState<TPayload>>((ctx, next) =>
     mw(ctx, async () => {
       const payload = (ctx as unknown as { var: { jwtPayload?: unknown } }).var.jwtPayload;
       return next({ jwtPayload: payload as TPayload });

package/src/middleware/jwt.ts

@@ -1,6 +1,6 @@
 import { jwt as honoJwt } from "hono/jwt";
 
-import { defineMiddleware } from "../define/middleware.js";
+import { middleware } from "../define/middleware.js";
 import type { MiddlewareReturnFromParts, MiddlewareUnit } from "../types/units.js";
 import { honoMw } from "./hono-mw.js";
 
@@ -22,7 +22,7 @@ export function jwt<TPayload = Record<string, unknown>>(
   options: JwtOptions,
 ): JwtMiddlewareUnit<TPayload> {
   const mw = honoMw(honoJwt(options));
-  return defineMiddleware<JwtPayloadState<TPayload>>((ctx, next) =>
+  return middleware<JwtPayloadState<TPayload>>((ctx, next) =>
     mw(ctx, async () => {
       const payload = (ctx as unknown as { var: { jwtPayload?: unknown } }).var.jwtPayload;
       return next({ jwtPayload: payload as TPayload });

package/src/middleware/secure-headers.ts

@@ -1,10 +1,10 @@
 import { secureHeaders as honoSecureHeaders } from "hono/secure-headers";
 
-import { defineMiddleware } from "../define/middleware.js";
+import { middleware } from "../define/middleware.js";
 import { honoMw } from "./hono-mw.js";
 
 export function secureHeaders(...args: Parameters<typeof honoSecureHeaders>) {
-  return defineMiddleware(honoMw(honoSecureHeaders(...args)));
+  return middleware(honoMw(honoSecureHeaders(...args)));
 }
 
 export type SecureHeadersOptions = NonNullable<Parameters<typeof honoSecureHeaders>[0]>;

package/src/middleware/timing.ts

@@ -1,10 +1,10 @@
 import { timing as honoTiming } from "hono/timing";
 
-import { defineMiddleware } from "../define/middleware.js";
+import { middleware } from "../define/middleware.js";
 import { honoMw } from "./hono-mw.js";
 
 export function timing(...args: Parameters<typeof honoTiming>) {
-  return defineMiddleware(honoMw(honoTiming(...args)));
+  return middleware(honoMw(honoTiming(...args)));
 }
 
 export type TimingOptions = NonNullable<Parameters<typeof honoTiming>[0]>;

package/src/types/index.ts

@@ -1,5 +1,5 @@
 import type { Awaitable, TaserCookieJar, TaserHeaders } from "@taserjs/router-core";
-import type { RouterRegister } from "../register.js";
+import type { RouterRegister } from "../index.js";
 import type {
   MergeMiddlewareField,
   MergeMiddlewareInputField,
@@ -12,7 +12,7 @@ import type {
 import type { ReturnsMap, ValidHandlerReply } from "./returns.js";
 import type { Schema } from "./schema.js";
 import type {
-  AppContext,
+  EmptyAppContext,
   ExtractState,
   Method,
   MiddlewareDefinition,
@@ -30,7 +30,6 @@ export type {
   Schema,
   StandardSchemaV1,
 } from "./schema.js";
-export type { RouterRegister } from "../register.js";
 export type {
   MergeMiddlewareField,
   MergeMiddlewareInputField,
@@ -52,13 +51,12 @@ export type {
   ValidHandlerReply,
 } from "./returns.js";
 export type {
-  AppContext,
+  EmptyAppContext,
   ExtractState,
   HttpMethod,
   IsUnknown,
   Method,
   MiddlewareDefinition,
-  MiddlewareNext,
   MiddlewareReturnFromParts,
   MiddlewareUnit,
   MiddlewareUnitBuilder,
@@ -69,6 +67,8 @@ export type {
   ValidatorParts,
 } from "./units.js";
 
+export type AppContext = RouterRegister extends { AppContext: infer C } ? C : EmptyAppContext;
+
 export type RoutePath = RouterRegister extends { RoutePath: infer P } ? P : never;
 export type LayoutId = RouterRegister extends { LayoutId: infer L } ? L : never;
 export type LayoutTree = RouterRegister extends { LayoutTree: infer T } ? T : Record<never, never>;
@@ -76,6 +76,12 @@ export type RouteByPathMethod = RouterRegister extends { RouteByPathMethod: infe
   ? R
   : Record<never, never>;
 
+export type LayoutBuilder<TAppContext extends Record<string, unknown> = AppContext> = <
+  const Layout extends LayoutId,
+>(
+  layout: Layout,
+) => MiddlewareBuilder<Layout, readonly [], TAppContext>;
+
 type ParseParam<Segment extends string> = Segment extends "*"
   ? { _splat: string }
   : Segment extends `:${infer Name extends string}`
@@ -99,25 +105,41 @@ export type ResolveParams<TPathParams, TSchemaParams> =
       : Simplify<Omit<TPathParams, keyof TSchemaParams> & TSchemaParams>
     : TPathParams;
 
-type LayoutParent<Layout extends LayoutId> = LayoutTree[Layout] extends {
-  parent: infer Parent extends LayoutId | null;
+type LayoutParentsMap = RouterRegister extends {
+  LayoutParents: infer LP extends Record<string, unknown>;
 }
-  ? Parent
-  : null;
+  ? LP
+  : {};
+
+type LayoutParent<Layout extends LayoutId> = Layout extends keyof LayoutParentsMap
+  ? LayoutParentsMap[Layout] extends LayoutId
+    ? LayoutParentsMap[Layout]
+    : null
+  : LayoutTree[Layout] extends {
+        parent: infer Parent extends LayoutId | null;
+      }
+    ? Parent
+    : null;
 
-type ResolveLayoutMiddlewares<Layout extends LayoutId | null> = Layout extends null
+type ResolveLayoutMiddlewares<
+  Layout extends LayoutId | null,
+  Depth extends readonly unknown[] = [],
+> = Depth["length"] extends 10
   ? readonly []
   : Layout extends LayoutId
     ? readonly [
-        ...ResolveLayoutMiddlewares<LayoutParent<Layout>>,
+        ...ResolveLayoutMiddlewares<LayoutParent<Layout>, [...Depth, unknown]>,
         ...LayoutTree[Layout]["middlewares"],
       ]
     : readonly [];
 
-export type ResolveLayoutIdChain<L extends LayoutId | null> = L extends null
+export type ResolveLayoutIdChain<
+  L extends LayoutId | null,
+  Depth extends readonly unknown[] = [],
+> = Depth["length"] extends 10
   ? readonly []
   : L extends LayoutId
-    ? readonly [...ResolveLayoutIdChain<LayoutParent<L>>, L]
+    ? readonly [...ResolveLayoutIdChain<LayoutParent<L>, [...Depth, unknown]>, L]
     : readonly [];
 
 export type ResolveLayoutMiddlewaresState<Layout extends LayoutId | null> = Layout extends LayoutId
@@ -188,13 +210,6 @@ type RouteResolvedField<
   Field extends "query" | "params" | "body" | "state",
 > = RouteLayoutField<Path, TMethod, Field> & MergeMiddlewareField<Acc, Field>;
 
-type RouteChainField<
-  Path extends RoutePath,
-  TMethod extends Method,
-  Acc extends readonly unknown[],
-  Field extends "query" | "params" | "body" | "state",
-> = RouteResolvedField<Path, TMethod, Acc, Field>;
-
 export type RouteChainContext<
   Path extends RoutePath,
   TMethod extends Method,
@@ -206,15 +221,15 @@ export type RouteChainContext<
 > = Simplify<
   TAppContext &
     UnitRuntimeContext & {
-      query: Simplify<MergePart<TQuery, RouteChainField<Path, TMethod, Acc, "query">>>;
+      query: Simplify<MergePart<TQuery, RouteResolvedField<Path, TMethod, Acc, "query">>>;
       params: Simplify<
         ResolveParams<
           PathParams<Path>,
-          MergePart<TParams, RouteChainField<Path, TMethod, Acc, "params">>
+          MergePart<TParams, RouteResolvedField<Path, TMethod, Acc, "params">>
         >
       >;
-      body: Simplify<MergePart<TBody, RouteChainField<Path, TMethod, Acc, "body">>>;
-      state: Simplify<RouteChainField<Path, TMethod, Acc, "state">>;
+      body: Simplify<MergePart<TBody, RouteResolvedField<Path, TMethod, Acc, "body">>>;
+      state: Simplify<RouteResolvedField<Path, TMethod, Acc, "state">>;
       headers: TaserHeaders;
       cookies: TaserCookieJar;
     }

package/src/types/type-utils.ts

@@ -63,16 +63,20 @@ export type MiddlewareInputField<
 export type MergeMiddlewareField<
   Middlewares extends readonly unknown[],
   Field extends MiddlewareFieldName,
-> = [Middlewares] extends [readonly []]
+> = Middlewares extends readonly []
   ? {}
-  : UnionToIntersection<MiddlewareField<Middlewares[number], Field>>;
+  : Middlewares extends readonly [infer Head, ...infer Tail]
+    ? MiddlewareField<Head, Field> & MergeMiddlewareField<Tail, Field>
+    : MiddlewareField<Middlewares[number], Field>;
 
 export type MergeMiddlewareInputField<
   Middlewares extends readonly unknown[],
   Field extends MiddlewareInputFieldName,
-> = [Middlewares] extends [readonly []]
+> = Middlewares extends readonly []
   ? {}
-  : UnionToIntersection<MiddlewareInputField<Middlewares[number], Field>>;
+  : Middlewares extends readonly [infer Head, ...infer Tail]
+    ? MiddlewareInputField<Head, Field> & MergeMiddlewareInputField<Tail, Field>
+    : MiddlewareInputField<Middlewares[number], Field>;
 
 export type RuntimeContextFields = {
   request: Request;

package/src/types/units.ts

@@ -1,5 +1,4 @@
 import type {
-  Awaitable,
   MiddlewareDefinition as CoreMiddlewareDefinition,
   TaserCookieJar,
   TaserHeaders,
@@ -22,7 +21,7 @@ export type {
 } from "./returns.js";
 
 /** Default empty app context for standalone units without a bound router instance. */
-export type AppContext = Record<never, never>;
+export type EmptyAppContext = Record<never, never>;
 
 export type ValidatorParts = {
   query?: unknown;
@@ -39,13 +38,17 @@ export type NextResult<TState = unknown> = Response & {
   readonly [StateBrand]?: TState;
 };
 
-export type ExtractState<T> = [Extract<Awaited<T>, { [StateBrand]?: unknown }>] extends [never]
-  ? {}
-  : Extract<Awaited<T>, { [StateBrand]?: unknown }> extends { [StateBrand]?: infer S }
-    ? [S] extends [never]
+export type ExtractStateFromUnion<T> = T extends { readonly [StateBrand]?: infer S }
+  ? [S] extends [never]
+    ? never
+    : [unknown] extends [S]
       ? {}
       : S
-    : {};
+  : never;
+
+export type ExtractState<T> = [ExtractStateFromUnion<Awaited<T>>] extends [never]
+  ? {}
+  : ExtractStateFromUnion<Awaited<T>>;
 
 export type IsUnknown<T> = [unknown] extends [T] ? true : false;
 
@@ -54,8 +57,6 @@ export type NextFn<TExpectedState = unknown> =
     ? <S extends Record<string, unknown> = {}>(state?: S) => Promise<NextResult<S>>
     : (state: TExpectedState) => Promise<NextResult<TExpectedState>>;
 
-export type MiddlewareNext = NextFn;
-
 export type MiddlewareDefinition = CoreMiddlewareDefinition<ReturnsMap>;
 
 export type MiddlewareReturnFromParts<
@@ -110,7 +111,7 @@ export type StandaloneMiddlewareContext<
   TQuery = unknown,
   TParams = unknown,
   TBody = unknown,
-  TAppContext extends Record<string, unknown> = AppContext,
+  TAppContext extends Record<string, unknown> = EmptyAppContext,
   TState = {},
 > = Simplify<
   TAppContext &
@@ -124,12 +125,15 @@ export type StandaloneMiddlewareContext<
     }
 >;
 
+export declare const MiddlewareUnitBrand: unique symbol;
+
 export type MiddlewareUnit<
   TAcc = unknown,
   TReturns extends ReturnsMap = {},
   TRequiredLayouts = unknown,
   TRequiredState = unknown,
 > = MiddlewareDefinition & {
+  readonly [MiddlewareUnitBrand]: true;
   readonly __middlewareAcc: TAcc;
   readonly __returns?: TReturns;
   readonly __requiredLayouts?: TRequiredLayouts;
@@ -143,12 +147,26 @@ export type MiddlewareUnitBuilder<
   TReturns extends ReturnsMap = {},
   TRequiredLayouts = unknown,
   TRequiredState = {},
-  TAppContext extends Record<string, unknown> = AppContext,
+  TAppContext extends Record<string, unknown> = EmptyAppContext,
   TInheritedState = {},
   TQueryIn = unknown,
   TParamsIn = unknown,
   TBodyIn = unknown,
-> = {
+  TExpectedState = unknown,
+> = MiddlewareUnit<
+  MiddlewareReturnFromParts<
+    TQuery,
+    TParams,
+    TBody,
+    IsUnknown<TExpectedState> extends true ? {} : TExpectedState,
+    TQueryIn,
+    TParamsIn,
+    TBodyIn
+  >,
+  TReturns,
+  TRequiredLayouts,
+  TRequiredState
+> & {
   query<Q, QIn = unknown>(
     schema: Schema<Q, QIn>,
   ): MiddlewareUnitBuilder<
@@ -162,7 +180,8 @@ export type MiddlewareUnitBuilder<
     TInheritedState,
     QIn,
     TParamsIn,
-    TBodyIn
+    TBodyIn,
+    TExpectedState
   >;
   params<P, PIn = unknown>(
     schema: Schema<P, PIn>,
@@ -177,7 +196,8 @@ export type MiddlewareUnitBuilder<
     TInheritedState,
     TQueryIn,
     PIn,
-    TBodyIn
+    TBodyIn,
+    TExpectedState
   >;
   body<B, BIn = unknown>(
     schema: Schema<B, BIn>,
@@ -192,7 +212,8 @@ export type MiddlewareUnitBuilder<
     TInheritedState,
     TQueryIn,
     TParamsIn,
-    BIn
+    BIn,
+    TExpectedState
   >;
   body<Mode extends "json" | "form" | "urlencoded", B, BIn = unknown>(
     mode: Mode,
@@ -208,7 +229,8 @@ export type MiddlewareUnitBuilder<
     TInheritedState,
     TQueryIn,
     TParamsIn,
-    BIn
+    BIn,
+    TExpectedState
   >;
   returns<const M extends ReturnsMap>(
     map: M,
@@ -223,7 +245,8 @@ export type MiddlewareUnitBuilder<
     TInheritedState,
     TQueryIn,
     TParamsIn,
-    TBodyIn
+    TBodyIn,
+    TExpectedState
   >;
   requires<Requires extends Record<string, unknown>>(): MiddlewareUnitBuilder<
     TQuery,
@@ -236,9 +259,10 @@ export type MiddlewareUnitBuilder<
     TInheritedState,
     TQueryIn,
     TParamsIn,
-    TBodyIn
+    TBodyIn,
+    TExpectedState
   >;
-  handler<TState = unknown, R = unknown>(
+  handler<R>(
     fn: (
       ctx: StandaloneMiddlewareContext<
         TQuery,
@@ -247,13 +271,13 @@ export type MiddlewareUnitBuilder<
         TAppContext,
         TInheritedState & TRequiredState
       >,
-      next: NextFn<NoInfer<TState>>,
-    ) => Awaitable<R>,
+      next: NextFn<TExpectedState>,
+    ) => R,
   ): DefineMiddlewareResult<
     TQuery,
     TParams,
     TBody,
-    TState,
+    IsUnknown<TExpectedState> extends true ? ExtractState<R> : TExpectedState,
     R,
     TQueryIn,
     TParamsIn,

package/dist/cjs/register.d.cts

@@ -1,2 +0,0 @@
-export interface RouterRegister {
-}

package/dist/esm/register.d.ts

@@ -1,2 +0,0 @@
-export interface RouterRegister {
-}

package/src/register.ts

@@ -1 +0,0 @@
-export interface RouterRegister {}