elysia 2.0.0-beta.21 → 2.0.0-beta.22

package/dist/compile/utils.d.ts

@@ -2,7 +2,8 @@ import { MaybeArray } from "../types.js";
 
 //#region src/compile/utils.d.ts
 declare function isAsyncFunction(fn: Function): boolean;
+declare const resetMayReturnPromiseCache: () => void;
 declare function mayReturnPromise(fn: Function): boolean;
 declare const isAsyncLifecycle: (handlers: MaybeArray<Function> | undefined) => boolean;
 //#endregion
-export { isAsyncFunction, isAsyncLifecycle, mayReturnPromise };
+export { isAsyncFunction, isAsyncLifecycle, mayReturnPromise, resetMayReturnPromiseCache };

package/dist/compile/utils.js

@@ -7,14 +7,18 @@ function isAsyncFunction(fn) {
 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();
+let mayReturnPromiseCache = /* @__PURE__ */ new WeakMap();
+const resetMayReturnPromiseCache = () => {
+	mayReturnPromiseCache = /* @__PURE__ */ new WeakMap();
+};
 function mayReturnPromise(fn) {
 	let result = mayReturnPromiseCache.get(fn);
 	if (result !== void 0) return result;
 	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));
+	const neverPromise = body?.startsWith("{") && body.endsWith("}") && !/\breturn\b/.test(body) || arrow && matchLiteral.test(body);
+	result = literal.includes("[native code]") || !neverPromise;
 	mayReturnPromiseCache.set(fn, result);
 	return result;
 }
@@ -23,4 +27,5 @@ const isAsyncLifecycle = (handlers) => handlers ? Array.isArray(handlers) ? hand
 //#endregion
 exports.isAsyncFunction = isAsyncFunction;
 exports.isAsyncLifecycle = isAsyncLifecycle;
-exports.mayReturnPromise = mayReturnPromise;
+exports.mayReturnPromise = mayReturnPromise;
+exports.resetMayReturnPromiseCache = resetMayReturnPromiseCache;

package/dist/compile/utils.mjs

@@ -1,3 +1,4 @@
+// @bun
 //#region src/compile/utils.ts
 function isAsyncFunction(fn) {
 	return fn.constructor.name === "AsyncFunction" || fn.constructor.name === "AsyncGeneratorFunction";
@@ -5,18 +6,22 @@ function isAsyncFunction(fn) {
 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();
+let mayReturnPromiseCache = /* @__PURE__ */ new WeakMap();
+const resetMayReturnPromiseCache = () => {
+	mayReturnPromiseCache = /* @__PURE__ */ new WeakMap();
+};
 function mayReturnPromise(fn) {
 	let result = mayReturnPromiseCache.get(fn);
 	if (result !== void 0) return result;
 	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));
+	const neverPromise = body?.startsWith("{") && body.endsWith("}") && !/\breturn\b/.test(body) || arrow && matchLiteral.test(body);
+	result = literal.includes("[native code]") || !neverPromise;
 	mayReturnPromiseCache.set(fn, result);
 	return result;
 }
 const isAsyncLifecycle = (handlers) => handlers ? Array.isArray(handlers) ? handlers.some(isAsyncFunction) : isAsyncFunction(handlers) : false;
 
 //#endregion
-export { isAsyncFunction, isAsyncLifecycle, mayReturnPromise };
+export { isAsyncFunction, isAsyncLifecycle, mayReturnPromise, resetMayReturnPromiseCache };

package/dist/compiled.mjs

@@ -1,3 +1,4 @@
+// @bun
 //#region src/compiled.ts
 /**
 * Stub for the `elysia/compiled` import.

package/dist/constants.mjs

@@ -1,3 +1,4 @@
+// @bun
 //#region src/constants.ts
 const mapBack = (map) => Object.fromEntries(Object.entries(map).map(([key, value]) => [value, key]));
 const StatusMap = (/*#__PURE__*/ {

package/dist/context.d.ts

@@ -1,8 +1,8 @@
-import { BaseCookie } from "./cookie/types.js";
 import { StatusMap } from "./constants.js";
 import { SelectiveProblem, SelectiveStatus, problem, status } from "./error.js";
 import { redirect } from "./utils.js";
 import { Server } from "./universal/server.js";
+import { BaseCookie } from "./cookie/types.js";
 import { Cookie } from "./cookie/cookie.js";
 import { AfterResponseHandler, DefaultSingleton, HTTPHeaders, InputSchema, MaybePromise, Prettify, ResolvePath, RouteSchema, SingletonBase } from "./types.js";
 import { AnyElysia } from "./base.js";

package/dist/context.js

@@ -19,6 +19,7 @@ const defer = {
 function buildDecorator(members) {
 	class Decorator {}
 	Object.assign(Decorator.prototype, members);
+	for (const key of Reflect.ownKeys(members)) require_utils.markSingletons(members[key], 0);
 	Object.defineProperty(Decorator.prototype, "defer", defer);
 	return Decorator;
 }

package/dist/context.mjs

@@ -1,4 +1,5 @@
-import { isNotEmpty, nullObject, redirect } from "./utils.mjs";
+// @bun
+import { isNotEmpty, markSingletons, nullObject, redirect } from "./utils.mjs";
 import { problem, status } from "./error.mjs";
 import { defaultHeaders } from "./adapter/default-headers.mjs";
 
@@ -18,6 +19,7 @@ const defer = {
 function buildDecorator(members) {
 	class Decorator {}
 	Object.assign(Decorator.prototype, members);
+	for (const key of Reflect.ownKeys(members)) markSingletons(members[key], 0);
 	Object.defineProperty(Decorator.prototype, "defer", defer);
 	return Decorator;
 }

package/dist/cookie/config.d.ts

@@ -24,7 +24,7 @@ interface CompiledCookieConfig {
 declare function compileCookieConfig(routeSchema: AnySchema | string | undefined, appConfig: AppCookieConfig | undefined, models?: Record<string, unknown>, schemas?: {
   cookie?: unknown;
 }[]): CompiledCookieConfig;
-declare const legacySignatureOf: (name: string, config: CompiledCookieConfig) => boolean;
+declare const acceptsLegacySignature: (name: string, config: CompiledCookieConfig) => boolean;
 declare function resolveSignSecrets(name: string, config: CompiledCookieConfig): CompiledCookieConfig['globalSecrets'] | undefined;
 declare function isCookieSigned(name: string, config: CompiledCookieConfig): {
   signed: true;
@@ -33,4 +33,4 @@ declare function isCookieSigned(name: string, config: CompiledCookieConfig): {
   signed: false;
 };
 //#endregion
-export { AppCookieConfig, CompiledCookieConfig, FieldCookieConfig, compileCookieConfig, isCookieSigned, legacySignatureOf, resolveSignSecrets };
+export { AppCookieConfig, CompiledCookieConfig, FieldCookieConfig, acceptsLegacySignature, compileCookieConfig, isCookieSigned, resolveSignSecrets };

package/dist/cookie/config.js

@@ -16,35 +16,30 @@ const ATTRIBUTE_KEYS = new Set([
 ]);
 function getAttributes(source) {
 	if (!source) return;
-	const keys = Object.keys(source);
-	if (!keys.length) return;
 	let out;
-	for (const key of keys) if (ATTRIBUTE_KEYS.has(key)) {
-		out ??= require_utils.nullObject();
-		out[key] = source[key];
-	}
+	for (const key of Object.keys(source)) if (ATTRIBUTE_KEYS.has(key)) (out ??= require_utils.nullObject())[key] = source[key];
 	return out;
 }
 const hasUsableSecret = (secrets) => Array.isArray(secrets) ? secrets.some((s) => !!s?.trim()) : !!secrets?.trim();
-const gathered = () => ({
+const emptyGathered = () => ({
 	config: require_utils.nullObject(),
 	fields: require_utils.nullObject()
 });
-function canonical(config) {
+function comparableConfig(config) {
 	const out = require_utils.nullObject();
-	for (const key of Object.keys(config).sort()) if (key !== "sign") out[key] = key === "secrets" ? asList(config[key]) : config[key];
+	for (const key of Object.keys(config).sort()) if (key !== "sign") out[key] = key === "secrets" ? listKey(config[key]) : config[key];
 	return out;
 }
-const unsigned = (from) => {
+const signlessKey = (from) => {
 	const fields = require_utils.nullObject();
 	for (const name of Object.keys(from.fields).sort()) {
-		const field = canonical(from.fields[name]);
+		const field = comparableConfig(from.fields[name]);
 		if (Object.keys(field).length) fields[name] = field;
 	}
-	return JSON.stringify([canonical(from.config), fields]);
+	return JSON.stringify([comparableConfig(from.config), fields]);
 };
-const unclear = () => /* @__PURE__ */ new Error("[Elysia] Cookie schema `$ref` is unresolvable or ambiguous; use a model name or `$id` instead");
-const asList = (value) => JSON.stringify(typeof value === "string" ? [value] : value);
+const badRefError = () => /* @__PURE__ */ new Error("[Elysia] Cookie schema `$ref` is unresolvable or ambiguous; use a model name or `$id` instead");
+const listKey = (value) => JSON.stringify(typeof value === "string" ? [value] : value);
 function foldConfig(into, config) {
 	for (const key in config) {
 		const value = config[key];
@@ -52,19 +47,19 @@ function foldConfig(into, config) {
 		if (value === void 0) continue;
 		if (prev === void 0) into[key] = value;
 		else if (key === "sign") into.sign = prev === true || value === true || [].concat(prev, value);
-		else if ((key === "secrets" || key === "legacySignature") && asList(prev) !== asList(value)) throw new Error(`[Elysia] Merged cookie schemas disagree on \`${key}\``);
+		else if ((key === "secrets" || key === "legacySignature") && listKey(prev) !== listKey(value)) throw new Error(`[Elysia] Merged cookie schemas disagree on \`${key}\``);
 	}
 }
 function compileCookieConfig(routeSchema, appConfig, models, schemas) {
 	const roots = [routeSchema, ...(schemas ?? []).map((schema) => schema?.cookie).reverse()].map((schema) => typeof schema === "string" ? models?.[schema] : schema);
-	let targets;
-	const resolve = (name) => (targets ??= require_utils.refTargets(roots, models))(name);
+	let findTargets;
+	const resolve = (name) => (findTargets ??= require_utils.refTargets(roots, models))(name);
 	const gather = (schema, into, field, path) => {
 		if (!schema || path.has(schema)) return;
 		path.add(schema);
 		const ref = schema.$ref;
 		const targets = typeof ref === "string" ? [...resolve(ref)] : [ref];
-		if (typeof ref === "string" && !targets.length || schema.$dynamicRef !== void 0 || schema.$recursiveRef !== void 0) throw unclear();
+		if (typeof ref === "string" && !targets.length || schema.$dynamicRef !== void 0 || schema.$recursiveRef !== void 0) throw badRefError();
 		if (field === void 0) {
 			foldConfig(into.config, schema.config);
 			for (const name in schema.properties) gather(schema.properties[name], into, name, /* @__PURE__ */ new Set());
@@ -72,9 +67,9 @@ function compileCookieConfig(routeSchema, appConfig, models, schemas) {
 		if (targets.length > 1) {
 			let first;
 			for (const target of targets) {
-				const from = gathered();
+				const from = emptyGathered();
 				gather(target, from, field, path);
-				if ((first ??= unsigned(from)) !== unsigned(from)) throw unclear();
+				if ((first ??= signlessKey(from)) !== signlessKey(from)) throw badRefError();
 				foldConfig(into.config, from.config);
 				for (const name in from.fields) foldConfig(into.fields[name] ??= require_utils.nullObject(), from.fields[name]);
 			}
@@ -83,7 +78,7 @@ function compileCookieConfig(routeSchema, appConfig, models, schemas) {
 		if (schema["~kind"] === "Deferred") for (const operand of [].concat(schema.parameters?.[0])) gather(operand, into, field, path);
 		path.delete(schema);
 	};
-	const route = gathered();
+	const route = emptyGathered();
 	for (const root of roots) gather(root, route, void 0, /* @__PURE__ */ new Set());
 	const routeConfig = route.config;
 	const fieldConfigs = route.fields;
@@ -94,13 +89,13 @@ function compileCookieConfig(routeSchema, appConfig, models, schemas) {
 		...routeAttributes
 	} : appAttributes ?? routeAttributes ?? require_utils.nullObject();
 	if (!defaults.path) defaults.path = "/";
-	const rawSign = routeConfig?.sign ?? appConfig?.sign;
+	const rawSign = routeConfig.sign ?? appConfig?.sign;
 	let globalSign;
 	if (rawSign === void 0) globalSign = void 0;
 	else if (rawSign === true) globalSign = true;
 	else if (Array.isArray(rawSign)) globalSign = rawSign.length ? rawSign : void 0;
 	else globalSign = [rawSign];
-	const globalSecrets = routeConfig?.secrets !== void 0 ? routeConfig.secrets : appConfig?.secrets;
+	const globalSecrets = routeConfig.secrets !== void 0 ? routeConfig.secrets : appConfig?.secrets;
 	const fields = require_utils.nullObject();
 	let hasSign = false;
 	for (const name in fieldConfigs) {
@@ -132,10 +127,10 @@ function compileCookieConfig(routeSchema, appConfig, models, schemas) {
 		globalSecrets,
 		hasSign,
 		verify: appConfig?.verify ?? "lazy",
-		legacySignature: (routeConfig?.legacySignature ?? appConfig?.legacySignature) !== false
+		legacySignature: (routeConfig.legacySignature ?? appConfig?.legacySignature) !== false
 	};
 }
-const legacySignatureOf = (name, config) => config.fields[name]?.legacySignature ?? config.legacySignature;
+const acceptsLegacySignature = (name, config) => config.fields[name]?.legacySignature ?? config.legacySignature;
 function resolveSignSecrets(name, config) {
 	const field = config.fields[name];
 	if (field?.sign) return field.secrets ?? config.globalSecrets;
@@ -152,7 +147,7 @@ function isCookieSigned(name, config) {
 }
 
 //#endregion
+exports.acceptsLegacySignature = acceptsLegacySignature;
 exports.compileCookieConfig = compileCookieConfig;
 exports.isCookieSigned = isCookieSigned;
-exports.legacySignatureOf = legacySignatureOf;
 exports.resolveSignSecrets = resolveSignSecrets;

package/dist/cookie/config.mjs

@@ -1,3 +1,4 @@
+// @bun
 import { compositionKeys, nullObject, refTargets } from "../utils.mjs";
 import { InvalidCookie } from "./error.mjs";
 
@@ -15,35 +16,30 @@ const ATTRIBUTE_KEYS = new Set([
 ]);
 function getAttributes(source) {
 	if (!source) return;
-	const keys = Object.keys(source);
-	if (!keys.length) return;
 	let out;
-	for (const key of keys) if (ATTRIBUTE_KEYS.has(key)) {
-		out ??= nullObject();
-		out[key] = source[key];
-	}
+	for (const key of Object.keys(source)) if (ATTRIBUTE_KEYS.has(key)) (out ??= nullObject())[key] = source[key];
 	return out;
 }
 const hasUsableSecret = (secrets) => Array.isArray(secrets) ? secrets.some((s) => !!s?.trim()) : !!secrets?.trim();
-const gathered = () => ({
+const emptyGathered = () => ({
 	config: nullObject(),
 	fields: nullObject()
 });
-function canonical(config) {
+function comparableConfig(config) {
 	const out = nullObject();
-	for (const key of Object.keys(config).sort()) if (key !== "sign") out[key] = key === "secrets" ? asList(config[key]) : config[key];
+	for (const key of Object.keys(config).sort()) if (key !== "sign") out[key] = key === "secrets" ? listKey(config[key]) : config[key];
 	return out;
 }
-const unsigned = (from) => {
+const signlessKey = (from) => {
 	const fields = nullObject();
 	for (const name of Object.keys(from.fields).sort()) {
-		const field = canonical(from.fields[name]);
+		const field = comparableConfig(from.fields[name]);
 		if (Object.keys(field).length) fields[name] = field;
 	}
-	return JSON.stringify([canonical(from.config), fields]);
+	return JSON.stringify([comparableConfig(from.config), fields]);
 };
-const unclear = () => /* @__PURE__ */ new Error("[Elysia] Cookie schema `$ref` is unresolvable or ambiguous; use a model name or `$id` instead");
-const asList = (value) => JSON.stringify(typeof value === "string" ? [value] : value);
+const badRefError = () => /* @__PURE__ */ new Error("[Elysia] Cookie schema `$ref` is unresolvable or ambiguous; use a model name or `$id` instead");
+const listKey = (value) => JSON.stringify(typeof value === "string" ? [value] : value);
 function foldConfig(into, config) {
 	for (const key in config) {
 		const value = config[key];
@@ -51,19 +47,19 @@ function foldConfig(into, config) {
 		if (value === void 0) continue;
 		if (prev === void 0) into[key] = value;
 		else if (key === "sign") into.sign = prev === true || value === true || [].concat(prev, value);
-		else if ((key === "secrets" || key === "legacySignature") && asList(prev) !== asList(value)) throw new Error(`[Elysia] Merged cookie schemas disagree on \`${key}\``);
+		else if ((key === "secrets" || key === "legacySignature") && listKey(prev) !== listKey(value)) throw new Error(`[Elysia] Merged cookie schemas disagree on \`${key}\``);
 	}
 }
 function compileCookieConfig(routeSchema, appConfig, models, schemas) {
 	const roots = [routeSchema, ...(schemas ?? []).map((schema) => schema?.cookie).reverse()].map((schema) => typeof schema === "string" ? models?.[schema] : schema);
-	let targets;
-	const resolve = (name) => (targets ??= refTargets(roots, models))(name);
+	let findTargets;
+	const resolve = (name) => (findTargets ??= refTargets(roots, models))(name);
 	const gather = (schema, into, field, path) => {
 		if (!schema || path.has(schema)) return;
 		path.add(schema);
 		const ref = schema.$ref;
 		const targets = typeof ref === "string" ? [...resolve(ref)] : [ref];
-		if (typeof ref === "string" && !targets.length || schema.$dynamicRef !== void 0 || schema.$recursiveRef !== void 0) throw unclear();
+		if (typeof ref === "string" && !targets.length || schema.$dynamicRef !== void 0 || schema.$recursiveRef !== void 0) throw badRefError();
 		if (field === void 0) {
 			foldConfig(into.config, schema.config);
 			for (const name in schema.properties) gather(schema.properties[name], into, name, /* @__PURE__ */ new Set());
@@ -71,9 +67,9 @@ function compileCookieConfig(routeSchema, appConfig, models, schemas) {
 		if (targets.length > 1) {
 			let first;
 			for (const target of targets) {
-				const from = gathered();
+				const from = emptyGathered();
 				gather(target, from, field, path);
-				if ((first ??= unsigned(from)) !== unsigned(from)) throw unclear();
+				if ((first ??= signlessKey(from)) !== signlessKey(from)) throw badRefError();
 				foldConfig(into.config, from.config);
 				for (const name in from.fields) foldConfig(into.fields[name] ??= nullObject(), from.fields[name]);
 			}
@@ -82,7 +78,7 @@ function compileCookieConfig(routeSchema, appConfig, models, schemas) {
 		if (schema["~kind"] === "Deferred") for (const operand of [].concat(schema.parameters?.[0])) gather(operand, into, field, path);
 		path.delete(schema);
 	};
-	const route = gathered();
+	const route = emptyGathered();
 	for (const root of roots) gather(root, route, void 0, /* @__PURE__ */ new Set());
 	const routeConfig = route.config;
 	const fieldConfigs = route.fields;
@@ -93,13 +89,13 @@ function compileCookieConfig(routeSchema, appConfig, models, schemas) {
 		...routeAttributes
 	} : appAttributes ?? routeAttributes ?? nullObject();
 	if (!defaults.path) defaults.path = "/";
-	const rawSign = routeConfig?.sign ?? appConfig?.sign;
+	const rawSign = routeConfig.sign ?? appConfig?.sign;
 	let globalSign;
 	if (rawSign === void 0) globalSign = void 0;
 	else if (rawSign === true) globalSign = true;
 	else if (Array.isArray(rawSign)) globalSign = rawSign.length ? rawSign : void 0;
 	else globalSign = [rawSign];
-	const globalSecrets = routeConfig?.secrets !== void 0 ? routeConfig.secrets : appConfig?.secrets;
+	const globalSecrets = routeConfig.secrets !== void 0 ? routeConfig.secrets : appConfig?.secrets;
 	const fields = nullObject();
 	let hasSign = false;
 	for (const name in fieldConfigs) {
@@ -131,10 +127,10 @@ function compileCookieConfig(routeSchema, appConfig, models, schemas) {
 		globalSecrets,
 		hasSign,
 		verify: appConfig?.verify ?? "lazy",
-		legacySignature: (routeConfig?.legacySignature ?? appConfig?.legacySignature) !== false
+		legacySignature: (routeConfig.legacySignature ?? appConfig?.legacySignature) !== false
 	};
 }
-const legacySignatureOf = (name, config) => config.fields[name]?.legacySignature ?? config.legacySignature;
+const acceptsLegacySignature = (name, config) => config.fields[name]?.legacySignature ?? config.legacySignature;
 function resolveSignSecrets(name, config) {
 	const field = config.fields[name];
 	if (field?.sign) return field.secrets ?? config.globalSecrets;
@@ -151,4 +147,4 @@ function isCookieSigned(name, config) {
 }
 
 //#endregion
-export { compileCookieConfig, isCookieSigned, legacySignatureOf, resolveSignSecrets };
+export { acceptsLegacySignature, compileCookieConfig, isCookieSigned, resolveSignSecrets };

package/dist/cookie/cookie.mjs

@@ -1,3 +1,4 @@
+// @bun
 import { nullObject } from "../utils.mjs";
 import { resolvePendingCookie } from "./crypto.mjs";
 

package/dist/cookie/crypto.mjs

@@ -1,3 +1,4 @@
+// @bun
 import { constantTimeEqual, evictOldestHalf } from "../utils.mjs";
 import { InvalidCookie } from "./error.mjs";
 

package/dist/cookie/error.mjs

@@ -1,3 +1,4 @@
+// @bun
 import { isProduction } from "../universal/is-production.mjs";
 import { ElysiaError } from "../error.mjs";
 

package/dist/cookie/lib.mjs

@@ -1,3 +1,4 @@
+// @bun
 import { dangerousKeys } from "../constants.mjs";
 import { nullObject } from "../utils.mjs";
 import { InvalidCookie } from "./error.mjs";

package/dist/cookie/serialize.mjs

@@ -1,3 +1,4 @@
+// @bun
 import { isNotEmpty } from "../utils.mjs";
 import { serialize } from "./lib.mjs";
 

package/dist/cookie/types.mjs

@@ -1 +1,2 @@
+// @bun
 export {  };

package/dist/cookie/utils.d.ts

@@ -16,6 +16,6 @@ declare function parseCookieRawLazy(cookieString: string | null | undefined, con
 declare function parseCookieRaw(cookieString: string | null | undefined, config: CompiledCookieConfig, lazy?: 1): Promise<Record<string, unknown>>;
 declare function parseCookieRawSigned(cookieString: string | null | undefined, config: CompiledCookieConfig, lazy?: 1): Record<string, unknown>;
 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;
+declare function signCookieValues(cookies: Context['set']['cookie'] | undefined, config: CompiledCookieConfig, set?: Context['set']): Promise<void> | undefined;
 //#endregion
 export { buildCookieJar, hasSyncHmac, parseCookieRaw, parseCookieRawDeferred, parseCookieRawLazy, parseCookieRawSigned, parseCookieRawSync, signCookieValues };

package/dist/cookie/utils.js

@@ -43,13 +43,13 @@ function parseCookieRawLazy(cookieString, config) {
 	return out;
 }
 /**
-* Raw-record value of a signed cookie that failed verification on a lane that
-* can't verify on access (asynchronous HMAC, AOT); the jar rejects its first
-* read. A string key, not a module identity, so a second Elysia copy agrees.
-* Null-prototype, which `JSON.parse` never yields, so no cookie value a client
-* sends (unsigned, or accepted by a `null` rotation secret) can take its shape
+* Stands in for a signed cookie that failed verification on a lane that can't
+* verify on access (async HMAC, AOT); the jar rejects its first read.
+* String key so a second Elysia copy agrees; null-prototype, which
+* `JSON.parse` never yields, so no client-sent value (unsigned, or accepted by a
+* `null` rotation secret) can forge it
 */
-const invalidSignature = () => {
+const invalidSignatureMarker = () => {
 	const marker = require_utils.nullObject();
 	marker["~invalid"] = 1;
 	return marker;
@@ -66,10 +66,10 @@ async function parseCookieRaw(cookieString, config, lazy) {
 		let value = (0, deuri.default)(v) ?? v;
 		const signCheck = require_cookie_config.resolveSignSecrets(name, config);
 		if (signCheck !== void 0) try {
-			value = await require_cookie_crypto.unsignWithSecrets(name, value, signCheck, require_cookie_config.legacySignatureOf(name, config));
+			value = await require_cookie_crypto.unsignWithSecrets(name, value, signCheck, require_cookie_config.acceptsLegacySignature(name, config));
 		} catch (error) {
 			if (!lazy || !(error instanceof require_cookie_error.InvalidCookie)) throw error;
-			out[name] = invalidSignature();
+			out[name] = invalidSignatureMarker();
 			continue;
 		}
 		out[name] = require_cookie_crypto.maybeJsonDecode(value);
@@ -87,31 +87,38 @@ function parseCookieRawSigned(cookieString, config, lazy) {
 		let value = (0, deuri.default)(v) ?? v;
 		const signCheck = require_cookie_config.resolveSignSecrets(name, config);
 		if (signCheck !== void 0) try {
-			value = require_cookie_crypto.unsignWithSecretsSync(name, value, signCheck, require_cookie_config.legacySignatureOf(name, config));
+			value = require_cookie_crypto.unsignWithSecretsSync(name, value, signCheck, require_cookie_config.acceptsLegacySignature(name, config));
 		} catch (error) {
 			if (!lazy || !(error instanceof require_cookie_error.InvalidCookie)) throw error;
-			out[name] = invalidSignature();
+			out[name] = invalidSignatureMarker();
 			continue;
 		}
 		out[name] = require_cookie_crypto.maybeJsonDecode(value);
 	}
 	return out;
 }
-function buildCookieJar(set, raw, config, lazySign, deferDecode) {
-	const store = raw;
-	const materialized = require_utils.nullObject();
-	function materializeEntry(name) {
-		if (materialized[name]) return store[name];
+var CookieJarHandler = class {
+	constructor(setRef, config, lazySign, deferDecode) {
+		this.setRef = setRef;
+		this.config = config;
+		this.lazySign = lazySign;
+		this.deferDecode = deferDecode;
+		this.materialized = void 0;
+		this.cache = void 0;
+	}
+	materialize(store, name) {
+		if (this.materialized?.[name]) return store[name];
+		const config = this.config;
 		const rawValue = store[name];
 		const fieldDefaults = config.fields[name]?.defaults;
-		const entry = Object.assign(require_utils.nullObject(), config.defaults, fieldDefaults, { value: deferDecode ? require_cookie_crypto.maybeJsonDecode((0, deuri.default)(rawValue) ?? rawValue) : rawValue });
+		const entry = Object.assign(require_utils.nullObject(), config.defaults, fieldDefaults, { value: this.deferDecode ? require_cookie_crypto.maybeJsonDecode((0, deuri.default)(rawValue) ?? rawValue) : rawValue });
 		if (entry.expires instanceof Date) entry.expires = new Date(entry.expires.getTime());
 		if (rawValue?.["~invalid"] === 1 && Object.getPrototypeOf(rawValue) === null) entry["~unsign"] = 1;
-		else if (lazySign && typeof entry.value === "string") {
+		else if (this.lazySign && typeof entry.value === "string") {
 			const secrets = require_cookie_config.resolveSignSecrets(name, config);
 			if (secrets !== void 0) {
 				entry["~unsign"] = secrets;
-				if (!require_cookie_config.legacySignatureOf(name, config)) entry["~strict"] = 1;
+				if (!require_cookie_config.acceptsLegacySignature(name, config)) entry["~strict"] = 1;
 			}
 		} else {
 			const value = entry.value;
@@ -121,33 +128,33 @@ function buildCookieJar(set, raw, config, lazySign, deferDecode) {
 			}
 		}
 		store[name] = entry;
-		materialized[name] = 1;
+		(this.materialized ??= require_utils.nullObject())[name] = 1;
 		return entry;
 	}
-	const cache = require_utils.nullObject();
-	function settle(key) {
+	settle(store, key) {
 		if (!(key in store)) return;
-		const entry = materializeEntry(key);
+		const entry = this.materialize(store, key);
 		if ("~unsign" in entry) require_cookie_crypto.resolvePendingCookie(entry, key);
 	}
-	return new Proxy(store, {
-		get(_, key) {
-			return cache[key] ??= new require_cookie_cookie.Cookie(key, set, key in store ? materializeEntry(key) : Object.assign(require_utils.nullObject(), config.defaults, config.fields[key]?.defaults));
-		},
-		has(target, key) {
-			if (typeof key === "string") settle(key);
-			return Reflect.has(target, key);
-		},
-		ownKeys(target) {
-			const keys = Reflect.ownKeys(target);
-			for (let i = 0; i < keys.length; i++) settle(keys[i]);
-			return keys;
-		},
-		getOwnPropertyDescriptor(target, key) {
-			if (typeof key === "string") settle(key);
-			return Reflect.getOwnPropertyDescriptor(target, key);
-		}
-	});
+	get(store, key) {
+		return (this.cache ??= require_utils.nullObject())[key] ??= new require_cookie_cookie.Cookie(key, this.setRef, key in store ? this.materialize(store, key) : Object.assign(require_utils.nullObject(), this.config.defaults, this.config.fields[key]?.defaults));
+	}
+	has(store, key) {
+		if (typeof key === "string") this.settle(store, key);
+		return Reflect.has(store, key);
+	}
+	ownKeys(store) {
+		const keys = Reflect.ownKeys(store);
+		for (let i = 0; i < keys.length; i++) this.settle(store, keys[i]);
+		return keys;
+	}
+	getOwnPropertyDescriptor(store, key) {
+		if (typeof key === "string") this.settle(store, key);
+		return Reflect.getOwnPropertyDescriptor(store, key);
+	}
+};
+function buildCookieJar(set, raw, config, lazySign, deferDecode) {
+	return new Proxy(raw, new CookieJarHandler(set, config, lazySign, deferDecode));
 }
 function collectSignPending(cookies, config) {
 	if (!cookies || !config.hasSign) return;
@@ -174,12 +181,24 @@ function collectSignPending(cookies, config) {
 	}
 	return pending;
 }
-function dropSigned(cookies, config) {
-	for (const name in cookies) if (config.fields[name]?.sign || config.globalSign === true || config.globalSignSet?.has(name)) delete cookies[name];
+function dropSigned(cookies, config, set) {
+	if (set) Object.defineProperty(set, "~signFailed", {
+		value: true,
+		configurable: true
+	});
+	const signed = (name) => config.fields[name]?.sign || config.globalSign === true || config.globalSignSet?.has(name);
+	let kept = false;
+	for (const name in cookies) if (signed(name) && !Reflect.deleteProperty(cookies, name)) kept = true;
+	if (kept && set?.cookie === cookies) {
+		const copy = require_utils.nullObject();
+		for (const name in cookies) if (!signed(name)) copy[name] = cookies[name];
+		set.cookie = copy;
+	}
 }
-function signCookieValues(cookies, config) {
+function signCookieValues(cookies, config, set) {
 	let pending;
 	try {
+		if (set?.["~signFailed"]) throw new TypeError("A signed cookie of this request failed to sign");
 		pending = collectSignPending(cookies, config);
 		if (!pending) return;
 		if (require_cookie_crypto.hasSyncHmac) {
@@ -190,11 +209,11 @@ function signCookieValues(cookies, config) {
 			return;
 		}
 	} catch (error) {
-		dropSigned(cookies, config);
+		dropSigned(cookies, config, set);
 		throw error;
 	}
 	return signPending(pending).catch((error) => {
-		dropSigned(cookies, config);
+		dropSigned(cookies, config, set);
 		throw error;
 	});
 }