@kaito-http/core 4.0.0-beta.32 → 4.0.0-beta.33

package/dist/index.cjs

@@ -1170,7 +1170,7 @@ var isNodeLikeDev = typeof process !== "undefined" && typeof process.env !== "un
 // src/router/router.ts
 var Router = class _Router {
   #state;
-  static create = (config = {}) => new _Router({ through: (context) => context, routes: /* @__PURE__ */ new Set(), config });
+  static create = (config = {}) => new _Router({ pipe: (context) => context, routes: /* @__PURE__ */ new Set(), config });
   constructor(state) {
     this.#state = state;
   }
@@ -1252,9 +1252,11 @@ var Router = class _Router {
       try {
         const body = route.body ? await route.body.parse(await req.json()) : void 0;
         const query = route.fastQuerySchema ? route.fastQuerySchema.parse(url.searchParams) : {};
-        const ctx = await route.router.#state.through(
+        const ctx = await route.router.#state.pipe(
           await this.#state.config.getContext?.(request, head, ...args) ?? null,
-          rawParams
+          rawParams,
+          request,
+          head
         );
         const result = await route.run({
           ctx,
@@ -1481,15 +1483,15 @@ var Router = class _Router {
   delete = this.method("DELETE");
   head = this.method("HEAD");
   options = this.method("OPTIONS");
-  through = (through) => {
+  pipe = (pipe) => {
     return new _Router({
       ...this.#state,
-      through: (context, params) => {
-        const next = this.#state.through(context, params);
+      pipe: (context, params, request, head) => {
+        const next = this.#state.pipe(context, params, request, head);
         if (next instanceof Promise) {
-          return next.then((next2) => through(next2, params));
+          return next.then((next2) => pipe(next2, params, request, head));
         }
-        return through(next, params);
+        return pipe(next, params, request, head);
       }
     });
   };

package/dist/index.d.cts

@@ -74,13 +74,13 @@ declare class KaitoHead {
     get touched(): boolean;
 }
 
-type PrefixRoutesPathInner<R extends AnyRoute, Prefix extends `/${string}`> = R extends Route<infer ContextFrom, infer ContextTo, infer RouterInput, infer ResultOutput, infer Path, infer AdditionalParams, infer Method, infer Query, infer BodyInput, infer BodyOutput> ? Route<ContextFrom, ContextTo, RouterInput, ResultOutput, `${Prefix}${Path extends '/' ? '' : Path}`, AdditionalParams, Method, Query, BodyInput, BodyOutput> : never;
-type PrefixRoutesPath<Prefix extends `/${string}`, R extends AnyRoute> = R extends R ? PrefixRoutesPathInner<R, Prefix> : never;
+type PrefixRoutesPath<Prefix extends `/${string}`, R extends AnyRoute> = R extends R ? R extends Route<infer ContextFrom, infer ContextTo, infer RouterInput, infer ResultOutput, infer Path, infer AdditionalParams, infer Method, infer Query, infer BodyInput, infer BodyOutput> ? Route<ContextFrom, ContextTo, RouterInput, ResultOutput, `${Prefix}${Path extends '/' ? '' : Path}`, AdditionalParams, Method, Query, BodyInput, BodyOutput> : never : never;
 type RouterState<ContextFrom, ContextTo, RequiredParams extends string, Routes extends AnyRoute, Input extends readonly unknown[]> = {
     routes: Set<Routes>;
-    through: (context: ContextFrom, params: Record<RequiredParams, string>) => Promise<ContextTo> | ContextTo;
+    pipe: (context: ContextFrom, params: Record<RequiredParams, string>, request: KaitoRequest, head: KaitoHead) => Promise<ContextTo> | ContextTo;
     config: KaitoConfig<ContextFrom, Input>;
 };
+type Params<P extends string = string> = Record<P, string>;
 declare class Router<ContextFrom, ContextTo, RequiredParams extends string, Routes extends AnyRoute, Input extends readonly unknown[]> {
     #private;
     static create: <Context = null, Input_1 extends readonly unknown[] = []>(config?: KaitoConfig<Context, Input_1>) => Router<Context, Context, never, never, Input_1>;
@@ -144,7 +144,7 @@ declare class Router<ContextFrom, ContextTo, RequiredParams extends string, Rout
     readonly options: <Path extends string, ResultOutput = never, Query extends AnyQuery = {}, BodyInput extends JSONValue = never, BodyOutput = never>(path: Path, route: ((data: RouteRunData<RequiredParams | ExtractRouteParams<Path>, ContextTo, Query, BodyOutput>) => ResultOutput | Promise<ResultOutput>) | (Omit<Route<ContextFrom, ContextTo, Input, ResultOutput, Path, RequiredParams, "OPTIONS", Query, BodyInput, BodyOutput>, "path" | "method" | "router" | "openapi"> & {
         openapi?: OpenAPISpecFor<ResultOutput>;
     })) => Router<ContextFrom, ContextTo, RequiredParams, Routes | Route<ContextFrom, ContextTo, Input, ResultOutput, Path, RequiredParams, "OPTIONS", Query, BodyInput, BodyOutput>, Input>;
-    through: <NextContext>(through: (context: ContextTo, params: Record<RequiredParams, string>) => MaybePromise<NextContext>) => Router<ContextFrom, NextContext, RequiredParams, Routes, Input>;
+    pipe: <NextContext>(pipe: (context: ContextTo, params: Record<RequiredParams, string>, request: KaitoRequest, head: KaitoHead) => MaybePromise<NextContext>) => Router<ContextFrom, NextContext, RequiredParams, Routes, Input>;
 }
 
 type RouteRunData<Params extends string, Context, QueryOutput, BodyOutput> = {
@@ -156,7 +156,6 @@ type RouteRunData<Params extends string, Context, QueryOutput, BodyOutput> = {
 type AnyQuery = {
     [key in string]: any;
 };
-type Through<From, To, RequiredParams extends string> = (context: From, params: Record<RequiredParams, string>) => Promise<To>;
 /**
  * Wraps BaseSchema to prevent the schema from participating in inference for `Output`.
  *
@@ -309,4 +308,4 @@ interface KaitoConfig<ContextFrom, Input extends readonly unknown[]> {
  */
 declare const create: <Context = null, Input extends readonly unknown[] = []>(config?: KaitoConfig<Context, Input>) => Router<Context, Context, never, never, Input>;
 
-export { type AnyOutputSpec, type AnyQuery, type AnyRoute, AnySchemaFor, BaseSchema, BaseSchemaDef, type ExtractRouteParams, type GetContext, type InferRoutes, type JSONOutputSpec, JSONValue, type KaitoConfig, KaitoError, KaitoHead, type KaitoMethod, KaitoRequest, type MaybePromise, type OpenAPISpecFor, type ResponseOutputSpec, type Route, type RouteRunData, Router, type RouterState, type SSEOutputSpec, type SSEOutputSpecWithSchema, type SSEOutputSpecWithoutSchema, type Through, WrappedError, create, isNodeLikeDev };
+export { type AnyOutputSpec, type AnyQuery, type AnyRoute, AnySchemaFor, BaseSchema, BaseSchemaDef, type ExtractRouteParams, type GetContext, type InferRoutes, type JSONOutputSpec, JSONValue, type KaitoConfig, KaitoError, KaitoHead, type KaitoMethod, KaitoRequest, type MaybePromise, type OpenAPISpecFor, type Params, type ResponseOutputSpec, type Route, type RouteRunData, Router, type RouterState, type SSEOutputSpec, type SSEOutputSpecWithSchema, type SSEOutputSpecWithoutSchema, WrappedError, create, isNodeLikeDev };

package/dist/index.d.ts

@@ -74,13 +74,13 @@ declare class KaitoHead {
     get touched(): boolean;
 }
 
-type PrefixRoutesPathInner<R extends AnyRoute, Prefix extends `/${string}`> = R extends Route<infer ContextFrom, infer ContextTo, infer RouterInput, infer ResultOutput, infer Path, infer AdditionalParams, infer Method, infer Query, infer BodyInput, infer BodyOutput> ? Route<ContextFrom, ContextTo, RouterInput, ResultOutput, `${Prefix}${Path extends '/' ? '' : Path}`, AdditionalParams, Method, Query, BodyInput, BodyOutput> : never;
-type PrefixRoutesPath<Prefix extends `/${string}`, R extends AnyRoute> = R extends R ? PrefixRoutesPathInner<R, Prefix> : never;
+type PrefixRoutesPath<Prefix extends `/${string}`, R extends AnyRoute> = R extends R ? R extends Route<infer ContextFrom, infer ContextTo, infer RouterInput, infer ResultOutput, infer Path, infer AdditionalParams, infer Method, infer Query, infer BodyInput, infer BodyOutput> ? Route<ContextFrom, ContextTo, RouterInput, ResultOutput, `${Prefix}${Path extends '/' ? '' : Path}`, AdditionalParams, Method, Query, BodyInput, BodyOutput> : never : never;
 type RouterState<ContextFrom, ContextTo, RequiredParams extends string, Routes extends AnyRoute, Input extends readonly unknown[]> = {
     routes: Set<Routes>;
-    through: (context: ContextFrom, params: Record<RequiredParams, string>) => Promise<ContextTo> | ContextTo;
+    pipe: (context: ContextFrom, params: Record<RequiredParams, string>, request: KaitoRequest, head: KaitoHead) => Promise<ContextTo> | ContextTo;
     config: KaitoConfig<ContextFrom, Input>;
 };
+type Params<P extends string = string> = Record<P, string>;
 declare class Router<ContextFrom, ContextTo, RequiredParams extends string, Routes extends AnyRoute, Input extends readonly unknown[]> {
     #private;
     static create: <Context = null, Input_1 extends readonly unknown[] = []>(config?: KaitoConfig<Context, Input_1>) => Router<Context, Context, never, never, Input_1>;
@@ -144,7 +144,7 @@ declare class Router<ContextFrom, ContextTo, RequiredParams extends string, Rout
     readonly options: <Path extends string, ResultOutput = never, Query extends AnyQuery = {}, BodyInput extends JSONValue = never, BodyOutput = never>(path: Path, route: ((data: RouteRunData<RequiredParams | ExtractRouteParams<Path>, ContextTo, Query, BodyOutput>) => ResultOutput | Promise<ResultOutput>) | (Omit<Route<ContextFrom, ContextTo, Input, ResultOutput, Path, RequiredParams, "OPTIONS", Query, BodyInput, BodyOutput>, "path" | "method" | "router" | "openapi"> & {
         openapi?: OpenAPISpecFor<ResultOutput>;
     })) => Router<ContextFrom, ContextTo, RequiredParams, Routes | Route<ContextFrom, ContextTo, Input, ResultOutput, Path, RequiredParams, "OPTIONS", Query, BodyInput, BodyOutput>, Input>;
-    through: <NextContext>(through: (context: ContextTo, params: Record<RequiredParams, string>) => MaybePromise<NextContext>) => Router<ContextFrom, NextContext, RequiredParams, Routes, Input>;
+    pipe: <NextContext>(pipe: (context: ContextTo, params: Record<RequiredParams, string>, request: KaitoRequest, head: KaitoHead) => MaybePromise<NextContext>) => Router<ContextFrom, NextContext, RequiredParams, Routes, Input>;
 }
 
 type RouteRunData<Params extends string, Context, QueryOutput, BodyOutput> = {
@@ -156,7 +156,6 @@ type RouteRunData<Params extends string, Context, QueryOutput, BodyOutput> = {
 type AnyQuery = {
     [key in string]: any;
 };
-type Through<From, To, RequiredParams extends string> = (context: From, params: Record<RequiredParams, string>) => Promise<To>;
 /**
  * Wraps BaseSchema to prevent the schema from participating in inference for `Output`.
  *
@@ -309,4 +308,4 @@ interface KaitoConfig<ContextFrom, Input extends readonly unknown[]> {
  */
 declare const create: <Context = null, Input extends readonly unknown[] = []>(config?: KaitoConfig<Context, Input>) => Router<Context, Context, never, never, Input>;
 
-export { type AnyOutputSpec, type AnyQuery, type AnyRoute, AnySchemaFor, BaseSchema, BaseSchemaDef, type ExtractRouteParams, type GetContext, type InferRoutes, type JSONOutputSpec, JSONValue, type KaitoConfig, KaitoError, KaitoHead, type KaitoMethod, KaitoRequest, type MaybePromise, type OpenAPISpecFor, type ResponseOutputSpec, type Route, type RouteRunData, Router, type RouterState, type SSEOutputSpec, type SSEOutputSpecWithSchema, type SSEOutputSpecWithoutSchema, type Through, WrappedError, create, isNodeLikeDev };
+export { type AnyOutputSpec, type AnyQuery, type AnyRoute, AnySchemaFor, BaseSchema, BaseSchemaDef, type ExtractRouteParams, type GetContext, type InferRoutes, type JSONOutputSpec, JSONValue, type KaitoConfig, KaitoError, KaitoHead, type KaitoMethod, KaitoRequest, type MaybePromise, type OpenAPISpecFor, type Params, type ResponseOutputSpec, type Route, type RouteRunData, Router, type RouterState, type SSEOutputSpec, type SSEOutputSpecWithSchema, type SSEOutputSpecWithoutSchema, WrappedError, create, isNodeLikeDev };

package/dist/index.js

@@ -140,7 +140,7 @@ var isNodeLikeDev = typeof process !== "undefined" && typeof process.env !== "un
 // src/router/router.ts
 var Router = class _Router {
   #state;
-  static create = (config = {}) => new _Router({ through: (context) => context, routes: /* @__PURE__ */ new Set(), config });
+  static create = (config = {}) => new _Router({ pipe: (context) => context, routes: /* @__PURE__ */ new Set(), config });
   constructor(state) {
     this.#state = state;
   }
@@ -222,9 +222,11 @@ var Router = class _Router {
       try {
         const body = route.body ? await route.body.parse(await req.json()) : void 0;
         const query = route.fastQuerySchema ? route.fastQuerySchema.parse(url.searchParams) : {};
-        const ctx = await route.router.#state.through(
+        const ctx = await route.router.#state.pipe(
           await this.#state.config.getContext?.(request, head, ...args) ?? null,
-          rawParams
+          rawParams,
+          request,
+          head
         );
         const result = await route.run({
           ctx,
@@ -451,15 +453,15 @@ var Router = class _Router {
   delete = this.method("DELETE");
   head = this.method("HEAD");
   options = this.method("OPTIONS");
-  through = (through) => {
+  pipe = (pipe) => {
     return new _Router({
       ...this.#state,
-      through: (context, params) => {
-        const next = this.#state.through(context, params);
+      pipe: (context, params, request, head) => {
+        const next = this.#state.pipe(context, params, request, head);
         if (next instanceof Promise) {
-          return next.then((next2) => through(next2, params));
+          return next.then((next2) => pipe(next2, params, request, head));
         }
-        return through(next, params);
+        return pipe(next, params, request, head);
       }
     });
   };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@kaito-http/core",
   "type": "module",
-  "version": "4.0.0-beta.32",
+  "version": "4.0.0-beta.33",
   "author": "Alistair Smith <hi@alistair.sh>",
   "repository": "https://github.com/kaito-http/kaito",
   "dependencies": {