elysia 2.0.0-beta.21 → 2.0.0-beta.23

package/dist/compile/handler/reconstruct.js

@@ -6,7 +6,7 @@ const require_validator_route = require('../../validator/route.js');
 const require_compile_handler_frozen_validator = require('./frozen-validator.js');
 
 //#region src/compile/handler/reconstruct.ts
-var Reconstrct = class {
+var Reconstruct = class {
 	static validator(hook, root, method, path, liveOnly = false) {
 		const frozenRoot = require_generation.frozenRootOf(root);
 		if (!liveOnly && !require_type_bridge.isBridgeLive()) {
@@ -49,4 +49,4 @@ var Reconstrct = class {
 };
 
 //#endregion
-exports.Reconstrct = Reconstrct;
+exports.Reconstruct = Reconstruct;

package/dist/compile/handler/reconstruct.mjs

@@ -1,3 +1,4 @@
+// @bun
 import { isBridgeLive } from "../../type/bridge.mjs";
 import { frozenRootOf, resolvedTraceOf, traceCapabilityRequired } from "../../generation.mjs";
 import { compileCookieConfig } from "../../cookie/config.mjs";
@@ -5,7 +6,7 @@ import { RouteValidator } from "../../validator/route.mjs";
 import { buildFrozenRouteValidator, isBridgeNotInitialized } from "./frozen-validator.mjs";
 
 //#region src/compile/handler/reconstruct.ts
-var Reconstrct = class {
+var Reconstruct = class {
 	static validator(hook, root, method, path, liveOnly = false) {
 		const frozenRoot = frozenRootOf(root);
 		if (!liveOnly && !isBridgeLive()) {
@@ -48,4 +49,4 @@ var Reconstrct = class {
 };
 
 //#endregion
-export { Reconstrct };
+export { Reconstruct };

package/dist/compile/handler/static-clone-resolver.mjs

@@ -1,3 +1,4 @@
+// @bun
 import { cloneStaticValue } from "./utils.mjs";
 
 //#region src/compile/handler/static-clone-resolver.ts

package/dist/compile/handler/utils.d.ts

@@ -20,19 +20,25 @@ declare function hasRequestBody(request: Request): boolean;
  * @see `../../adapter/origin` for the provenance channel
  */
 declare function armEntryAbort(context: any): any;
-declare const mapTransform: (event: MaybeArray<TransformHandler<any, any, undefined, "local">>, rest?: [isAsync: AsyncMode, report?: TraceReporter | undefined, arm?: string | undefined] | undefined, abortGuard?: string, tail?: TailMode) => string;
+declare const mapTransform: (event: MaybeArray<TransformHandler<any, any, undefined, "local">>, rest?: [mode: AsyncMode, report?: TraceReporter | undefined, arm?: string | undefined] | undefined, abortGuard?: string, tail?: TailMode) => string;
 declare function replaceDeriveContext(context: any, derivative: any): any;
 declare function deriveModes(hooks: Function[], entries?: readonly DeriveEntry[]): (boolean | undefined)[] | undefined;
-declare function mapBeforeHandle(_hooks: AppHook['beforeHandle'] | AppHook['beforeHandle'][0], derive: readonly DeriveEntry[] | undefined, link: Link, isAsync: AsyncMode, report?: TraceReporter, abortGuard?: string, arm?: string): string;
+/**
+ * `~deriveEntries` of the `beforeHandle` lists of `parts` joined in order,
+ * each occurrence keeping the role its own part gave it; undefined when
+ * their own entries joined already do
+ */
+declare function joinDeriveEntries(parts: readonly (Partial<AppHook> | undefined)[]): DeriveEntry[] | undefined;
+declare function mapBeforeHandle(_hooks: AppHook['beforeHandle'] | AppHook['beforeHandle'][0], derive: readonly DeriveEntry[] | undefined, link: Link, mode: AsyncMode, report?: TraceReporter, abortGuard?: string, arm?: string): string;
 type BeforeHandleContext = {
   request: Request;
   '~sig'?: AbortSignal;
 };
 declare function runBeforeHandlePrefix(prefix: CompactBeforeHandlePrefix, context: BeforeHandleContext, abort?: 1): any;
 declare function runBeforeHandlePrefixAsync(prefix: CompactBeforeHandlePrefix, context: BeforeHandleContext, abort?: 1): Promise<any>;
-declare function mapChainHook(_hooks: Function | Function[], prefix: string, isAsync: AsyncMode, report?: TraceReporter, abortGuard?: string, arm?: string): string;
+declare function mapChainHook(_hooks: Function | Function[], prefix: string, mode: AsyncMode, report?: TraceReporter, abortGuard?: string, arm?: string): string;
 declare const mapAfterResponse: (event: MaybeArray<AfterResponseHandler<any, any, undefined, "local">>, rest?: [report?: TraceReporter | undefined] | undefined, abortGuard?: string, tail?: TailMode) => string;
-declare const mapError: (event: MaybeArray<ErrorHandler<any, any, any>>, rest?: [map: string, link: Link, mapResponse: (response: unknown, set: Context["set"], ...params: unknown[]) => unknown, schedule: string, sign: string, isAsync: AsyncMode, arm?: string | undefined] | undefined, abortGuard?: string, tail?: TailMode) => string;
+declare const mapError: (event: MaybeArray<ErrorHandler<any, any, any>>, rest?: [map: string, link: Link, mapResponse: (response: unknown, set: Context["set"], ...params: unknown[]) => unknown, schedule: string, sign: string, mode: AsyncMode, arm?: string | undefined] | undefined, abortGuard?: string, tail?: TailMode) => string;
 interface QueryWalkState {
   array: Record<string, 1> | undefined;
   object: Record<string, 1> | undefined;
@@ -48,9 +54,9 @@ interface TailMode {
   sites: string[];
 }
 declare const asyncTail: (mode: AsyncMode) => TailMode | undefined;
-declare function awaitSite(call: string, fn: Function, isAsync: AsyncMode, target: string, arm?: string): string;
+declare function awaitSite(call: string, fn: Function, mode: AsyncMode, target: string, arm?: string): string;
 declare const tailStage: (mode: TailMode, guard?: string) => string;
 declare const tailPlain: (mode: AsyncMode, code: string) => string;
-declare function awaitGuard(fn: Function, isAsync: AsyncMode, target: string, arm?: string): string;
+declare function awaitGuard(fn: Function, mode: AsyncMode, target: string, arm?: string): string;
 //#endregion
-export { AsyncMode, Link, TailMode, TraceReporter, armEntryAbort, asyncTail, awaitGuard, awaitSite, cloneResponse, cloneStaticValue, deriveModes, getQueryParseChannels, hasRequestBody, mapAfterResponse, mapBeforeHandle, mapChainHook, mapError, mapTransform, replaceDeriveContext, runBeforeHandlePrefix, runBeforeHandlePrefixAsync, tailPlain, tailStage };
+export { AsyncMode, Link, TailMode, TraceReporter, armEntryAbort, asyncTail, awaitGuard, awaitSite, cloneResponse, cloneStaticValue, deriveModes, getQueryParseChannels, hasRequestBody, joinDeriveEntries, mapAfterResponse, mapBeforeHandle, mapChainHook, mapError, mapTransform, replaceDeriveContext, runBeforeHandlePrefix, runBeforeHandlePrefixAsync, tailPlain, tailStage };

package/dist/compile/handler/utils.js

@@ -52,11 +52,11 @@ function armEntryAbort(context) {
 	if (context.request === require_adapter_origin.origin.request) return false;
 	return (context["~sig"] = context.request.signal).aborted;
 }
-const trace = (report, fn) => report?.resolveChild(fn?.name && typeof fn.name === "string" ? fn.name : "anonymous") ?? noTrace;
+const traceChild = (report, fn) => report?.resolveChild(fn?.name && typeof fn.name === "string" ? fn.name : "anonymous") ?? noTrace;
 const toArray = (v) => Array.isArray(v) ? v : [v];
-const mapTransform = /* @__PURE__ */ map((i, fn, [isAsync, report, arm]) => {
-	const t = trace(report, fn);
-	const call = isAsync ? awaitSite(`tf${at(i)}(c)`, fn, isAsync, "_tf", arm) : `tf${at(i)}(c)\n`;
+const mapTransform = /* @__PURE__ */ map((i, fn, [mode, report, arm]) => {
+	const t = traceChild(report, fn);
+	const call = mode ? awaitSite(`tf${at(i)}(c)`, fn, mode, "_tf", arm) : `tf${at(i)}(c)\n`;
 	return t.begin + call + t.end();
 });
 const deriveKeyCache = /* @__PURE__ */ new WeakMap();
@@ -76,8 +76,8 @@ function extractDeriveKeys(fn) {
 function returnedObjectKeys(src) {
 	const tokens = require_compile_lexer.scanTokens(src);
 	if (!tokens) return null;
-	const is = (i, value) => tokens[i]?.k === "p" && tokens[i].value === value;
-	const blank = (i) => {
+	const isPunct = (i, value) => tokens[i]?.k === "p" && tokens[i].value === value;
+	const spaceOnlyAfter = (i) => {
 		const token = tokens[i];
 		return /^[ \t\n\r]*$/.test(src.slice(token.at + token.value.length + (token.k === "s" ? 2 : 0), tokens[i + 1]?.at));
 	};
@@ -92,12 +92,12 @@ function returnedObjectKeys(src) {
 		else if (value === "(" || value === "[" || value === "{") depth++;
 		else if (value === ")" || value === "]" || value === "}") depth--;
 		else if (depth === 0 && value === "=>") {
-			if (!blank(i)) return null;
-			if (is(i + 1, "(")) {
-				if (!blank(i + 1) || !is(i + 2, "{")) return null;
+			if (!spaceOnlyAfter(i)) return null;
+			if (isPunct(i + 1, "(")) {
+				if (!spaceOnlyAfter(i + 1) || !isPunct(i + 2, "{")) return null;
 				open = i + 2;
 				parens = 1;
-			} else if (!is(i + 1, "{")) return null;
+			} else if (!isPunct(i + 1, "{")) return null;
 			break;
 		}
 	}
@@ -112,15 +112,15 @@ function returnedObjectKeys(src) {
 			} else if (value.includes("return") && /[^\w$]/.test(value)) return null;
 		}
 		if (at === -1) return null;
-		for (; blank(at) && is(at + 1, "("); at++) parens++;
-		if (!blank(at) || !is(at + 1, "{")) return null;
+		for (; spaceOnlyAfter(at) && isPunct(at + 1, "("); at++) parens++;
+		if (!spaceOnlyAfter(at) || !isPunct(at + 1, "{")) return null;
 		open = at + 1;
 	}
 	const keys = [];
 	let i = open + 1;
-	while (!is(i, "}")) {
+	while (!isPunct(i, "}")) {
 		const key = tokens[i];
-		if (!key || (key.k === "s" ? key.value.includes("\\") : key.k !== "i" || !/^[\w$]+$/.test(key.value)) || !blank(i) || !is(i + 1, ":")) return null;
+		if (!key || (key.k === "s" ? key.value.includes("\\") : key.k !== "i" || !/^[\w$]+$/.test(key.value)) || !spaceOnlyAfter(i) || !isPunct(i + 1, ":")) return null;
 		keys.push(key.value);
 		for (depth = 0, i += 2;; i++) {
 			const token = tokens[i];
@@ -136,10 +136,10 @@ function returnedObjectKeys(src) {
 				depth--;
 			} else if (value === "," && depth === 0) break;
 		}
-		if (is(i, ",")) i++;
+		if (isPunct(i, ",")) i++;
 	}
-	for (; parens; parens--) if (!is(++i, ")")) return null;
-	return i + 1 === tokens.length || is(i + 1, ";") || is(i + 1, "}") ? keys : null;
+	for (; parens; parens--) if (!isPunct(++i, ")")) return null;
+	return i + 1 === tokens.length || isPunct(i + 1, ";") || isPunct(i + 1, "}") ? keys : null;
 }
 function replaceDeriveContext(context, derivative) {
 	const next = Object.create(Object.getPrototypeOf(context));
@@ -168,34 +168,56 @@ function replaceDeriveContext(context, derivative) {
 	return next;
 }
 function deriveModes(hooks, entries) {
-	let queues;
-	if (entries?.length) {
-		queues = /* @__PURE__ */ new Map();
-		for (let i = 0; i < entries.length; i++) {
-			const entry = entries[i];
-			const fn = require_utils.deriveEntryFn(entry);
-			const queue = queues.get(fn);
-			const mode = require_utils.isMapDeriveEntry(entry);
-			if (queue) queue.push(mode);
-			else queues.set(fn, [mode]);
-		}
-	}
+	const queues = require_utils.deriveQueues(entries);
 	if (!queues) return;
 	let found = false;
 	const modes = Array(hooks.length);
 	for (let i = 0; i < hooks.length; i++) {
-		const fn = hooks[i];
-		const queue = queues.get(fn);
-		if (!queue?.length) continue;
+		const entry = queues.get(hooks[i])?.shift();
+		if (entry === void 0 || require_utils.isPlainDeriveEntry(entry)) continue;
+		modes[i] = require_utils.isMapDeriveEntry(entry);
 		found = true;
-		modes[i] = queue.shift();
 	}
 	return found ? modes : void 0;
 }
-function mapBeforeHandle(_hooks, derive, link, isAsync, report, abortGuard, arm) {
+const deriveEntriesOf = (part) => part?.["~deriveEntries"];
+function sharesDerive(part, index, parts) {
+	const entries = deriveEntriesOf(part);
+	if (entries) for (let i = 0; i < parts.length; i++) {
+		const other = parts[i]?.beforeHandle;
+		if (i === index || !other) continue;
+		for (let j = 0; j < entries.length; j++) {
+			const fn = require_utils.deriveEntryFn(entries[j]);
+			if (Array.isArray(other) ? other.includes(fn) : other === fn) return true;
+		}
+	}
+	return false;
+}
+/**
+* `~deriveEntries` of the `beforeHandle` lists of `parts` joined in order,
+* each occurrence keeping the role its own part gave it; undefined when
+* their own entries joined already do
+*/
+function joinDeriveEntries(parts) {
+	if (!parts.some(sharesDerive)) return;
+	const hooks = [];
+	let at;
+	for (const part of parts) {
+		const value = part?.beforeHandle;
+		if (!value) continue;
+		const queues = require_utils.deriveQueues(deriveEntriesOf(part));
+		for (const fn of toArray(value)) {
+			const entry = queues?.get(fn)?.shift();
+			if (entry !== void 0 && !require_utils.isPlainDeriveEntry(entry)) (at ??= [])[hooks.length] = entry;
+			hooks.push(fn);
+		}
+	}
+	if (at) return require_utils.occurrenceDeriveEntries(hooks, at);
+}
+function mapBeforeHandle(_hooks, derive, link, mode, report, abortGuard, arm) {
 	const hooks = toArray(_hooks);
 	const modes = deriveModes(hooks, derive);
-	const tail = asyncTail(isAsync);
+	const tail = asyncTail(mode);
 	let code = "";
 	let depth = 0;
 	let needsEs = false;
@@ -207,9 +229,9 @@ function mapBeforeHandle(_hooks, derive, link, isAsync, report, abortGuard, arm)
 			code += `if(${guard}){\n`;
 			depth++;
 		}
-		const t = trace(report, fn);
+		const t = traceChild(report, fn);
 		code += t.begin;
-		code += awaitSite(`bf${at(i)}(c)`, fn, isAsync, "tmp", arm);
+		code += awaitSite(`bf${at(i)}(c)`, fn, mode, "tmp", arm);
 		if (modes?.[i] !== void 0) {
 			needsEs = true;
 			link(require_handler_utils.registerDeriveDisposable, "dsp");
@@ -265,9 +287,9 @@ async function runBeforeHandlePrefixAsync(prefix, context, abort) {
 		}
 	}
 }
-function mapChainHook(_hooks, prefix, isAsync, report, abortGuard, arm) {
+function mapChainHook(_hooks, prefix, mode, report, abortGuard, arm) {
 	const hooks = toArray(_hooks);
-	const tail = asyncTail(isAsync);
+	const tail = asyncTail(mode);
 	let code = "";
 	let depth = 0;
 	for (let i = 0; i < hooks.length; i++) {
@@ -278,25 +300,25 @@ function mapChainHook(_hooks, prefix, isAsync, report, abortGuard, arm) {
 			code += `if(${guard}){\n`;
 			depth++;
 		}
-		const t = trace(report, fn);
+		const t = traceChild(report, fn);
 		code += t.begin;
-		code += awaitSite(`${prefix}${at(i)}(c)`, fn, isAsync, "tmp", arm);
+		code += awaitSite(`${prefix}${at(i)}(c)`, fn, mode, "tmp", arm);
 		code += t.end("tmp");
 		if (tail) code += "}\n";
 	}
 	code += "}".repeat(depth);
-	code += tailPlain(isAsync, `if(tmp!==undefined)_r=c.responseValue=tmp\n`);
+	code += tailPlain(mode, `if(tmp!==undefined)_r=c.responseValue=tmp\n`);
 	return code;
 }
 const mapAfterResponse = /* @__PURE__ */ map((i, fn, [report]) => {
-	const t = trace(report, fn);
+	const t = traceChild(report, fn);
 	const call = require_compile_utils.isAsyncFunction(fn) ? `await ar${at(i)}(c)\n` : `let _ar=ar${at(i)}(c)\nif(typeof _ar?.then==='function')await _ar\n`;
 	return `try{${t.begin}${call}${t.end()}}catch(_e){${t.end("_e")}console.error(_e)}\n`;
 });
-const mapError = /* @__PURE__ */ map((i, fn, [map, link, mapResponse, schedule, sign, isAsync, arm]) => {
+const mapError = /* @__PURE__ */ map((i, fn, [map, link, mapResponse, schedule, sign, mode, arm]) => {
 	link(mapResponse, "rm");
 	link(require_handler_error.adoptErrorType, "aet");
-	return awaitSite(`er${at(i)}(c)`, fn, isAsync, "_r", arm) + "if(_r!==undefined){\nif(_r instanceof Response)c.set.status=_r.status\nelse if(c.set.status===undefined||c.set.status===200)c.set.status=500\n" + schedule + sign + `return _em(c,${map}(aet(_r,e),c.set,c.request,true))\n}\n`;
+	return awaitSite(`er${at(i)}(c)`, fn, mode, "_r", arm) + "if(_r!==undefined){\nif(_r instanceof Response)c.set.status=_r.status\nelse if(c.set.status===undefined||c.set.status===200)c.set.status=500\n" + schedule + sign + `return _em(c,${map}(aet(_r,e),c.set,c.request,true))\n}\n`;
 });
 function map(map) {
 	return function(event, rest, abortGuard, tail) {
@@ -387,16 +409,16 @@ function getQueryParseChannels(querySchema) {
 	return result ?? void 0;
 }
 const asyncTail = (mode) => typeof mode === "object" && mode.async ? mode : void 0;
-function awaitSite(call, fn, isAsync, target, arm = "") {
-	if (typeof isAsync !== "object") return `${target}=${call}\n${awaitGuard(fn, isAsync, target, arm)}`;
-	const k = isAsync.n++;
-	isAsync.sites.push(`${isAsync.e ? "e:" : ""}${target}=${call}`);
-	return isAsync.async ? `${target}=_rk===${k}?_y:${call}\nif(_rk===${k}||typeof ${target}?.then==='function'){${arm ? `;${arm}\n` : ""}${target}=await ${target}}\n` : `${target}=${call}\nif(typeof ${target}?.then==='function')return _t(c,${k},${target},${isAsync.r ? "_r" : "undefined"},${isAsync.e ? "e" : "undefined"}${isAsync.live})\n`;
+function awaitSite(call, fn, mode, target, arm = "") {
+	if (typeof mode !== "object") return `${target}=${call}\n${awaitGuard(fn, mode, target, arm)}`;
+	const k = mode.n++;
+	mode.sites.push(`${mode.e ? "e:" : ""}${target}=${call}`);
+	return mode.async ? `${target}=_rk===${k}?_y:${call}\nif(_rk===${k}||typeof ${target}?.then==='function'){${arm ? `;${arm}\n` : ""}${target}=await ${target}}\n` : `${target}=${call}\nif(typeof ${target}?.then==='function')return _t(c,${k},${target},${mode.r ? "_r" : "undefined"},${mode.e ? "e" : "undefined"}${mode.live})\n`;
 }
 const tailStage = (mode, guard) => `if(_rk<=${mode.n}${guard ? `&&(_rk===${mode.n}||${guard})` : ""}){\n`;
 const tailPlain = (mode, code) => !code || !asyncTail(mode) ? code : mode.n ? `if(_rk<${mode.n}){\n${code}}\n` : "";
-function awaitGuard(fn, isAsync, target, arm = "") {
-	if (!isAsync) return "";
+function awaitGuard(fn, mode, target, arm = "") {
+	if (!mode) return "";
 	const code = `${arm ? `;${arm}\n` : ""}${target}=await ${target}\n`;
 	return require_compile_utils.isAsyncFunction(fn) ? code : `if(typeof ${target}?.then==='function'){${code}}\n`;
 }
@@ -411,6 +433,7 @@ exports.cloneStaticValue = cloneStaticValue;
 exports.deriveModes = deriveModes;
 exports.getQueryParseChannels = getQueryParseChannels;
 exports.hasRequestBody = hasRequestBody;
+exports.joinDeriveEntries = joinDeriveEntries;
 exports.mapAfterResponse = mapAfterResponse;
 exports.mapBeforeHandle = mapBeforeHandle;
 exports.mapChainHook = mapChainHook;

package/dist/compile/handler/utils.mjs

@@ -1,5 +1,6 @@
+// @bun
 import { ElysiaFile } from "../../universal/file.mjs";
-import { assignOwn, deriveEntryFn, isMapDeriveEntry } from "../../utils.mjs";
+import { assignOwn, deriveEntryFn, deriveQueues, isMapDeriveEntry, isPlainDeriveEntry, occurrenceDeriveEntries } from "../../utils.mjs";
 import { ELYSIA_TYPES } from "../../type/constants.mjs";
 import { skipClone } from "../../adapter/skip-clone.mjs";
 import { ElysiaStatus } from "../../error.mjs";
@@ -51,11 +52,11 @@ function armEntryAbort(context) {
 	if (context.request === origin.request) return false;
 	return (context["~sig"] = context.request.signal).aborted;
 }
-const trace = (report, fn) => report?.resolveChild(fn?.name && typeof fn.name === "string" ? fn.name : "anonymous") ?? noTrace;
+const traceChild = (report, fn) => report?.resolveChild(fn?.name && typeof fn.name === "string" ? fn.name : "anonymous") ?? noTrace;
 const toArray = (v) => Array.isArray(v) ? v : [v];
-const mapTransform = /* @__PURE__ */ map((i, fn, [isAsync, report, arm]) => {
-	const t = trace(report, fn);
-	const call = isAsync ? awaitSite(`tf${at(i)}(c)`, fn, isAsync, "_tf", arm) : `tf${at(i)}(c)\n`;
+const mapTransform = /* @__PURE__ */ map((i, fn, [mode, report, arm]) => {
+	const t = traceChild(report, fn);
+	const call = mode ? awaitSite(`tf${at(i)}(c)`, fn, mode, "_tf", arm) : `tf${at(i)}(c)\n`;
 	return t.begin + call + t.end();
 });
 const deriveKeyCache = /* @__PURE__ */ new WeakMap();
@@ -75,8 +76,8 @@ function extractDeriveKeys(fn) {
 function returnedObjectKeys(src) {
 	const tokens = scanTokens(src);
 	if (!tokens) return null;
-	const is = (i, value) => tokens[i]?.k === "p" && tokens[i].value === value;
-	const blank = (i) => {
+	const isPunct = (i, value) => tokens[i]?.k === "p" && tokens[i].value === value;
+	const spaceOnlyAfter = (i) => {
 		const token = tokens[i];
 		return /^[ \t\n\r]*$/.test(src.slice(token.at + token.value.length + (token.k === "s" ? 2 : 0), tokens[i + 1]?.at));
 	};
@@ -91,12 +92,12 @@ function returnedObjectKeys(src) {
 		else if (value === "(" || value === "[" || value === "{") depth++;
 		else if (value === ")" || value === "]" || value === "}") depth--;
 		else if (depth === 0 && value === "=>") {
-			if (!blank(i)) return null;
-			if (is(i + 1, "(")) {
-				if (!blank(i + 1) || !is(i + 2, "{")) return null;
+			if (!spaceOnlyAfter(i)) return null;
+			if (isPunct(i + 1, "(")) {
+				if (!spaceOnlyAfter(i + 1) || !isPunct(i + 2, "{")) return null;
 				open = i + 2;
 				parens = 1;
-			} else if (!is(i + 1, "{")) return null;
+			} else if (!isPunct(i + 1, "{")) return null;
 			break;
 		}
 	}
@@ -111,15 +112,15 @@ function returnedObjectKeys(src) {
 			} else if (value.includes("return") && /[^\w$]/.test(value)) return null;
 		}
 		if (at === -1) return null;
-		for (; blank(at) && is(at + 1, "("); at++) parens++;
-		if (!blank(at) || !is(at + 1, "{")) return null;
+		for (; spaceOnlyAfter(at) && isPunct(at + 1, "("); at++) parens++;
+		if (!spaceOnlyAfter(at) || !isPunct(at + 1, "{")) return null;
 		open = at + 1;
 	}
 	const keys = [];
 	let i = open + 1;
-	while (!is(i, "}")) {
+	while (!isPunct(i, "}")) {
 		const key = tokens[i];
-		if (!key || (key.k === "s" ? key.value.includes("\\") : key.k !== "i" || !/^[\w$]+$/.test(key.value)) || !blank(i) || !is(i + 1, ":")) return null;
+		if (!key || (key.k === "s" ? key.value.includes("\\") : key.k !== "i" || !/^[\w$]+$/.test(key.value)) || !spaceOnlyAfter(i) || !isPunct(i + 1, ":")) return null;
 		keys.push(key.value);
 		for (depth = 0, i += 2;; i++) {
 			const token = tokens[i];
@@ -135,10 +136,10 @@ function returnedObjectKeys(src) {
 				depth--;
 			} else if (value === "," && depth === 0) break;
 		}
-		if (is(i, ",")) i++;
+		if (isPunct(i, ",")) i++;
 	}
-	for (; parens; parens--) if (!is(++i, ")")) return null;
-	return i + 1 === tokens.length || is(i + 1, ";") || is(i + 1, "}") ? keys : null;
+	for (; parens; parens--) if (!isPunct(++i, ")")) return null;
+	return i + 1 === tokens.length || isPunct(i + 1, ";") || isPunct(i + 1, "}") ? keys : null;
 }
 function replaceDeriveContext(context, derivative) {
 	const next = Object.create(Object.getPrototypeOf(context));
@@ -167,34 +168,56 @@ function replaceDeriveContext(context, derivative) {
 	return next;
 }
 function deriveModes(hooks, entries) {
-	let queues;
-	if (entries?.length) {
-		queues = /* @__PURE__ */ new Map();
-		for (let i = 0; i < entries.length; i++) {
-			const entry = entries[i];
-			const fn = deriveEntryFn(entry);
-			const queue = queues.get(fn);
-			const mode = isMapDeriveEntry(entry);
-			if (queue) queue.push(mode);
-			else queues.set(fn, [mode]);
-		}
-	}
+	const queues = deriveQueues(entries);
 	if (!queues) return;
 	let found = false;
 	const modes = Array(hooks.length);
 	for (let i = 0; i < hooks.length; i++) {
-		const fn = hooks[i];
-		const queue = queues.get(fn);
-		if (!queue?.length) continue;
+		const entry = queues.get(hooks[i])?.shift();
+		if (entry === void 0 || isPlainDeriveEntry(entry)) continue;
+		modes[i] = isMapDeriveEntry(entry);
 		found = true;
-		modes[i] = queue.shift();
 	}
 	return found ? modes : void 0;
 }
-function mapBeforeHandle(_hooks, derive, link, isAsync, report, abortGuard, arm) {
+const deriveEntriesOf = (part) => part?.["~deriveEntries"];
+function sharesDerive(part, index, parts) {
+	const entries = deriveEntriesOf(part);
+	if (entries) for (let i = 0; i < parts.length; i++) {
+		const other = parts[i]?.beforeHandle;
+		if (i === index || !other) continue;
+		for (let j = 0; j < entries.length; j++) {
+			const fn = deriveEntryFn(entries[j]);
+			if (Array.isArray(other) ? other.includes(fn) : other === fn) return true;
+		}
+	}
+	return false;
+}
+/**
+* `~deriveEntries` of the `beforeHandle` lists of `parts` joined in order,
+* each occurrence keeping the role its own part gave it; undefined when
+* their own entries joined already do
+*/
+function joinDeriveEntries(parts) {
+	if (!parts.some(sharesDerive)) return;
+	const hooks = [];
+	let at;
+	for (const part of parts) {
+		const value = part?.beforeHandle;
+		if (!value) continue;
+		const queues = deriveQueues(deriveEntriesOf(part));
+		for (const fn of toArray(value)) {
+			const entry = queues?.get(fn)?.shift();
+			if (entry !== void 0 && !isPlainDeriveEntry(entry)) (at ??= [])[hooks.length] = entry;
+			hooks.push(fn);
+		}
+	}
+	if (at) return occurrenceDeriveEntries(hooks, at);
+}
+function mapBeforeHandle(_hooks, derive, link, mode, report, abortGuard, arm) {
 	const hooks = toArray(_hooks);
 	const modes = deriveModes(hooks, derive);
-	const tail = asyncTail(isAsync);
+	const tail = asyncTail(mode);
 	let code = "";
 	let depth = 0;
 	let needsEs = false;
@@ -206,9 +229,9 @@ function mapBeforeHandle(_hooks, derive, link, isAsync, report, abortGuard, arm)
 			code += `if(${guard}){\n`;
 			depth++;
 		}
-		const t = trace(report, fn);
+		const t = traceChild(report, fn);
 		code += t.begin;
-		code += awaitSite(`bf${at(i)}(c)`, fn, isAsync, "tmp", arm);
+		code += awaitSite(`bf${at(i)}(c)`, fn, mode, "tmp", arm);
 		if (modes?.[i] !== void 0) {
 			needsEs = true;
 			link(registerDeriveDisposable, "dsp");
@@ -264,9 +287,9 @@ async function runBeforeHandlePrefixAsync(prefix, context, abort) {
 		}
 	}
 }
-function mapChainHook(_hooks, prefix, isAsync, report, abortGuard, arm) {
+function mapChainHook(_hooks, prefix, mode, report, abortGuard, arm) {
 	const hooks = toArray(_hooks);
-	const tail = asyncTail(isAsync);
+	const tail = asyncTail(mode);
 	let code = "";
 	let depth = 0;
 	for (let i = 0; i < hooks.length; i++) {
@@ -277,25 +300,25 @@ function mapChainHook(_hooks, prefix, isAsync, report, abortGuard, arm) {
 			code += `if(${guard}){\n`;
 			depth++;
 		}
-		const t = trace(report, fn);
+		const t = traceChild(report, fn);
 		code += t.begin;
-		code += awaitSite(`${prefix}${at(i)}(c)`, fn, isAsync, "tmp", arm);
+		code += awaitSite(`${prefix}${at(i)}(c)`, fn, mode, "tmp", arm);
 		code += t.end("tmp");
 		if (tail) code += "}\n";
 	}
 	code += "}".repeat(depth);
-	code += tailPlain(isAsync, `if(tmp!==undefined)_r=c.responseValue=tmp\n`);
+	code += tailPlain(mode, `if(tmp!==undefined)_r=c.responseValue=tmp\n`);
 	return code;
 }
 const mapAfterResponse = /* @__PURE__ */ map((i, fn, [report]) => {
-	const t = trace(report, fn);
+	const t = traceChild(report, fn);
 	const call = isAsyncFunction(fn) ? `await ar${at(i)}(c)\n` : `let _ar=ar${at(i)}(c)\nif(typeof _ar?.then==='function')await _ar\n`;
 	return `try{${t.begin}${call}${t.end()}}catch(_e){${t.end("_e")}console.error(_e)}\n`;
 });
-const mapError = /* @__PURE__ */ map((i, fn, [map, link, mapResponse, schedule, sign, isAsync, arm]) => {
+const mapError = /* @__PURE__ */ map((i, fn, [map, link, mapResponse, schedule, sign, mode, arm]) => {
 	link(mapResponse, "rm");
 	link(adoptErrorType, "aet");
-	return awaitSite(`er${at(i)}(c)`, fn, isAsync, "_r", arm) + "if(_r!==undefined){\nif(_r instanceof Response)c.set.status=_r.status\nelse if(c.set.status===undefined||c.set.status===200)c.set.status=500\n" + schedule + sign + `return _em(c,${map}(aet(_r,e),c.set,c.request,true))\n}\n`;
+	return awaitSite(`er${at(i)}(c)`, fn, mode, "_r", arm) + "if(_r!==undefined){\nif(_r instanceof Response)c.set.status=_r.status\nelse if(c.set.status===undefined||c.set.status===200)c.set.status=500\n" + schedule + sign + `return _em(c,${map}(aet(_r,e),c.set,c.request,true))\n}\n`;
 });
 function map(map) {
 	return function(event, rest, abortGuard, tail) {
@@ -386,19 +409,19 @@ function getQueryParseChannels(querySchema) {
 	return result ?? void 0;
 }
 const asyncTail = (mode) => typeof mode === "object" && mode.async ? mode : void 0;
-function awaitSite(call, fn, isAsync, target, arm = "") {
-	if (typeof isAsync !== "object") return `${target}=${call}\n${awaitGuard(fn, isAsync, target, arm)}`;
-	const k = isAsync.n++;
-	isAsync.sites.push(`${isAsync.e ? "e:" : ""}${target}=${call}`);
-	return isAsync.async ? `${target}=_rk===${k}?_y:${call}\nif(_rk===${k}||typeof ${target}?.then==='function'){${arm ? `;${arm}\n` : ""}${target}=await ${target}}\n` : `${target}=${call}\nif(typeof ${target}?.then==='function')return _t(c,${k},${target},${isAsync.r ? "_r" : "undefined"},${isAsync.e ? "e" : "undefined"}${isAsync.live})\n`;
+function awaitSite(call, fn, mode, target, arm = "") {
+	if (typeof mode !== "object") return `${target}=${call}\n${awaitGuard(fn, mode, target, arm)}`;
+	const k = mode.n++;
+	mode.sites.push(`${mode.e ? "e:" : ""}${target}=${call}`);
+	return mode.async ? `${target}=_rk===${k}?_y:${call}\nif(_rk===${k}||typeof ${target}?.then==='function'){${arm ? `;${arm}\n` : ""}${target}=await ${target}}\n` : `${target}=${call}\nif(typeof ${target}?.then==='function')return _t(c,${k},${target},${mode.r ? "_r" : "undefined"},${mode.e ? "e" : "undefined"}${mode.live})\n`;
 }
 const tailStage = (mode, guard) => `if(_rk<=${mode.n}${guard ? `&&(_rk===${mode.n}||${guard})` : ""}){\n`;
 const tailPlain = (mode, code) => !code || !asyncTail(mode) ? code : mode.n ? `if(_rk<${mode.n}){\n${code}}\n` : "";
-function awaitGuard(fn, isAsync, target, arm = "") {
-	if (!isAsync) return "";
+function awaitGuard(fn, mode, target, arm = "") {
+	if (!mode) return "";
 	const code = `${arm ? `;${arm}\n` : ""}${target}=await ${target}\n`;
 	return isAsyncFunction(fn) ? code : `if(typeof ${target}?.then==='function'){${code}}\n`;
 }
 
 //#endregion
-export { armEntryAbort, asyncTail, awaitGuard, awaitSite, cloneResponse, cloneStaticValue, deriveModes, getQueryParseChannels, hasRequestBody, mapAfterResponse, mapBeforeHandle, mapChainHook, mapError, mapTransform, replaceDeriveContext, runBeforeHandlePrefix, runBeforeHandlePrefixAsync, tailPlain, tailStage };
+export { armEntryAbort, asyncTail, awaitGuard, awaitSite, cloneResponse, cloneStaticValue, deriveModes, getQueryParseChannels, hasRequestBody, joinDeriveEntries, mapAfterResponse, mapBeforeHandle, mapChainHook, mapError, mapTransform, replaceDeriveContext, runBeforeHandlePrefix, runBeforeHandlePrefixAsync, tailPlain, tailStage };

package/dist/compile/jit-probe.mjs

@@ -1,3 +1,4 @@
+// @bun
 //#region src/compile/jit-probe.ts
 let armed = false;
 const reasons = /* @__PURE__ */ new Set();

package/dist/compile/lexer.js

@@ -61,7 +61,7 @@ const prefixKeywords = new Set([
 const isSpace = (char) => char === 32 || char >= 9 && char <= 13 || char >= 128 && /\s/.test(String.fromCharCode(char));
 const isIdentifierStart = (char) => char >= 65 && char <= 90 || char >= 97 && char <= 122 || char === 36 || char === 95 || char >= 128 && !isSpace(char);
 const isIdentifierPart = (char) => isIdentifierStart(char) || char >= 48 && char <= 57;
-function isHeader(tokens) {
+function opensControlHeader(tokens) {
 	let keyword = tokens.length - 1;
 	if (keyword > 0 && tokens[keyword].value === "await" && tokens[keyword - 1].value === "for") keyword--;
 	if (keyword < 0) return false;
@@ -75,7 +75,7 @@ function scanTokens(source) {
 	const tokens = [];
 	let index = 0;
 	let canEndExpression = false;
-	const headers = [];
+	const headerParens = [];
 	const skipUnicodeEscape = () => {
 		index += 2;
 		if (source.charCodeAt(index) === 123) {
@@ -296,14 +296,14 @@ function scanTokens(source) {
 			const triple = source.slice(index, index + 3);
 			if (triple === "...") value = triple;
 			else if (pair === "?." || pair === "=>" || pair === "++" || pair === "--") value = pair;
-			if (value === "(") headers.push(isHeader(tokens));
+			if (value === "(") headerParens.push(opensControlHeader(tokens));
 			tokens.push({
 				k: "p",
 				value,
 				at: index
 			});
 			index += value.length;
-			if (value !== "++" && value !== "--") canEndExpression = value === ")" && !headers.pop() || value === "]" || value === "}";
+			if (value !== "++" && value !== "--") canEndExpression = value === ")" && !headerParens.pop() || value === "]" || value === "}";
 		}
 		return !templateExpression;
 	};

package/dist/compile/lexer.mjs

@@ -1,3 +1,4 @@
+// @bun
 //#region src/compile/lexer.ts
 function skipString(src, start) {
 	const quote = src[start];
@@ -59,7 +60,7 @@ const prefixKeywords = new Set([
 const isSpace = (char) => char === 32 || char >= 9 && char <= 13 || char >= 128 && /\s/.test(String.fromCharCode(char));
 const isIdentifierStart = (char) => char >= 65 && char <= 90 || char >= 97 && char <= 122 || char === 36 || char === 95 || char >= 128 && !isSpace(char);
 const isIdentifierPart = (char) => isIdentifierStart(char) || char >= 48 && char <= 57;
-function isHeader(tokens) {
+function opensControlHeader(tokens) {
 	let keyword = tokens.length - 1;
 	if (keyword > 0 && tokens[keyword].value === "await" && tokens[keyword - 1].value === "for") keyword--;
 	if (keyword < 0) return false;
@@ -73,7 +74,7 @@ function scanTokens(source) {
 	const tokens = [];
 	let index = 0;
 	let canEndExpression = false;
-	const headers = [];
+	const headerParens = [];
 	const skipUnicodeEscape = () => {
 		index += 2;
 		if (source.charCodeAt(index) === 123) {
@@ -294,14 +295,14 @@ function scanTokens(source) {
 			const triple = source.slice(index, index + 3);
 			if (triple === "...") value = triple;
 			else if (pair === "?." || pair === "=>" || pair === "++" || pair === "--") value = pair;
-			if (value === "(") headers.push(isHeader(tokens));
+			if (value === "(") headerParens.push(opensControlHeader(tokens));
 			tokens.push({
 				k: "p",
 				value,
 				at: index
 			});
 			index += value.length;
-			if (value !== "++" && value !== "--") canEndExpression = value === ")" && !headers.pop() || value === "]" || value === "}";
+			if (value !== "++" && value !== "--") canEndExpression = value === ")" && !headerParens.pop() || value === "]" || value === "}";
 		}
 		return !templateExpression;
 	};