@primate/core 0.9.0 → 0.9.2

package/lib/private/route.client.d.ts

@@ -5,18 +5,18 @@ import type RouteHandler from "#route/Handler";
 import hook from "#route/hook";
 import type RouteOptions from "#route/Options";
 import type { Unpack } from "@rcompat/type";
-type InferSchema<S> = S extends {
-    infer: infer I;
-} ? Awaited<I> : never;
+type InputSchema<S> = S extends {
+    input: infer I;
+} ? I : never;
 type Body<O extends RouteOptions> = O extends {
     contentType: infer _CT extends keyof ContentTypeMap;
     body: infer S;
-} ? Unpack<InferSchema<S>> : O extends {
+} ? Unpack<InputSchema<S>> : O extends {
     contentType: infer CT extends keyof ContentTypeMap;
 } ? ContentTypeMap[CT] : never;
 type Path<O extends RouteOptions> = O extends {
     path: infer S;
-} ? Unpack<InferSchema<S>> : never;
+} ? Unpack<InputSchema<S>> : never;
 type MethodMeta = {
     contentType?: string;
 };

package/lib/private/route.d.ts

@@ -1,17 +1,18 @@
 import type ResponseFunction from "#response/ResponseFunction";
+import type ResponseLike from "#response/ResponseLike";
 import type NarrowedRequest from "#route/NarrowedRequest";
 import type RouteHandler from "#route/Handler";
 import hook from "#route/hook";
 import type RouteOptions from "#route/Options";
 import type { Method } from "@rcompat/http";
 declare const BRAND: unique symbol;
-type WithResult<O extends RouteOptions> = {
+type WithResult<O extends RouteOptions, R extends ResponseLike> = {
     [BRAND]: true;
-    handler: (request: NarrowedRequest<O>) => unknown;
+    handler: RouteHandler<O, R>;
     options: O;
 };
 type Page<R> = Awaited<R> extends ResponseFunction<infer Props> ? Props : never;
-type AnyHandler = RouteHandler | WithResult<RouteOptions>;
+type AnyHandler = RouteHandler | WithResult<RouteOptions, ResponseLike>;
 type RouteHandlers = {
     [key in Method]?: AnyHandler;
 };
@@ -24,13 +25,11 @@ type RouteMethodWithResult<O extends RouteOptions, R> = Omit<RouteMethod<O>, "Pa
     Page: Page<R>;
 };
 type Routes<R extends RouteHandlers> = {
-    [K in keyof R]: R[K] extends WithResult<infer O extends RouteOptions> ? R[K] extends {
-        handler: (...args: any[]) => infer Result;
-    } ? RouteMethodWithResult<O, Result> : RouteMethod<O> : R[K] extends (...args: any[]) => infer Result ? RouteMethodWithResult<{}, Result> : RouteMethod<{}>;
+    [K in keyof R]: R[K] extends WithResult<infer O extends RouteOptions, infer Result> ? RouteMethodWithResult<O, Result> : R[K] extends (...args: any[]) => infer Result ? RouteMethodWithResult<{}, Result> : RouteMethod<{}>;
 };
 declare function route<R extends RouteHandlers>(handlers: R): Routes<R>;
 declare namespace route {
-    var _a: <O extends RouteOptions>(options: O, handler: RouteHandler<O>) => WithResult<O>;
+    var _a: <O extends RouteOptions, R extends ResponseLike>(options: O, handler: RouteHandler<O, R>) => WithResult<O, R>;
     export { _a as with };
     export { hook };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@primate/core",
-  "version": "0.9.0",
+  "version": "0.9.2",
   "description": "The universal web framework",
   "homepage": "https://primate.run",
   "bugs": "https://github.com/primate-run/primate/issues",
@@ -35,7 +35,7 @@
     "@rcompat/symbol": "^0.3.0",
     "@rcompat/type": "^0.18.0",
     "esbuild": "^0.28.1",
-    "pema": "^0.9.0"
+    "pema": "^0.9.1"
   },
   "imports": {
     "#i18n/config": {