@primate/core 0.9.1 → 0.9.3

package/lib/private/request/route.js

@@ -65,10 +65,10 @@ export default async function (app, partial_request) {
     catch (error) {
         const request = partial_request;
         if (ParseError.is(error)) {
-            return response_json(error.toJSON(), { status: http.Status.BAD_REQUEST })(app);
+            return response_json(error.toJSON(), { status: http.Status.BAD_REQUEST })(app, {}, request);
         }
         if (CodeError.matches(error, Code.request_content_type_mismatch)) {
-            return response_json({ error: error.message }, { status: http.Status.UNSUPPORTED_MEDIA_TYPE })(app);
+            return response_json({ error: error.message }, { status: http.Status.UNSUPPORTED_MEDIA_TYPE })(app, {}, request);
         }
         app.log.error(error);
         // the +error.js page itself could fail

package/lib/private/response/binary.d.ts

@@ -1,4 +1,4 @@
-import type ServeApp from "#serve/App";
+import type ResponseFunction from "#response/ResponseFunction";
 import type { Streamable } from "@rcompat/fs";
 /**
  * Stream a binary response.
@@ -6,5 +6,5 @@ import type { Streamable } from "@rcompat/fs";
  * @param options response options
  * @return Response rendering function
  */
-export default function binary(source: Streamable, init?: ResponseInit): (app: ServeApp) => Response;
+export default function binary(source: Streamable, init?: ResponseInit): ResponseFunction<never>;
 //# sourceMappingURL=binary.d.ts.map

package/lib/private/response/binary.js

@@ -30,7 +30,7 @@ function toContentDisposition(filename) {
  * @return Response rendering function
  */
 export default function binary(source, init) {
-    return (app) => {
+    return app => {
         const { headers, ...rest } = app.media(http.MIME.APPLICATION_OCTET_STREAM, init);
         const name = fs.isNamedStream(source) ? source.name : "default.bin";
         const out = new Headers(headers);

package/lib/private/response/error.d.ts

@@ -13,6 +13,6 @@ type Options = {
  * @param options.template HTML template to use (default: `error.html`).
  * @return Response function.
  */
-export default function error(options?: Options): ResponseFunction;
+export default function error(options?: Options): ResponseFunction<never>;
 export {};
 //# sourceMappingURL=error.d.ts.map

package/lib/private/response/json.d.ts

@@ -4,6 +4,6 @@
  * @param options response options
  * @return Response rendering function
  */
-declare const _default: (body: unknown, init?: ResponseInit) => (app: import("../index.js").ServeApp) => import("@rcompat/type").MaybePromise<Response>;
+declare const _default: (body: unknown, init?: ResponseInit) => import("./ResponseFunction.js").default<never>;
 export default _default;
 //# sourceMappingURL=json.d.ts.map

package/lib/private/response/null.d.ts

@@ -1,3 +1,4 @@
-declare function $null(): () => Response;
+import type ResponseFunction from "#response/ResponseFunction";
+declare function $null(): ResponseFunction<never>;
 export default $null;
 //# sourceMappingURL=null.d.ts.map

package/lib/private/response/redirect.d.ts

@@ -7,5 +7,5 @@ export default _default;
 * @param status redirection 3xx code
 * @return Response rendering function
 */
-declare function _default(location: string, status?: Redirection): ResponseFunction;
+declare function _default(location: string, status?: Redirection): ResponseFunction<never>;
 //# sourceMappingURL=redirect.d.ts.map

package/lib/private/response/sse.d.ts

@@ -9,6 +9,6 @@ type Body = (source: Source) => Cleanup;
  * @param options response options
  * @return Response rendering function
  */
-declare const _default: (body: Body, init?: ResponseInit) => (app: import("../index.js").ServeApp) => import("@rcompat/type").MaybePromise<Response>;
+declare const _default: (body: Body, init?: ResponseInit) => import("./ResponseFunction.js").default<never>;
 export default _default;
 //# sourceMappingURL=sse.d.ts.map

package/lib/private/response/text.d.ts

@@ -4,6 +4,6 @@
  * @param options response options
  * @return Response rendering function
  */
-declare const _default: (body: string, init?: ResponseInit) => (app: import("../index.js").ServeApp) => import("@rcompat/type").MaybePromise<Response>;
+declare const _default: (body: string, init?: ResponseInit) => import("./ResponseFunction.js").default<never>;
 export default _default;
 //# sourceMappingURL=text.d.ts.map

package/lib/private/response/ws.d.ts

@@ -1,5 +1,5 @@
 import type ResponseFunction from "#response/ResponseFunction";
 import type { Actions } from "@rcompat/http";
 export default _default;
-declare function _default(actions: Actions): ResponseFunction;
+declare function _default(actions: Actions): ResponseFunction<never>;
 //# sourceMappingURL=ws.d.ts.map

package/lib/private/response.d.ts

@@ -1,5 +1,4 @@
-import type ServeApp from "#serve/App";
-import type { MaybePromise } from "@rcompat/type";
+import type ResponseFunction from "#response/ResponseFunction";
 export default _default;
-declare function _default<T>(mime: string, mapper: (input: T) => BodyInit): (body: T, init?: ResponseInit) => (app: ServeApp) => MaybePromise<Response>;
+declare function _default<T>(mime: string, mapper: (input: T) => BodyInit): (body: T, init?: ResponseInit) => ResponseFunction<never>;
 //# sourceMappingURL=response.d.ts.map

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

@@ -23,7 +23,7 @@ type MethodMeta = {
 type RequestMeta = {
     headers?: HeadersInit;
 };
-type Page<R> = Awaited<R> extends ResponseFunction<infer Props> ? Props : never;
+type Page<R> = Awaited<R> extends infer Result ? Result extends ResponseFunction<infer Props> ? Props : never : never;
 type ClientMethod<O extends RouteOptions, R = unknown> = MethodMeta & {
     _result?: R;
     Page: Page<R>;

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 Page<R> = Awaited<R> extends infer Result ? Result extends ResponseFunction<infer Props> ? Props : never : never;
+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/lib/public/response.d.ts

@@ -6,15 +6,15 @@ import $null from "#response/null";
 declare const response: {
     binary: typeof binary;
     error: typeof error;
-    json: (body: unknown, init?: ResponseInit) => (app: import("./index.js").ServeApp) => import("@rcompat/type").MaybePromise<Response>;
+    json: (body: unknown, init?: ResponseInit) => import("./index.js").ResponseFunction<never>;
     page: typeof page;
-    redirect: (location: string, status?: 300 | 301 | 302 | 303 | 304 | 307 | 308) => import("./index.js").ResponseFunction;
+    redirect: (location: string, status?: 300 | 301 | 302 | 303 | 304 | 307 | 308) => import("./index.js").ResponseFunction<never>;
     sse: (body: (source: {
         send(name: string, data: unknown): void;
-    }) => void | (() => void), init?: ResponseInit) => (app: import("./index.js").ServeApp) => import("@rcompat/type").MaybePromise<Response>;
-    text: (body: string, init?: ResponseInit) => (app: import("./index.js").ServeApp) => import("@rcompat/type").MaybePromise<Response>;
+    }) => void | (() => void), init?: ResponseInit) => import("./index.js").ResponseFunction<never>;
+    text: (body: string, init?: ResponseInit) => import("./index.js").ResponseFunction<never>;
     view: typeof view;
-    ws: (actions: import("@rcompat/http").Actions) => import("./index.js").ResponseFunction;
+    ws: (actions: import("@rcompat/http").Actions) => import("./index.js").ResponseFunction<never>;
     null: typeof $null;
 };
 export default response;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@primate/core",
-  "version": "0.9.1",
+  "version": "0.9.3",
   "description": "The universal web framework",
   "homepage": "https://primate.run",
   "bugs": "https://github.com/primate-run/primate/issues",