elysia 2.0.0-beta.11 → 2.0.0-beta.13

package/dist/compile/handler/utils.js

@@ -25,7 +25,9 @@ function cloneResponse(r) {
 }
 function cloneStaticValue(value) {
 	try {
-		return structuredClone(value);
+		const cloned = structuredClone(value);
+		if (Object.getPrototypeOf(value) === require_error.ElysiaStatus.prototype) Object.setPrototypeOf(cloned, require_error.ElysiaStatus.prototype);
+		return cloned;
 	} catch {
 		return value;
 	}
@@ -51,10 +53,9 @@ function armEntryAbort(context) {
 }
 const trace = (report, fn) => report?.resolveChild(childName(fn)) ?? noTrace;
 const toArray = (v) => Array.isArray(v) ? v : [v];
-const mapTransform = /* @__PURE__ */ map((i, fn, [isAsync, report]) => {
+const mapTransform = /* @__PURE__ */ map((i, fn, [isAsync, report, arm]) => {
 	const t = trace(report, fn);
-	const guard = awaitGuard(fn, isAsync, "_tf");
-	const call = guard ? `_tf=tf${at(i)}(c)\n${guard}` : `${Await(fn)}tf${at(i)}(c)\n`;
+	const call = isAsync ? `_tf=tf${at(i)}(c)\n${awaitGuard(fn, isAsync, "_tf", arm)}` : `tf${at(i)}(c)\n`;
 	return t.begin + call + t.end();
 });
 const deriveKeyCache = /* @__PURE__ */ new WeakMap();
@@ -318,7 +319,7 @@ function skipValue(src, i) {
 	}
 	return -1;
 }
-function mapBeforeHandle(_hooks, derive, link, isAsync, report, abortGuard) {
+function mapBeforeHandle(_hooks, derive, link, isAsync, report, abortGuard, arm) {
 	const hooks = toArray(_hooks);
 	const modes = deriveModes(hooks, derive);
 	let code = "";
@@ -332,8 +333,8 @@ function mapBeforeHandle(_hooks, derive, link, isAsync, report, abortGuard) {
 		}
 		const t = trace(report, fn);
 		code += t.begin;
-		code += `tmp=${Await(fn)}bf${at(i)}(c)\n`;
-		code += awaitGuard(fn, isAsync, "tmp");
+		code += `tmp=bf${at(i)}(c)\n`;
+		code += awaitGuard(fn, isAsync, "tmp", arm);
 		if (modes?.[i] !== void 0) {
 			needsEs = true;
 			if (modes[i]) {
@@ -379,7 +380,7 @@ async function runBeforeHandlePrefixAsync(prefix, context, abort) {
 			if (!first && abort && context["~sig"]?.aborted) return;
 			first = false;
 			let result = values[j](context);
-			if (result instanceof Promise) {
+			if (typeof result?.then === "function") {
 				result = await result;
 				if (abort) context["~sig"] ??= context.request.signal;
 			}
@@ -387,7 +388,7 @@ async function runBeforeHandlePrefixAsync(prefix, context, abort) {
 		}
 	}
 }
-function mapChainHook(hooks, prefix, isAsync, report, abortGuard) {
+function mapChainHook(hooks, prefix, isAsync, report, abortGuard, arm) {
 	let code = "";
 	let depth = 0;
 	for (let i = 0; i < hooks.length; i++) {
@@ -398,25 +399,25 @@ function mapChainHook(hooks, prefix, isAsync, report, abortGuard) {
 		}
 		const t = trace(report, fn);
 		code += t.begin;
-		code += `tmp=${Await(fn)}${prefix}${at(i)}(c)\n`;
-		code += awaitGuard(fn, isAsync, "tmp");
+		code += `tmp=${prefix}${at(i)}(c)\n`;
+		code += awaitGuard(fn, isAsync, "tmp", arm);
 		code += t.end("tmp");
 	}
 	code += "}".repeat(depth);
 	code += `if(tmp!==undefined)_r=c.responseValue=tmp\n`;
 	return code;
 }
-const mapAfterHandle = (_hooks, isAsync, report, abortGuard) => mapChainHook(toArray(_hooks), "af", isAsync, report, abortGuard);
-const mapMapResponse = (_hooks, isAsync, report, abortGuard) => mapChainHook(toArray(_hooks), "mr", isAsync, report, abortGuard);
+const mapAfterHandle = (_hooks, isAsync, report, abortGuard, arm) => mapChainHook(toArray(_hooks), "af", isAsync, report, abortGuard, arm);
+const mapMapResponse = (_hooks, isAsync, report, abortGuard, arm) => mapChainHook(toArray(_hooks), "mr", isAsync, report, abortGuard, arm);
 const mapAfterResponse = /* @__PURE__ */ map((i, fn, [report]) => {
 	const t = trace(report, fn);
-	const call = require_compile_utils.isAsyncFunction(fn) ? `await ar${at(i)}(c)\n` : `let _ar=ar${at(i)}(c)\nif(_ar instanceof Promise)await _ar\n`;
-	return `try{` + t.begin + call + t.end() + `}catch(_e){` + t.end("_e") + `}\n`;
+	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]) => {
+const mapError = /* @__PURE__ */ map((i, fn, [map, link, mapResponse, schedule, sign, isAsync, arm]) => {
 	link(mapResponse, "rm");
 	link(require_handler_error.adoptErrorType, "aet");
-	return `_r=${Await(fn)}er${at(i)}(c)\n` + awaitGuard(fn, isAsync, "_r") + "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 `_r=er${at(i)}(c)\n` + awaitGuard(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`;
 });
 function map(map) {
 	return function(event, rest, abortGuard) {
@@ -502,16 +503,19 @@ function getQueryParseChannels(querySchema) {
 	queryParseChannelsCache.set(querySchema, result);
 	return result ?? void 0;
 }
-const Await = (fn) => require_compile_utils.isAsyncFunction(fn) ? "await " : "";
-const awaitGuard = (fn, isAsync, target) => isAsync && !require_compile_utils.isAsyncFunction(fn) ? `if(${target} instanceof Promise)${target}=await ${target}\n` : "";
+function awaitGuard(fn, isAsync, target, arm = "") {
+	if (!isAsync) return "";
+	const code = `${arm ? `;${arm}\n` : ""}${target}=await ${target}\n`;
+	return require_compile_utils.isAsyncFunction(fn) ? code : `if(typeof ${target}?.then==='function'){${code}}\n`;
+}
 
 //#endregion
 exports.armEntryAbort = armEntryAbort;
+exports.awaitGuard = awaitGuard;
 exports.cloneResponse = cloneResponse;
 exports.cloneStaticValue = cloneStaticValue;
 exports.deriveModes = deriveModes;
 exports.emptyResponse = require_handler_utils.emptyResponse;
-exports.extractDeriveKeys = extractDeriveKeys;
 exports.getQueryParseChannels = getQueryParseChannels;
 exports.hasRequestBody = hasRequestBody;
 exports.mapAfterHandle = mapAfterHandle;

package/dist/compile/handler/utils.mjs

@@ -24,7 +24,9 @@ function cloneResponse(r) {
 }
 function cloneStaticValue(value) {
 	try {
-		return structuredClone(value);
+		const cloned = structuredClone(value);
+		if (Object.getPrototypeOf(value) === ElysiaStatus.prototype) Object.setPrototypeOf(cloned, ElysiaStatus.prototype);
+		return cloned;
 	} catch {
 		return value;
 	}
@@ -50,10 +52,9 @@ function armEntryAbort(context) {
 }
 const trace = (report, fn) => report?.resolveChild(childName(fn)) ?? noTrace;
 const toArray = (v) => Array.isArray(v) ? v : [v];
-const mapTransform = /* @__PURE__ */ map((i, fn, [isAsync, report]) => {
+const mapTransform = /* @__PURE__ */ map((i, fn, [isAsync, report, arm]) => {
 	const t = trace(report, fn);
-	const guard = awaitGuard(fn, isAsync, "_tf");
-	const call = guard ? `_tf=tf${at(i)}(c)\n${guard}` : `${Await(fn)}tf${at(i)}(c)\n`;
+	const call = isAsync ? `_tf=tf${at(i)}(c)\n${awaitGuard(fn, isAsync, "_tf", arm)}` : `tf${at(i)}(c)\n`;
 	return t.begin + call + t.end();
 });
 const deriveKeyCache = /* @__PURE__ */ new WeakMap();
@@ -317,7 +318,7 @@ function skipValue(src, i) {
 	}
 	return -1;
 }
-function mapBeforeHandle(_hooks, derive, link, isAsync, report, abortGuard) {
+function mapBeforeHandle(_hooks, derive, link, isAsync, report, abortGuard, arm) {
 	const hooks = toArray(_hooks);
 	const modes = deriveModes(hooks, derive);
 	let code = "";
@@ -331,8 +332,8 @@ function mapBeforeHandle(_hooks, derive, link, isAsync, report, abortGuard) {
 		}
 		const t = trace(report, fn);
 		code += t.begin;
-		code += `tmp=${Await(fn)}bf${at(i)}(c)\n`;
-		code += awaitGuard(fn, isAsync, "tmp");
+		code += `tmp=bf${at(i)}(c)\n`;
+		code += awaitGuard(fn, isAsync, "tmp", arm);
 		if (modes?.[i] !== void 0) {
 			needsEs = true;
 			if (modes[i]) {
@@ -378,7 +379,7 @@ async function runBeforeHandlePrefixAsync(prefix, context, abort) {
 			if (!first && abort && context["~sig"]?.aborted) return;
 			first = false;
 			let result = values[j](context);
-			if (result instanceof Promise) {
+			if (typeof result?.then === "function") {
 				result = await result;
 				if (abort) context["~sig"] ??= context.request.signal;
 			}
@@ -386,7 +387,7 @@ async function runBeforeHandlePrefixAsync(prefix, context, abort) {
 		}
 	}
 }
-function mapChainHook(hooks, prefix, isAsync, report, abortGuard) {
+function mapChainHook(hooks, prefix, isAsync, report, abortGuard, arm) {
 	let code = "";
 	let depth = 0;
 	for (let i = 0; i < hooks.length; i++) {
@@ -397,25 +398,25 @@ function mapChainHook(hooks, prefix, isAsync, report, abortGuard) {
 		}
 		const t = trace(report, fn);
 		code += t.begin;
-		code += `tmp=${Await(fn)}${prefix}${at(i)}(c)\n`;
-		code += awaitGuard(fn, isAsync, "tmp");
+		code += `tmp=${prefix}${at(i)}(c)\n`;
+		code += awaitGuard(fn, isAsync, "tmp", arm);
 		code += t.end("tmp");
 	}
 	code += "}".repeat(depth);
 	code += `if(tmp!==undefined)_r=c.responseValue=tmp\n`;
 	return code;
 }
-const mapAfterHandle = (_hooks, isAsync, report, abortGuard) => mapChainHook(toArray(_hooks), "af", isAsync, report, abortGuard);
-const mapMapResponse = (_hooks, isAsync, report, abortGuard) => mapChainHook(toArray(_hooks), "mr", isAsync, report, abortGuard);
+const mapAfterHandle = (_hooks, isAsync, report, abortGuard, arm) => mapChainHook(toArray(_hooks), "af", isAsync, report, abortGuard, arm);
+const mapMapResponse = (_hooks, isAsync, report, abortGuard, arm) => mapChainHook(toArray(_hooks), "mr", isAsync, report, abortGuard, arm);
 const mapAfterResponse = /* @__PURE__ */ map((i, fn, [report]) => {
 	const t = trace(report, fn);
-	const call = isAsyncFunction(fn) ? `await ar${at(i)}(c)\n` : `let _ar=ar${at(i)}(c)\nif(_ar instanceof Promise)await _ar\n`;
-	return `try{` + t.begin + call + t.end() + `}catch(_e){` + t.end("_e") + `}\n`;
+	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]) => {
+const mapError = /* @__PURE__ */ map((i, fn, [map, link, mapResponse, schedule, sign, isAsync, arm]) => {
 	link(mapResponse, "rm");
 	link(adoptErrorType, "aet");
-	return `_r=${Await(fn)}er${at(i)}(c)\n` + awaitGuard(fn, isAsync, "_r") + "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 `_r=er${at(i)}(c)\n` + awaitGuard(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`;
 });
 function map(map) {
 	return function(event, rest, abortGuard) {
@@ -501,8 +502,11 @@ function getQueryParseChannels(querySchema) {
 	queryParseChannelsCache.set(querySchema, result);
 	return result ?? void 0;
 }
-const Await = (fn) => isAsyncFunction(fn) ? "await " : "";
-const awaitGuard = (fn, isAsync, target) => isAsync && !isAsyncFunction(fn) ? `if(${target} instanceof Promise)${target}=await ${target}\n` : "";
+function awaitGuard(fn, isAsync, target, arm = "") {
+	if (!isAsync) return "";
+	const code = `${arm ? `;${arm}\n` : ""}${target}=await ${target}\n`;
+	return isAsyncFunction(fn) ? code : `if(typeof ${target}?.then==='function'){${code}}\n`;
+}
 
 //#endregion
-export { armEntryAbort, cloneResponse, cloneStaticValue, deriveModes, emptyResponse, extractDeriveKeys, getQueryParseChannels, hasRequestBody, mapAfterHandle, mapAfterResponse, mapBeforeHandle, mapError, mapMapResponse, mapTransform, replaceDeriveContext, runBeforeHandlePrefix, runBeforeHandlePrefixAsync };
+export { armEntryAbort, awaitGuard, cloneResponse, cloneStaticValue, deriveModes, emptyResponse, getQueryParseChannels, hasRequestBody, mapAfterHandle, mapAfterResponse, mapBeforeHandle, mapError, mapMapResponse, mapTransform, replaceDeriveContext, runBeforeHandlePrefix, runBeforeHandlePrefixAsync };

package/dist/compile/utils.js

@@ -4,14 +4,17 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 function isAsyncFunction(fn) {
 	return fn.constructor.name === "AsyncFunction" || fn.constructor.name === "AsyncGeneratorFunction";
 }
-const matchResponseClone = /=>\s*response\.clone\(/;
-const matchFnReturn = /(?:return|=>)\s*(?:new\s+)?[\w$.][\w$.]*\s*\(|a(?:sync|wait)/;
+const matchArrow = /^(?:[\w$]+|\([\w$\s,.[\]{}:]*\))\s*=>([\s\S]*)$/;
+const matchFunction = /^(?:function(?:\s+[\w$]+)?|[\w$]+)\s*\([\w$\s,.[\]{}:]*\)\s*(\{[\s\S]*\})$/;
+const matchLiteral = /^(?:true|false|null|-?\d+(?:\.\d+)?|'[^'\\]*'|"[^"\\]*")$/;
 const mayReturnPromiseCache = /* @__PURE__ */ new WeakMap();
 function mayReturnPromise(fn) {
 	let result = mayReturnPromiseCache.get(fn);
 	if (result !== void 0) return result;
-	const literal = fn.toString();
-	result = matchResponseClone.test(literal) ? false : matchFnReturn.test(literal);
+	const literal = Function.prototype.toString.call(fn).trim();
+	const arrow = matchArrow.exec(literal);
+	const body = (arrow?.[1] ?? matchFunction.exec(literal)?.[1])?.trimStart();
+	result = literal.includes("[native code]") || !(body?.startsWith("{") && body.endsWith("}") && !/\breturn\b/.test(body) || arrow && matchLiteral.test(body));
 	mayReturnPromiseCache.set(fn, result);
 	return result;
 }

package/dist/compile/utils.mjs

@@ -2,14 +2,17 @@
 function isAsyncFunction(fn) {
 	return fn.constructor.name === "AsyncFunction" || fn.constructor.name === "AsyncGeneratorFunction";
 }
-const matchResponseClone = /=>\s*response\.clone\(/;
-const matchFnReturn = /(?:return|=>)\s*(?:new\s+)?[\w$.][\w$.]*\s*\(|a(?:sync|wait)/;
+const matchArrow = /^(?:[\w$]+|\([\w$\s,.[\]{}:]*\))\s*=>([\s\S]*)$/;
+const matchFunction = /^(?:function(?:\s+[\w$]+)?|[\w$]+)\s*\([\w$\s,.[\]{}:]*\)\s*(\{[\s\S]*\})$/;
+const matchLiteral = /^(?:true|false|null|-?\d+(?:\.\d+)?|'[^'\\]*'|"[^"\\]*")$/;
 const mayReturnPromiseCache = /* @__PURE__ */ new WeakMap();
 function mayReturnPromise(fn) {
 	let result = mayReturnPromiseCache.get(fn);
 	if (result !== void 0) return result;
-	const literal = fn.toString();
-	result = matchResponseClone.test(literal) ? false : matchFnReturn.test(literal);
+	const literal = Function.prototype.toString.call(fn).trim();
+	const arrow = matchArrow.exec(literal);
+	const body = (arrow?.[1] ?? matchFunction.exec(literal)?.[1])?.trimStart();
+	result = literal.includes("[native code]") || !(body?.startsWith("{") && body.endsWith("}") && !/\breturn\b/.test(body) || arrow && matchLiteral.test(body));
 	mayReturnPromiseCache.set(fn, result);
 	return result;
 }

package/dist/context.js

@@ -1,6 +1,5 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 const require_utils = require('./utils.js');
-const require_universal_is_production = require('./universal/is-production.js');
 const require_error = require('./error.js');
 const require_adapter_default_headers = require('./adapter/default-headers.js');
 
@@ -50,28 +49,12 @@ function clearContextCache(app) {
 	sharedEmptyDecorator = null;
 	sharedEmptyContext = null;
 }
-function buildEmptyContext(Base, headers = null, warnPathMutation = false) {
+function buildEmptyContext(Base, headers = null) {
 	const immutableHeaders = headers !== null && Object.isFrozen(headers);
-	let warnedPathMutation = false;
-	const pathDescriptor = warnPathMutation ? {
-		enumerable: true,
-		configurable: true,
-		get() {
-			return this["~path"];
-		},
-		set(value) {
-			if ("~path" in this && !warnedPathMutation) {
-				warnedPathMutation = true;
-				console.warn("[elysia] context.path is readonly; request-hook rerouting will stop working in a future release.");
-			}
-			this["~path"] = value;
-		}
-	} : void 0;
 	class Context extends Base {
 		constructor(request) {
 			super();
 			this.request = request;
-			if (pathDescriptor) Object.defineProperty(this, "path", pathDescriptor);
 			if (immutableHeaders) this.set = {
 				headers,
 				status: void 0,
@@ -91,7 +74,6 @@ function createContext(app) {
 	if (cached) return cached;
 	const ext = app["~ext"];
 	const adapter = app["~config"]?.adapter;
-	const warnPathMutation = !require_universal_is_production.isProduction() && !!require_utils.flattenChain(app["~hookChain"])?.request?.length;
 	const headers = ext?.headers && require_utils.isNotEmpty(ext.headers) ? Object.assign(require_utils.nullObject(), ext.headers) : null;
 	if (headers && (!adapter || adapter.response.supportsDefaultHeaderSink)) {
 		Object.defineProperty(headers, "\0", { value: headers });
@@ -99,11 +81,11 @@ function createContext(app) {
 	}
 	if (headers === null && !ext?.decorator && !ext?.store) {
 		sharedEmptyDecorator ??= buildEmptyDecorator();
-		const context = warnPathMutation ? buildEmptyContext(sharedEmptyDecorator, null, true) : sharedEmptyContext ??= buildEmptyContext(sharedEmptyDecorator);
+		const context = sharedEmptyContext ??= buildEmptyContext(sharedEmptyDecorator);
 		contextCache.set(app, context);
 		return context;
 	}
-	const context = buildEmptyContext(createBaseContext(app), headers, warnPathMutation);
+	const context = buildEmptyContext(createBaseContext(app), headers);
 	contextCache.set(app, context);
 	return context;
 }

package/dist/context.mjs

@@ -1,5 +1,4 @@
-import { flattenChain, isNotEmpty, nullObject, redirect } from "./utils.mjs";
-import { isProduction } from "./universal/is-production.mjs";
+import { isNotEmpty, nullObject, redirect } from "./utils.mjs";
 import { status } from "./error.mjs";
 import { defaultHeaders } from "./adapter/default-headers.mjs";
 
@@ -49,28 +48,12 @@ function clearContextCache(app) {
 	sharedEmptyDecorator = null;
 	sharedEmptyContext = null;
 }
-function buildEmptyContext(Base, headers = null, warnPathMutation = false) {
+function buildEmptyContext(Base, headers = null) {
 	const immutableHeaders = headers !== null && Object.isFrozen(headers);
-	let warnedPathMutation = false;
-	const pathDescriptor = warnPathMutation ? {
-		enumerable: true,
-		configurable: true,
-		get() {
-			return this["~path"];
-		},
-		set(value) {
-			if ("~path" in this && !warnedPathMutation) {
-				warnedPathMutation = true;
-				console.warn("[elysia] context.path is readonly; request-hook rerouting will stop working in a future release.");
-			}
-			this["~path"] = value;
-		}
-	} : void 0;
 	class Context extends Base {
 		constructor(request) {
 			super();
 			this.request = request;
-			if (pathDescriptor) Object.defineProperty(this, "path", pathDescriptor);
 			if (immutableHeaders) this.set = {
 				headers,
 				status: void 0,
@@ -90,7 +73,6 @@ function createContext(app) {
 	if (cached) return cached;
 	const ext = app["~ext"];
 	const adapter = app["~config"]?.adapter;
-	const warnPathMutation = !isProduction() && !!flattenChain(app["~hookChain"])?.request?.length;
 	const headers = ext?.headers && isNotEmpty(ext.headers) ? Object.assign(nullObject(), ext.headers) : null;
 	if (headers && (!adapter || adapter.response.supportsDefaultHeaderSink)) {
 		Object.defineProperty(headers, "\0", { value: headers });
@@ -98,11 +80,11 @@ function createContext(app) {
 	}
 	if (headers === null && !ext?.decorator && !ext?.store) {
 		sharedEmptyDecorator ??= buildEmptyDecorator();
-		const context = warnPathMutation ? buildEmptyContext(sharedEmptyDecorator, null, true) : sharedEmptyContext ??= buildEmptyContext(sharedEmptyDecorator);
+		const context = sharedEmptyContext ??= buildEmptyContext(sharedEmptyDecorator);
 		contextCache.set(app, context);
 		return context;
 	}
-	const context = buildEmptyContext(createBaseContext(app), headers, warnPathMutation);
+	const context = buildEmptyContext(createBaseContext(app), headers);
 	contextCache.set(app, context);
 	return context;
 }

package/dist/cookie/index.d.ts

@@ -2,6 +2,5 @@ import { BaseCookie, CookieOptions } from "./types.js";
 import { Cookie } from "./cookie.js";
 import { serializeCookie } from "./serialize.js";
 import { signCookie, unsignCookie } from "./crypto.js";
-import { parseCookie } from "./utils.js";
 import { InvalidCookie } from "./error.js";
-export { type BaseCookie, Cookie, type CookieOptions, InvalidCookie, parseCookie, serializeCookie, signCookie, unsignCookie };
+export { type BaseCookie, Cookie, type CookieOptions, InvalidCookie, serializeCookie, signCookie, unsignCookie };

package/dist/cookie/index.js

@@ -3,11 +3,9 @@ const require_cookie_error = require('./error.js');
 const require_cookie_serialize = require('./serialize.js');
 const require_cookie_crypto = require('./crypto.js');
 const require_cookie_cookie = require('./cookie.js');
-const require_cookie_utils = require('./utils.js');
 
 exports.Cookie = require_cookie_cookie.Cookie;
 exports.InvalidCookie = require_cookie_error.InvalidCookie;
-exports.parseCookie = require_cookie_utils.parseCookie;
 exports.serializeCookie = require_cookie_serialize.serializeCookie;
 exports.signCookie = require_cookie_crypto.signCookie;
 exports.unsignCookie = require_cookie_crypto.unsignCookie;

package/dist/cookie/index.mjs

@@ -2,6 +2,5 @@ import { InvalidCookie } from "./error.mjs";
 import { serializeCookie } from "./serialize.mjs";
 import { signCookie, unsignCookie } from "./crypto.mjs";
 import { Cookie } from "./cookie.mjs";
-import { parseCookie } from "./utils.mjs";
 
-export { Cookie, InvalidCookie, parseCookie, serializeCookie, signCookie, unsignCookie };
+export { Cookie, InvalidCookie, serializeCookie, signCookie, unsignCookie };

package/dist/cookie/lib.js

@@ -1,4 +1,5 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
+const require_constants = require('../constants.js');
 const require_utils = require('../utils.js');
 const require_cookie_error = require('./error.js');
 
@@ -21,7 +22,7 @@ function parse(str) {
 		while (ks < ke && ((c = str.charCodeAt(ks)) === 32 || c === 9)) ks++;
 		while (ke > ks && ((c = str.charCodeAt(ke - 1)) === 32 || c === 9)) ke--;
 		const key = str.slice(ks, ke);
-		if (obj[key] === void 0) {
+		if (obj[key] === void 0 && !require_constants.dangerousKeys.has(key)) {
 			let vs = eq + 1, ve = semi;
 			while (vs < ve && ((c = str.charCodeAt(vs)) === 32 || c === 9)) vs++;
 			while (ve > vs && ((c = str.charCodeAt(ve - 1)) === 32 || c === 9)) ve--;

package/dist/cookie/lib.mjs

@@ -1,3 +1,4 @@
+import { dangerousKeys } from "../constants.mjs";
 import { nullObject } from "../utils.mjs";
 import { InvalidCookie } from "./error.mjs";
 
@@ -20,7 +21,7 @@ function parse(str) {
 		while (ks < ke && ((c = str.charCodeAt(ks)) === 32 || c === 9)) ks++;
 		while (ke > ks && ((c = str.charCodeAt(ke - 1)) === 32 || c === 9)) ke--;
 		const key = str.slice(ks, ke);
-		if (obj[key] === void 0) {
+		if (obj[key] === void 0 && !dangerousKeys.has(key)) {
 			let vs = eq + 1, ve = semi;
 			while (vs < ve && ((c = str.charCodeAt(vs)) === 32 || c === 9)) vs++;
 			while (ve > vs && ((c = str.charCodeAt(ve - 1)) === 32 || c === 9)) ve--;

package/dist/cookie/utils.d.ts

@@ -1,14 +1,10 @@
-import { CookieOptions } from "./types.js";
 import { Cookie } from "./cookie.js";
 import { Context } from "../context.js";
-import { CompiledCookieConfig } from "./config.js";
 import { hasSyncHmac } from "./crypto.js";
+import { CompiledCookieConfig } from "./config.js";
 
 //#region src/cookie/utils.d.ts
-declare function parseCookie(set: Context['set'], cookieString?: string | null, options?: CookieOptions & {
-  sign?: true | string | string[];
-}): Promise<Record<string, Cookie<unknown>>>;
-declare function parseCookieRawSync(cookieString: string | null | undefined, _config: CompiledCookieConfig): Record<string, unknown>;
+declare function parseCookieRawSync(cookieString: string | null | undefined, _config: CompiledCookieConfig): any;
 /**
  * Unsigned + unvalidated lane only
  *
@@ -22,4 +18,4 @@ declare function parseCookieRawSigned(cookieString: string | null | undefined, c
 declare function buildCookieJar(set: Context['set'], raw: Record<string, unknown>, config: CompiledCookieConfig, lazySign?: 1, deferDecode?: 1): Record<string, Cookie<unknown>>;
 declare function signCookieValues(cookies: Context['set']['cookie'] | undefined, config: CompiledCookieConfig): Promise<void> | undefined;
 //#endregion
-export { buildCookieJar, hasSyncHmac, parseCookie, parseCookieRaw, parseCookieRawDeferred, parseCookieRawLazy, parseCookieRawSigned, parseCookieRawSync, signCookieValues };
+export { buildCookieJar, hasSyncHmac, parseCookieRaw, parseCookieRawDeferred, parseCookieRawLazy, parseCookieRawSigned, parseCookieRawSync, signCookieValues };

package/dist/cookie/utils.js

@@ -1,6 +1,5 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 const require_runtime = require('../_virtual/_rolldown/runtime.js');
-const require_constants = require('../constants.js');
 const require_utils = require('../utils.js');
 const require_cookie_lib = require('./lib.js');
 const require_cookie_crypto = require('./crypto.js');
@@ -10,16 +9,11 @@ let deuri = require("deuri");
 deuri = require_runtime.__toESM(deuri);
 
 //#region src/cookie/utils.ts
-async function parseCookie(set, cookieString, options) {
-	const config = require_cookie_config.compileCookieConfig(void 0, options);
-	return buildCookieJar(set, await parseCookieRaw(cookieString, config), config);
-}
 function parseCookieRawSync(cookieString, _config) {
-	const out = require_utils.nullObject();
-	if (!cookieString) return out;
+	if (!cookieString) return require_utils.nullObject();
 	const cookies = require_cookie_lib.parse(cookieString);
+	const out = cookies;
 	for (const name in cookies) {
-		if (require_constants.dangerousKeys.has(name)) continue;
 		const v = cookies[name];
 		if (v === void 0) continue;
 		out[name] = require_cookie_crypto.maybeJsonDecode((0, deuri.default)(v) ?? v);
@@ -33,23 +27,13 @@ function parseCookieRawSync(cookieString, _config) {
 * the raw record before the handler touches a name.
 */
 function parseCookieRawDeferred(cookieString, _config) {
-	const out = require_utils.nullObject();
-	if (!cookieString) return out;
-	const cookies = require_cookie_lib.parse(cookieString);
-	for (const name in cookies) {
-		if (require_constants.dangerousKeys.has(name)) continue;
-		const v = cookies[name];
-		if (v === void 0) continue;
-		out[name] = v;
-	}
-	return out;
+	return cookieString ? require_cookie_lib.parse(cookieString) : require_utils.nullObject();
 }
 function parseCookieRawLazy(cookieString, config) {
-	const out = require_utils.nullObject();
-	if (!cookieString) return out;
+	if (!cookieString) return require_utils.nullObject();
 	const cookies = require_cookie_lib.parse(cookieString);
+	const out = cookies;
 	for (const name in cookies) {
-		if (require_constants.dangerousKeys.has(name)) continue;
 		const v = cookies[name];
 		if (v === void 0) continue;
 		const decoded = (0, deuri.default)(v) ?? v;
@@ -60,11 +44,10 @@ function parseCookieRawLazy(cookieString, config) {
 async function parseCookieRaw(cookieString, config) {
 	if (!config.hasSign) return parseCookieRawSync(cookieString, config);
 	if (require_cookie_crypto.hasSyncHmac) return parseCookieRawSigned(cookieString, config);
-	const out = require_utils.nullObject();
-	if (!cookieString) return out;
+	if (!cookieString) return require_utils.nullObject();
 	const cookies = require_cookie_lib.parse(cookieString);
+	const out = cookies;
 	for (const name in cookies) {
-		if (require_constants.dangerousKeys.has(name)) continue;
 		const v = cookies[name];
 		if (v === void 0) continue;
 		let value = (0, deuri.default)(v) ?? v;
@@ -76,11 +59,10 @@ async function parseCookieRaw(cookieString, config) {
 }
 function parseCookieRawSigned(cookieString, config) {
 	if (!config.hasSign) return parseCookieRawSync(cookieString, config);
-	const out = require_utils.nullObject();
-	if (!cookieString) return out;
+	if (!cookieString) return require_utils.nullObject();
 	const cookies = require_cookie_lib.parse(cookieString);
+	const out = cookies;
 	for (const name in cookies) {
-		if (require_constants.dangerousKeys.has(name)) continue;
 		const v = cookies[name];
 		if (v === void 0) continue;
 		let value = (0, deuri.default)(v) ?? v;
@@ -187,7 +169,6 @@ async function signPending(pending) {
 //#endregion
 exports.buildCookieJar = buildCookieJar;
 exports.hasSyncHmac = require_cookie_crypto.hasSyncHmac;
-exports.parseCookie = parseCookie;
 exports.parseCookieRaw = parseCookieRaw;
 exports.parseCookieRawDeferred = parseCookieRawDeferred;
 exports.parseCookieRawLazy = parseCookieRawLazy;

package/dist/cookie/utils.mjs

@@ -1,22 +1,16 @@
-import { dangerousKeys } from "../constants.mjs";
 import { nullObject } from "../utils.mjs";
 import { parse } from "./lib.mjs";
 import { deriveSignKey, hasSyncHmac, maybeJsonDecode, rawJsonValue, resolvePendingCookie, signCookie, signCookieSyncImpl, unsignWithSecrets, unsignWithSecretsSync } from "./crypto.mjs";
 import { Cookie } from "./cookie.mjs";
-import { compileCookieConfig, isCookieSigned, resolveSignSecrets } from "./config.mjs";
+import { isCookieSigned, resolveSignSecrets } from "./config.mjs";
 import decodeComponent from "deuri";
 
 //#region src/cookie/utils.ts
-async function parseCookie(set, cookieString, options) {
-	const config = compileCookieConfig(void 0, options);
-	return buildCookieJar(set, await parseCookieRaw(cookieString, config), config);
-}
 function parseCookieRawSync(cookieString, _config) {
-	const out = nullObject();
-	if (!cookieString) return out;
+	if (!cookieString) return nullObject();
 	const cookies = parse(cookieString);
+	const out = cookies;
 	for (const name in cookies) {
-		if (dangerousKeys.has(name)) continue;
 		const v = cookies[name];
 		if (v === void 0) continue;
 		out[name] = maybeJsonDecode(decodeComponent(v) ?? v);
@@ -30,23 +24,13 @@ function parseCookieRawSync(cookieString, _config) {
 * the raw record before the handler touches a name.
 */
 function parseCookieRawDeferred(cookieString, _config) {
-	const out = nullObject();
-	if (!cookieString) return out;
-	const cookies = parse(cookieString);
-	for (const name in cookies) {
-		if (dangerousKeys.has(name)) continue;
-		const v = cookies[name];
-		if (v === void 0) continue;
-		out[name] = v;
-	}
-	return out;
+	return cookieString ? parse(cookieString) : nullObject();
 }
 function parseCookieRawLazy(cookieString, config) {
-	const out = nullObject();
-	if (!cookieString) return out;
+	if (!cookieString) return nullObject();
 	const cookies = parse(cookieString);
+	const out = cookies;
 	for (const name in cookies) {
-		if (dangerousKeys.has(name)) continue;
 		const v = cookies[name];
 		if (v === void 0) continue;
 		const decoded = decodeComponent(v) ?? v;
@@ -57,11 +41,10 @@ function parseCookieRawLazy(cookieString, config) {
 async function parseCookieRaw(cookieString, config) {
 	if (!config.hasSign) return parseCookieRawSync(cookieString, config);
 	if (hasSyncHmac) return parseCookieRawSigned(cookieString, config);
-	const out = nullObject();
-	if (!cookieString) return out;
+	if (!cookieString) return nullObject();
 	const cookies = parse(cookieString);
+	const out = cookies;
 	for (const name in cookies) {
-		if (dangerousKeys.has(name)) continue;
 		const v = cookies[name];
 		if (v === void 0) continue;
 		let value = decodeComponent(v) ?? v;
@@ -73,11 +56,10 @@ async function parseCookieRaw(cookieString, config) {
 }
 function parseCookieRawSigned(cookieString, config) {
 	if (!config.hasSign) return parseCookieRawSync(cookieString, config);
-	const out = nullObject();
-	if (!cookieString) return out;
+	if (!cookieString) return nullObject();
 	const cookies = parse(cookieString);
+	const out = cookies;
 	for (const name in cookies) {
-		if (dangerousKeys.has(name)) continue;
 		const v = cookies[name];
 		if (v === void 0) continue;
 		let value = decodeComponent(v) ?? v;
@@ -182,4 +164,4 @@ async function signPending(pending) {
 }
 
 //#endregion
-export { buildCookieJar, hasSyncHmac, parseCookie, parseCookieRaw, parseCookieRawDeferred, parseCookieRawLazy, parseCookieRawSigned, parseCookieRawSync, signCookieValues };
+export { buildCookieJar, hasSyncHmac, parseCookieRaw, parseCookieRawDeferred, parseCookieRawLazy, parseCookieRawSigned, parseCookieRawSync, signCookieValues };