@taserjs/router 0.0.5 → 0.1.0

package/src/types/type-utils.ts

@@ -1,5 +1,8 @@
-export type Method = "GET" | "POST" | "PUT" | "DELETE" | "PATCH" | "OPTIONS" | "HEAD";
-export type HttpMethod = Method;
+import type { TaserCookieJar, TaserHeaders } from "@taserjs/router-core";
+import type { HttpMethod, HttpVerb } from "@taserjs/router-utils/http";
+
+export type Method = HttpMethod;
+export type { HttpMethod, HttpVerb };
 
 export type MiddlewareFieldName = "query" | "params" | "body" | "state";
 
@@ -75,7 +78,9 @@ export type RuntimeContextFields = {
   request: Request;
   method: Method;
   url: URL;
-  headers: import("@taserjs/router-core").TaserHeaders;
-  cookies: import("@taserjs/router-core").TaserCookieJar;
+  headers: TaserHeaders;
+  cookies: TaserCookieJar;
   var: Record<string, unknown>;
 };
+
+export type UnitRuntimeContext = Omit<RuntimeContextFields, "var">;

package/src/types/units.ts

@@ -1,11 +1,16 @@
-import type { Awaitable, TaserCookieJar, TaserHeaders } from "@taserjs/router-core";
+import type {
+  Awaitable,
+  MiddlewareDefinition as CoreMiddlewareDefinition,
+  TaserCookieJar,
+  TaserHeaders,
+} from "@taserjs/router-core";
 
 import type {
   MergeMiddlewareField,
   MergePart,
   RequestShape,
-  RuntimeContextFields,
   Simplify,
+  UnitRuntimeContext,
   UnwrapPart,
 } from "./type-utils.js";
 import type { ReturnsMap } from "./returns.js";
@@ -58,13 +63,7 @@ export type NextFn<TExpectedState = unknown> =
 
 export type MiddlewareNext = NextFn;
 
-export type MiddlewareDefinition = {
-  query?: unknown;
-  params?: unknown;
-  body?: unknown;
-  returns?: ReturnsMap;
-  handler: (ctx: unknown, next: MiddlewareNext) => Awaitable<Response | unknown>;
-};
+export type MiddlewareDefinition = CoreMiddlewareDefinition<ReturnsMap>;
 
 export type MiddlewareReturnFromParts<
   TQuery,
@@ -87,7 +86,32 @@ export type MiddlewareReturnFromParts<
   };
 };
 
-type UnitRuntimeContext = Omit<RuntimeContextFields, "var">;
+export type DefineMiddlewareResult<
+  TQuery,
+  TParams,
+  TBody,
+  TState,
+  R,
+  TQueryIn = TQuery,
+  TParamsIn = TParams,
+  TBodyIn = TBody,
+  TReturns extends ReturnsMap = {},
+  TLayout = null,
+  TRequires = {},
+> = MiddlewareUnit<
+  MiddlewareReturnFromParts<
+    TQuery,
+    TParams,
+    TBody,
+    IsUnknown<TState> extends true ? ExtractState<R> : TState,
+    TQueryIn,
+    TParamsIn,
+    TBodyIn
+  >,
+  TReturns,
+  TLayout,
+  TRequires
+>;
 
 export type StandaloneMiddlewareContext<
   TQuery = unknown,