elysia 2.0.0-beta.13 → 2.0.0-beta.15

package/dist/compile/handler/utils.js

@@ -10,7 +10,6 @@ const require_adapter_origin = require('../../adapter/origin.js');
 const require_compile_lexer = require('../lexer.js');
 
 //#region src/compile/handler/utils.ts
-const childName = (fn) => fn?.name && typeof fn.name === "string" ? fn.name : "anonymous";
 const noTrace = {
 	begin: "",
 	end: () => ""
@@ -51,7 +50,7 @@ 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(childName(fn)) ?? noTrace;
+const trace = (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);
@@ -62,7 +61,20 @@ const deriveKeyCache = /* @__PURE__ */ new WeakMap();
 function extractDeriveKeys(fn) {
 	const cached = deriveKeyCache.get(fn);
 	if (cached !== void 0) return cached;
-	const result = scanDeriveKeys(fn);
+	let src;
+	try {
+		src = Function.prototype.toString.call(fn);
+	} catch {
+		src = void 0;
+	}
+	let result;
+	if (src === void 0) result = null;
+	else if (src.includes("[native code]")) result = null;
+	else if (src.includes("...")) result = null;
+	else {
+		const objStart = findReturnedObjectStart(src);
+		result = objStart === -1 ? null : scanObjectLiteralKeys(src, objStart);
+	}
 	deriveKeyCache.set(fn, result);
 	return result;
 }
@@ -72,6 +84,7 @@ function replaceDeriveContext(context, derivative) {
 	next.request = context.request;
 	next["~sig"] = context["~sig"];
 	next["~afterResponse"] = context["~afterResponse"];
+	next["~dispose"] = context["~dispose"];
 	next.store = context.store;
 	next.set = context.set;
 	next.body = context.body;
@@ -91,21 +104,19 @@ function replaceDeriveContext(context, derivative) {
 	next.redirect = context.redirect;
 	return next;
 }
-function deriveModeQueues(entries) {
-	if (!entries?.length) return;
-	const 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]);
-	}
-	return queues;
-}
 function deriveModes(hooks, entries) {
-	const queues = deriveModeQueues(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]);
+		}
+	}
 	if (!queues) return;
 	let found = false;
 	const modes = Array(hooks.length);
@@ -118,44 +129,8 @@ function deriveModes(hooks, entries) {
 	}
 	return found ? modes : void 0;
 }
-function scanDeriveKeys(fn) {
-	let src;
-	try {
-		src = Function.prototype.toString.call(fn);
-	} catch {
-		return null;
-	}
-	if (src.includes("[native code]")) return null;
-	if (src.includes("...")) return null;
-	const objStart = findReturnedObjectStart(src);
-	if (objStart === -1) return null;
-	return scanObjectLiteralKeys(src, objStart);
-}
 function findReturnedObjectStart(src) {
-	const arrow = topLevelArrowIndex(src);
-	if (arrow !== -1) {
-		let i = arrow + 2;
-		while (i < src.length && require_compile_lexer.isSpace(src[i])) i++;
-		if (src[i] === "(") {
-			let j = i + 1;
-			while (j < src.length && require_compile_lexer.isSpace(src[j])) j++;
-			if (src[j] === "{") return j;
-			return -1;
-		}
-		if (src[i] !== "{") return -1;
-	}
-	const { count: returns, firstIndex: idx } = scanReturns(src);
-	if (returns !== 1) return -1;
-	if (idx === -1) return -1;
-	let i = idx + 6;
-	while (i < src.length && require_compile_lexer.isSpace(src[i])) i++;
-	while (i < src.length && src[i] === "(") {
-		i++;
-		while (i < src.length && require_compile_lexer.isSpace(src[i])) i++;
-	}
-	return src[i] === "{" ? i : -1;
-}
-function topLevelArrowIndex(src) {
+	let arrow = -1;
 	let depth = 0;
 	for (let i = 0; i < src.length;) {
 		const ch = src[i];
@@ -165,17 +140,17 @@ function topLevelArrowIndex(src) {
 		}
 		if (ch === "/" && src[i + 1] === "/") {
 			const nl = src.indexOf("\n", i);
-			if (nl === -1) return -1;
+			if (nl === -1) break;
 			i = nl + 1;
 			continue;
 		}
 		if (ch === "/" && src[i + 1] === "*") {
 			const end = src.indexOf("*/", i);
-			if (end === -1) return -1;
+			if (end === -1) break;
 			i = end + 2;
 			continue;
 		}
-		if (depth === 0 && ch === "f" && src.startsWith("function", i) && !require_compile_lexer.isIdentChar(src[i - 1] ?? " ") && !require_compile_lexer.isIdentChar(src[i + 8] ?? " ")) return -1;
+		if (depth === 0 && ch === "f" && src.startsWith("function", i) && !require_compile_lexer.isIdentChar(src[i - 1] ?? " ") && !require_compile_lexer.isIdentChar(src[i + 8] ?? " ")) break;
 		if (ch === "(" || ch === "[" || ch === "{") {
 			depth++;
 			i++;
@@ -186,14 +161,25 @@ function topLevelArrowIndex(src) {
 			i++;
 			continue;
 		}
-		if (depth === 0 && ch === "=" && src[i + 1] === ">") return i;
+		if (depth === 0 && ch === "=" && src[i + 1] === ">") {
+			arrow = i;
+			break;
+		}
 		i++;
 	}
-	return -1;
-}
-function scanReturns(src) {
-	let count = 0;
-	let firstIndex = -1;
+	if (arrow !== -1) {
+		let i = arrow + 2;
+		while (i < src.length && require_compile_lexer.isSpace(src[i])) i++;
+		if (src[i] === "(") {
+			let j = i + 1;
+			while (j < src.length && require_compile_lexer.isSpace(src[j])) j++;
+			if (src[j] === "{") return j;
+			return -1;
+		}
+		if (src[i] !== "{") return -1;
+	}
+	let returns = 0;
+	let idx = -1;
 	for (let i = 0; i < src.length;) {
 		const ch = src[i];
 		if (ch === "\"" || ch === "'" || ch === "`") {
@@ -213,17 +199,22 @@ function scanReturns(src) {
 			continue;
 		}
 		if (ch === "r" && src.startsWith("return", i) && !require_compile_lexer.isIdentChar(src[i - 1] ?? " ") && !require_compile_lexer.isIdentChar(src[i + 6] ?? " ")) {
-			if (firstIndex === -1) firstIndex = i;
-			count++;
+			if (idx === -1) idx = i;
+			returns++;
 			i += 6;
 			continue;
 		}
 		i++;
 	}
-	return {
-		count,
-		firstIndex
-	};
+	if (returns !== 1) return -1;
+	if (idx === -1) return -1;
+	let i = idx + 6;
+	while (i < src.length && require_compile_lexer.isSpace(src[i])) i++;
+	while (i < src.length && src[i] === "(") {
+		i++;
+		while (i < src.length && require_compile_lexer.isSpace(src[i])) i++;
+	}
+	return src[i] === "{" ? i : -1;
 }
 function scanObjectLiteralKeys(src, open) {
 	const keys = [];
@@ -266,7 +257,56 @@ function scanObjectLiteralKeys(src, open) {
 			if (src[j] !== ":") return null;
 			keys.push(key);
 			i = j + 1;
-			i = skipValue(src, i);
+			let depth = 0;
+			let found = false;
+			while (i < src.length) {
+				const ch = src[i];
+				if (ch === "\"" || ch === "'" || ch === "`") {
+					i = require_compile_lexer.skipString(src, i);
+					continue;
+				}
+				if (ch === "/" && src[i + 1] === "/") {
+					const nl = src.indexOf("\n", i);
+					if (nl === -1) {
+						i = -1;
+						found = true;
+						break;
+					}
+					i = nl + 1;
+					continue;
+				}
+				if (ch === "/" && src[i + 1] === "*") {
+					const end = src.indexOf("*/", i);
+					if (end === -1) {
+						i = -1;
+						found = true;
+						break;
+					}
+					i = end + 2;
+					continue;
+				}
+				if (ch === "{" || ch === "(" || ch === "[") {
+					depth++;
+					i++;
+					continue;
+				}
+				if (ch === "}" || ch === ")" || ch === "]") {
+					if (depth === 0) {
+						if (ch !== "}") i = -1;
+						found = true;
+						break;
+					}
+					depth--;
+					i++;
+					continue;
+				}
+				if (ch === "," && depth === 0) {
+					found = true;
+					break;
+				}
+				i++;
+			}
+			if (!found) i = -1;
 			if (i === -1) return null;
 			expectKey = false;
 			continue;
@@ -280,45 +320,6 @@ function scanObjectLiteralKeys(src, open) {
 	}
 	return null;
 }
-function skipValue(src, i) {
-	let depth = 0;
-	while (i < src.length) {
-		const ch = src[i];
-		if (ch === "\"" || ch === "'" || ch === "`") {
-			i = require_compile_lexer.skipString(src, i);
-			continue;
-		}
-		if (ch === "/" && src[i + 1] === "/") {
-			const nl = src.indexOf("\n", i);
-			if (nl === -1) return -1;
-			i = nl + 1;
-			continue;
-		}
-		if (ch === "/" && src[i + 1] === "*") {
-			const end = src.indexOf("*/", i);
-			if (end === -1) return -1;
-			i = end + 2;
-			continue;
-		}
-		if (ch === "{" || ch === "(" || ch === "[") {
-			depth++;
-			i++;
-			continue;
-		}
-		if (ch === "}" || ch === ")" || ch === "]") {
-			if (depth === 0) {
-				if (ch === "}") return i;
-				return -1;
-			}
-			depth--;
-			i++;
-			continue;
-		}
-		if (ch === "," && depth === 0) return i;
-		i++;
-	}
-	return -1;
-}
 function mapBeforeHandle(_hooks, derive, link, isAsync, report, abortGuard, arm) {
 	const hooks = toArray(_hooks);
 	const modes = deriveModes(hooks, derive);
@@ -337,12 +338,13 @@ function mapBeforeHandle(_hooks, derive, link, isAsync, report, abortGuard, arm)
 		code += awaitGuard(fn, isAsync, "tmp", arm);
 		if (modes?.[i] !== void 0) {
 			needsEs = true;
+			link(require_handler_utils.registerDeriveDisposable, "dsp");
 			if (modes[i]) {
 				link(replaceDeriveContext, "rdc");
-				code += "if(tmp instanceof es)_r=tmp\nelse if(tmp){if(typeof tmp==='object'||typeof tmp==='function')c=rdc(c,tmp);tmp=undefined}\n";
+				code += "if(tmp instanceof es)_r=tmp\nelse if(tmp){if(typeof tmp==='object'||typeof tmp==='function'){const _pc=c;c=rdc(c,tmp);for(const _k of Object.keys(tmp))dsp(c,c[_k],_pc)}tmp=undefined}\n";
 			} else {
 				const keys = extractDeriveKeys(fn);
-				const merge = keys && keys.length && !keys.includes("__proto__") ? keys.map((k) => `c[${JSON.stringify(k)}]=tmp[${JSON.stringify(k)}]`).join(";") : "Object.hasOwn(tmp,'__proto__')?Object.defineProperties(c,Object.getOwnPropertyDescriptors(tmp)):Object.assign(c,tmp)";
+				const merge = !!keys && !!keys.length && !keys.includes("__proto__") ? keys.map((k) => `_v=tmp[${JSON.stringify(k)}];dsp(c,_v);c[${JSON.stringify(k)}]=_v`).join(";") : "if(Object.hasOwn(tmp,'__proto__')){for(const _k of Object.keys(tmp))dsp(c,tmp[_k]);Object.defineProperties(c,Object.getOwnPropertyDescriptors(tmp))}else{_v=Object.assign({},tmp);for(const _k of Reflect.ownKeys(_v)){dsp(c,_v[_k]);c[_k]=_v[_k]}}";
 				code += `if(tmp instanceof es)_r=tmp
 else if(tmp){${merge};tmp=undefined}\n`;
 			}
@@ -515,6 +517,7 @@ exports.awaitGuard = awaitGuard;
 exports.cloneResponse = cloneResponse;
 exports.cloneStaticValue = cloneStaticValue;
 exports.deriveModes = deriveModes;
+exports.drainDisposables = require_handler_utils.drainDisposables;
 exports.emptyResponse = require_handler_utils.emptyResponse;
 exports.getQueryParseChannels = getQueryParseChannels;
 exports.hasRequestBody = hasRequestBody;
@@ -524,6 +527,7 @@ exports.mapBeforeHandle = mapBeforeHandle;
 exports.mapError = mapError;
 exports.mapMapResponse = mapMapResponse;
 exports.mapTransform = mapTransform;
+exports.registerDeriveDisposable = require_handler_utils.registerDeriveDisposable;
 exports.replaceDeriveContext = replaceDeriveContext;
 exports.runBeforeHandlePrefix = runBeforeHandlePrefix;
 exports.runBeforeHandlePrefixAsync = runBeforeHandlePrefixAsync;

package/dist/compile/handler/utils.mjs

@@ -3,13 +3,12 @@ import { ELYSIA_TYPES } from "../../type/constants.mjs";
 import { skipClone } from "../../adapter/skip-clone.mjs";
 import { ElysiaStatus } from "../../error.mjs";
 import { isAsyncFunction } from "../utils.mjs";
-import { emptyResponse } from "../../handler/utils.mjs";
+import { drainDisposables, emptyResponse, registerDeriveDisposable } from "../../handler/utils.mjs";
 import { adoptErrorType } from "../../handler/error.mjs";
 import { origin } from "../../adapter/origin.mjs";
 import { isIdentChar, isSpace, skipString } from "../lexer.mjs";
 
 //#region src/compile/handler/utils.ts
-const childName = (fn) => fn?.name && typeof fn.name === "string" ? fn.name : "anonymous";
 const noTrace = {
 	begin: "",
 	end: () => ""
@@ -50,7 +49,7 @@ function armEntryAbort(context) {
 	if (context.request === origin.request) return false;
 	return (context["~sig"] = context.request.signal).aborted;
 }
-const trace = (report, fn) => report?.resolveChild(childName(fn)) ?? noTrace;
+const trace = (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);
@@ -61,7 +60,20 @@ const deriveKeyCache = /* @__PURE__ */ new WeakMap();
 function extractDeriveKeys(fn) {
 	const cached = deriveKeyCache.get(fn);
 	if (cached !== void 0) return cached;
-	const result = scanDeriveKeys(fn);
+	let src;
+	try {
+		src = Function.prototype.toString.call(fn);
+	} catch {
+		src = void 0;
+	}
+	let result;
+	if (src === void 0) result = null;
+	else if (src.includes("[native code]")) result = null;
+	else if (src.includes("...")) result = null;
+	else {
+		const objStart = findReturnedObjectStart(src);
+		result = objStart === -1 ? null : scanObjectLiteralKeys(src, objStart);
+	}
 	deriveKeyCache.set(fn, result);
 	return result;
 }
@@ -71,6 +83,7 @@ function replaceDeriveContext(context, derivative) {
 	next.request = context.request;
 	next["~sig"] = context["~sig"];
 	next["~afterResponse"] = context["~afterResponse"];
+	next["~dispose"] = context["~dispose"];
 	next.store = context.store;
 	next.set = context.set;
 	next.body = context.body;
@@ -90,21 +103,19 @@ function replaceDeriveContext(context, derivative) {
 	next.redirect = context.redirect;
 	return next;
 }
-function deriveModeQueues(entries) {
-	if (!entries?.length) return;
-	const 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]);
-	}
-	return queues;
-}
 function deriveModes(hooks, entries) {
-	const queues = deriveModeQueues(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]);
+		}
+	}
 	if (!queues) return;
 	let found = false;
 	const modes = Array(hooks.length);
@@ -117,44 +128,8 @@ function deriveModes(hooks, entries) {
 	}
 	return found ? modes : void 0;
 }
-function scanDeriveKeys(fn) {
-	let src;
-	try {
-		src = Function.prototype.toString.call(fn);
-	} catch {
-		return null;
-	}
-	if (src.includes("[native code]")) return null;
-	if (src.includes("...")) return null;
-	const objStart = findReturnedObjectStart(src);
-	if (objStart === -1) return null;
-	return scanObjectLiteralKeys(src, objStart);
-}
 function findReturnedObjectStart(src) {
-	const arrow = topLevelArrowIndex(src);
-	if (arrow !== -1) {
-		let i = arrow + 2;
-		while (i < src.length && isSpace(src[i])) i++;
-		if (src[i] === "(") {
-			let j = i + 1;
-			while (j < src.length && isSpace(src[j])) j++;
-			if (src[j] === "{") return j;
-			return -1;
-		}
-		if (src[i] !== "{") return -1;
-	}
-	const { count: returns, firstIndex: idx } = scanReturns(src);
-	if (returns !== 1) return -1;
-	if (idx === -1) return -1;
-	let i = idx + 6;
-	while (i < src.length && isSpace(src[i])) i++;
-	while (i < src.length && src[i] === "(") {
-		i++;
-		while (i < src.length && isSpace(src[i])) i++;
-	}
-	return src[i] === "{" ? i : -1;
-}
-function topLevelArrowIndex(src) {
+	let arrow = -1;
 	let depth = 0;
 	for (let i = 0; i < src.length;) {
 		const ch = src[i];
@@ -164,17 +139,17 @@ function topLevelArrowIndex(src) {
 		}
 		if (ch === "/" && src[i + 1] === "/") {
 			const nl = src.indexOf("\n", i);
-			if (nl === -1) return -1;
+			if (nl === -1) break;
 			i = nl + 1;
 			continue;
 		}
 		if (ch === "/" && src[i + 1] === "*") {
 			const end = src.indexOf("*/", i);
-			if (end === -1) return -1;
+			if (end === -1) break;
 			i = end + 2;
 			continue;
 		}
-		if (depth === 0 && ch === "f" && src.startsWith("function", i) && !isIdentChar(src[i - 1] ?? " ") && !isIdentChar(src[i + 8] ?? " ")) return -1;
+		if (depth === 0 && ch === "f" && src.startsWith("function", i) && !isIdentChar(src[i - 1] ?? " ") && !isIdentChar(src[i + 8] ?? " ")) break;
 		if (ch === "(" || ch === "[" || ch === "{") {
 			depth++;
 			i++;
@@ -185,14 +160,25 @@ function topLevelArrowIndex(src) {
 			i++;
 			continue;
 		}
-		if (depth === 0 && ch === "=" && src[i + 1] === ">") return i;
+		if (depth === 0 && ch === "=" && src[i + 1] === ">") {
+			arrow = i;
+			break;
+		}
 		i++;
 	}
-	return -1;
-}
-function scanReturns(src) {
-	let count = 0;
-	let firstIndex = -1;
+	if (arrow !== -1) {
+		let i = arrow + 2;
+		while (i < src.length && isSpace(src[i])) i++;
+		if (src[i] === "(") {
+			let j = i + 1;
+			while (j < src.length && isSpace(src[j])) j++;
+			if (src[j] === "{") return j;
+			return -1;
+		}
+		if (src[i] !== "{") return -1;
+	}
+	let returns = 0;
+	let idx = -1;
 	for (let i = 0; i < src.length;) {
 		const ch = src[i];
 		if (ch === "\"" || ch === "'" || ch === "`") {
@@ -212,17 +198,22 @@ function scanReturns(src) {
 			continue;
 		}
 		if (ch === "r" && src.startsWith("return", i) && !isIdentChar(src[i - 1] ?? " ") && !isIdentChar(src[i + 6] ?? " ")) {
-			if (firstIndex === -1) firstIndex = i;
-			count++;
+			if (idx === -1) idx = i;
+			returns++;
 			i += 6;
 			continue;
 		}
 		i++;
 	}
-	return {
-		count,
-		firstIndex
-	};
+	if (returns !== 1) return -1;
+	if (idx === -1) return -1;
+	let i = idx + 6;
+	while (i < src.length && isSpace(src[i])) i++;
+	while (i < src.length && src[i] === "(") {
+		i++;
+		while (i < src.length && isSpace(src[i])) i++;
+	}
+	return src[i] === "{" ? i : -1;
 }
 function scanObjectLiteralKeys(src, open) {
 	const keys = [];
@@ -265,7 +256,56 @@ function scanObjectLiteralKeys(src, open) {
 			if (src[j] !== ":") return null;
 			keys.push(key);
 			i = j + 1;
-			i = skipValue(src, i);
+			let depth = 0;
+			let found = false;
+			while (i < src.length) {
+				const ch = src[i];
+				if (ch === "\"" || ch === "'" || ch === "`") {
+					i = skipString(src, i);
+					continue;
+				}
+				if (ch === "/" && src[i + 1] === "/") {
+					const nl = src.indexOf("\n", i);
+					if (nl === -1) {
+						i = -1;
+						found = true;
+						break;
+					}
+					i = nl + 1;
+					continue;
+				}
+				if (ch === "/" && src[i + 1] === "*") {
+					const end = src.indexOf("*/", i);
+					if (end === -1) {
+						i = -1;
+						found = true;
+						break;
+					}
+					i = end + 2;
+					continue;
+				}
+				if (ch === "{" || ch === "(" || ch === "[") {
+					depth++;
+					i++;
+					continue;
+				}
+				if (ch === "}" || ch === ")" || ch === "]") {
+					if (depth === 0) {
+						if (ch !== "}") i = -1;
+						found = true;
+						break;
+					}
+					depth--;
+					i++;
+					continue;
+				}
+				if (ch === "," && depth === 0) {
+					found = true;
+					break;
+				}
+				i++;
+			}
+			if (!found) i = -1;
 			if (i === -1) return null;
 			expectKey = false;
 			continue;
@@ -279,45 +319,6 @@ function scanObjectLiteralKeys(src, open) {
 	}
 	return null;
 }
-function skipValue(src, i) {
-	let depth = 0;
-	while (i < src.length) {
-		const ch = src[i];
-		if (ch === "\"" || ch === "'" || ch === "`") {
-			i = skipString(src, i);
-			continue;
-		}
-		if (ch === "/" && src[i + 1] === "/") {
-			const nl = src.indexOf("\n", i);
-			if (nl === -1) return -1;
-			i = nl + 1;
-			continue;
-		}
-		if (ch === "/" && src[i + 1] === "*") {
-			const end = src.indexOf("*/", i);
-			if (end === -1) return -1;
-			i = end + 2;
-			continue;
-		}
-		if (ch === "{" || ch === "(" || ch === "[") {
-			depth++;
-			i++;
-			continue;
-		}
-		if (ch === "}" || ch === ")" || ch === "]") {
-			if (depth === 0) {
-				if (ch === "}") return i;
-				return -1;
-			}
-			depth--;
-			i++;
-			continue;
-		}
-		if (ch === "," && depth === 0) return i;
-		i++;
-	}
-	return -1;
-}
 function mapBeforeHandle(_hooks, derive, link, isAsync, report, abortGuard, arm) {
 	const hooks = toArray(_hooks);
 	const modes = deriveModes(hooks, derive);
@@ -336,12 +337,13 @@ function mapBeforeHandle(_hooks, derive, link, isAsync, report, abortGuard, arm)
 		code += awaitGuard(fn, isAsync, "tmp", arm);
 		if (modes?.[i] !== void 0) {
 			needsEs = true;
+			link(registerDeriveDisposable, "dsp");
 			if (modes[i]) {
 				link(replaceDeriveContext, "rdc");
-				code += "if(tmp instanceof es)_r=tmp\nelse if(tmp){if(typeof tmp==='object'||typeof tmp==='function')c=rdc(c,tmp);tmp=undefined}\n";
+				code += "if(tmp instanceof es)_r=tmp\nelse if(tmp){if(typeof tmp==='object'||typeof tmp==='function'){const _pc=c;c=rdc(c,tmp);for(const _k of Object.keys(tmp))dsp(c,c[_k],_pc)}tmp=undefined}\n";
 			} else {
 				const keys = extractDeriveKeys(fn);
-				const merge = keys && keys.length && !keys.includes("__proto__") ? keys.map((k) => `c[${JSON.stringify(k)}]=tmp[${JSON.stringify(k)}]`).join(";") : "Object.hasOwn(tmp,'__proto__')?Object.defineProperties(c,Object.getOwnPropertyDescriptors(tmp)):Object.assign(c,tmp)";
+				const merge = !!keys && !!keys.length && !keys.includes("__proto__") ? keys.map((k) => `_v=tmp[${JSON.stringify(k)}];dsp(c,_v);c[${JSON.stringify(k)}]=_v`).join(";") : "if(Object.hasOwn(tmp,'__proto__')){for(const _k of Object.keys(tmp))dsp(c,tmp[_k]);Object.defineProperties(c,Object.getOwnPropertyDescriptors(tmp))}else{_v=Object.assign({},tmp);for(const _k of Reflect.ownKeys(_v)){dsp(c,_v[_k]);c[_k]=_v[_k]}}";
 				code += `if(tmp instanceof es)_r=tmp
 else if(tmp){${merge};tmp=undefined}\n`;
 			}
@@ -509,4 +511,4 @@ function awaitGuard(fn, isAsync, target, arm = "") {
 }
 
 //#endregion
-export { armEntryAbort, awaitGuard, cloneResponse, cloneStaticValue, deriveModes, emptyResponse, getQueryParseChannels, hasRequestBody, mapAfterHandle, mapAfterResponse, mapBeforeHandle, mapError, mapMapResponse, mapTransform, replaceDeriveContext, runBeforeHandlePrefix, runBeforeHandlePrefixAsync };
+export { armEntryAbort, awaitGuard, cloneResponse, cloneStaticValue, deriveModes, drainDisposables, emptyResponse, getQueryParseChannels, hasRequestBody, mapAfterHandle, mapAfterResponse, mapBeforeHandle, mapError, mapMapResponse, mapTransform, registerDeriveDisposable, replaceDeriveContext, runBeforeHandlePrefix, runBeforeHandlePrefixAsync };