elysia 2.0.0-beta.2 → 2.0.0-beta.21

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');
 
@@ -17,58 +16,45 @@ const defer = {
 		return append;
 	}
 };
-function buildEmptyDecorator() {
+function buildDecorator(members) {
 	class Decorator {}
-	Object.assign(Decorator.prototype, {
-		status: require_error.status,
-		redirect: require_utils.redirect
-	});
+	Object.assign(Decorator.prototype, members);
 	Object.defineProperty(Decorator.prototype, "defer", defer);
 	return Decorator;
 }
+const buildEmptyDecorator = () => buildDecorator({
+	status: require_error.status,
+	problem: require_error.problem,
+	redirect: require_utils.redirect
+});
 function createBaseContext(app) {
 	const ext = app["~ext"];
 	const decorator = ext?.decorator;
 	const store = ext?.store;
 	if (!decorator && !store) return sharedEmptyDecorator ??= buildEmptyDecorator();
-	class Decorator {}
-	Object.assign(Decorator.prototype, {
+	return buildDecorator({
 		...decorator,
 		store,
 		status: require_error.status,
+		problem: require_error.problem,
 		redirect: require_utils.redirect
 	});
-	Object.defineProperty(Decorator.prototype, "defer", defer);
-	return Decorator;
 }
-function clearContextCache() {
+function clearContextCache(app) {
+	if (app !== void 0) {
+		contextCache.delete(app);
+		return;
+	}
 	contextCache = /* @__PURE__ */ new WeakMap();
 	sharedEmptyDecorator = null;
 	sharedEmptyContext = null;
 }
-const pathValue = Symbol("path");
-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[pathValue];
-		},
-		set(value) {
-			if (pathValue in this && !warnedPathMutation) {
-				warnedPathMutation = true;
-				console.warn("[elysia] context.path is readonly; request-hook rerouting will stop working in a future release.");
-			}
-			this[pathValue] = 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,
@@ -88,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 });
@@ -96,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,6 +1,5 @@
-import { flattenChain, isNotEmpty, nullObject, redirect } from "./utils.mjs";
-import { isProduction } from "./universal/is-production.mjs";
-import { status } from "./error.mjs";
+import { isNotEmpty, nullObject, redirect } from "./utils.mjs";
+import { problem, status } from "./error.mjs";
 import { defaultHeaders } from "./adapter/default-headers.mjs";
 
 //#region src/context.ts
@@ -16,58 +15,45 @@ const defer = {
 		return append;
 	}
 };
-function buildEmptyDecorator() {
+function buildDecorator(members) {
 	class Decorator {}
-	Object.assign(Decorator.prototype, {
-		status,
-		redirect
-	});
+	Object.assign(Decorator.prototype, members);
 	Object.defineProperty(Decorator.prototype, "defer", defer);
 	return Decorator;
 }
+const buildEmptyDecorator = () => buildDecorator({
+	status,
+	problem,
+	redirect
+});
 function createBaseContext(app) {
 	const ext = app["~ext"];
 	const decorator = ext?.decorator;
 	const store = ext?.store;
 	if (!decorator && !store) return sharedEmptyDecorator ??= buildEmptyDecorator();
-	class Decorator {}
-	Object.assign(Decorator.prototype, {
+	return buildDecorator({
 		...decorator,
 		store,
 		status,
+		problem,
 		redirect
 	});
-	Object.defineProperty(Decorator.prototype, "defer", defer);
-	return Decorator;
 }
-function clearContextCache() {
+function clearContextCache(app) {
+	if (app !== void 0) {
+		contextCache.delete(app);
+		return;
+	}
 	contextCache = /* @__PURE__ */ new WeakMap();
 	sharedEmptyDecorator = null;
 	sharedEmptyContext = null;
 }
-const pathValue = Symbol("path");
-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[pathValue];
-		},
-		set(value) {
-			if (pathValue in this && !warnedPathMutation) {
-				warnedPathMutation = true;
-				console.warn("[elysia] context.path is readonly; request-hook rerouting will stop working in a future release.");
-			}
-			this[pathValue] = 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,
@@ -87,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 });
@@ -95,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/config.d.ts

@@ -9,6 +9,7 @@ interface FieldCookieConfig {
   secrets?: string | null | (string | null)[];
   sign: boolean;
   defaults?: Partial<BaseCookie>;
+  legacySignature?: boolean;
 }
 interface CompiledCookieConfig {
   defaults: Partial<BaseCookie>;
@@ -18,8 +19,12 @@ interface CompiledCookieConfig {
   globalSecrets: string | null | (string | null)[] | undefined;
   hasSign: boolean;
   verify: 'lazy' | 'eager';
+  legacySignature: boolean;
 }
-declare function compileCookieConfig(routeSchema: AnySchema | undefined, appConfig: AppCookieConfig | undefined): 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 function resolveSignSecrets(name: string, config: CompiledCookieConfig): CompiledCookieConfig['globalSecrets'] | undefined;
 declare function isCookieSigned(name: string, config: CompiledCookieConfig): {
   signed: true;
@@ -28,4 +33,4 @@ declare function isCookieSigned(name: string, config: CompiledCookieConfig): {
   signed: false;
 };
 //#endregion
-export { AppCookieConfig, CompiledCookieConfig, FieldCookieConfig, compileCookieConfig, isCookieSigned, resolveSignSecrets };
+export { AppCookieConfig, CompiledCookieConfig, FieldCookieConfig, compileCookieConfig, isCookieSigned, legacySignatureOf, resolveSignSecrets };

package/dist/cookie/config.js

@@ -25,15 +25,68 @@ function getAttributes(source) {
 	}
 	return out;
 }
-function normalizeSign(sign) {
-	if (sign === void 0) return;
-	if (sign === true) return true;
-	if (Array.isArray(sign)) return sign.length ? sign : void 0;
-	return [sign];
+const hasUsableSecret = (secrets) => Array.isArray(secrets) ? secrets.some((s) => !!s?.trim()) : !!secrets?.trim();
+const gathered = () => ({
+	config: require_utils.nullObject(),
+	fields: require_utils.nullObject()
+});
+function canonical(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];
+	return out;
+}
+const unsigned = (from) => {
+	const fields = require_utils.nullObject();
+	for (const name of Object.keys(from.fields).sort()) {
+		const field = canonical(from.fields[name]);
+		if (Object.keys(field).length) fields[name] = field;
+	}
+	return JSON.stringify([canonical(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);
+function foldConfig(into, config) {
+	for (const key in config) {
+		const value = config[key];
+		const prev = into[key];
+		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}\``);
+	}
 }
-const hasUsableSecret = (secrets) => secrets == null ? false : Array.isArray(secrets) ? secrets.some((s) => s != null) : true;
-function compileCookieConfig(routeSchema, appConfig) {
-	const routeConfig = routeSchema?.config ?? void 0;
+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);
+	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 (field === void 0) {
+			foldConfig(into.config, schema.config);
+			for (const name in schema.properties) gather(schema.properties[name], into, name, /* @__PURE__ */ new Set());
+		} else if (schema.config) foldConfig(into.fields[field] ??= require_utils.nullObject(), schema.config);
+		if (targets.length > 1) {
+			let first;
+			for (const target of targets) {
+				const from = gathered();
+				gather(target, from, field, path);
+				if ((first ??= unsigned(from)) !== unsigned(from)) throw unclear();
+				foldConfig(into.config, from.config);
+				for (const name in from.fields) foldConfig(into.fields[name] ??= require_utils.nullObject(), from.fields[name]);
+			}
+		} else gather(targets[0], into, field, path);
+		for (const key of require_utils.compositionKeys) if (Array.isArray(schema[key])) for (const member of schema[key]) gather(member, into, field, path);
+		if (schema["~kind"] === "Deferred") for (const operand of [].concat(schema.parameters?.[0])) gather(operand, into, field, path);
+		path.delete(schema);
+	};
+	const route = gathered();
+	for (const root of roots) gather(root, route, void 0, /* @__PURE__ */ new Set());
+	const routeConfig = route.config;
+	const fieldConfigs = route.fields;
 	const appAttributes = getAttributes(appConfig);
 	const routeAttributes = getAttributes(routeConfig);
 	const defaults = appAttributes && routeAttributes ? {
@@ -41,20 +94,24 @@ function compileCookieConfig(routeSchema, appConfig) {
 		...routeAttributes
 	} : appAttributes ?? routeAttributes ?? require_utils.nullObject();
 	if (!defaults.path) defaults.path = "/";
-	const globalSign = normalizeSign(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 fields = require_utils.nullObject();
-	const properties = routeSchema?.properties;
 	let hasSign = false;
-	if (properties) for (const name in properties) {
-		const config = properties[name]?.config;
-		if (!config) continue;
-		const sign = !!config.secrets || config.sign === true;
+	for (const name in fieldConfigs) {
+		const config = fieldConfigs[name];
+		const sign = config.secrets != null || config.sign === true;
 		if (sign) hasSign = true;
 		fields[name] = {
 			secrets: config.secrets,
 			sign,
-			defaults: getAttributes(config)
+			defaults: getAttributes(config),
+			legacySignature: config.legacySignature
 		};
 	}
 	if (globalSign !== void 0) hasSign = true;
@@ -74,9 +131,11 @@ function compileCookieConfig(routeSchema, appConfig) {
 		globalSignSet: Array.isArray(globalSign) ? new Set(globalSign) : void 0,
 		globalSecrets,
 		hasSign,
-		verify: appConfig?.verify ?? "lazy"
+		verify: appConfig?.verify ?? "lazy",
+		legacySignature: (routeConfig?.legacySignature ?? appConfig?.legacySignature) !== false
 	};
 }
+const legacySignatureOf = (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;
@@ -95,4 +154,5 @@ function isCookieSigned(name, config) {
 //#endregion
 exports.compileCookieConfig = compileCookieConfig;
 exports.isCookieSigned = isCookieSigned;
+exports.legacySignatureOf = legacySignatureOf;
 exports.resolveSignSecrets = resolveSignSecrets;

package/dist/cookie/config.mjs

@@ -1,4 +1,4 @@
-import { nullObject } from "../utils.mjs";
+import { compositionKeys, nullObject, refTargets } from "../utils.mjs";
 import { InvalidCookie } from "./error.mjs";
 
 //#region src/cookie/config.ts
@@ -24,15 +24,68 @@ function getAttributes(source) {
 	}
 	return out;
 }
-function normalizeSign(sign) {
-	if (sign === void 0) return;
-	if (sign === true) return true;
-	if (Array.isArray(sign)) return sign.length ? sign : void 0;
-	return [sign];
+const hasUsableSecret = (secrets) => Array.isArray(secrets) ? secrets.some((s) => !!s?.trim()) : !!secrets?.trim();
+const gathered = () => ({
+	config: nullObject(),
+	fields: nullObject()
+});
+function canonical(config) {
+	const out = nullObject();
+	for (const key of Object.keys(config).sort()) if (key !== "sign") out[key] = key === "secrets" ? asList(config[key]) : config[key];
+	return out;
+}
+const unsigned = (from) => {
+	const fields = nullObject();
+	for (const name of Object.keys(from.fields).sort()) {
+		const field = canonical(from.fields[name]);
+		if (Object.keys(field).length) fields[name] = field;
+	}
+	return JSON.stringify([canonical(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);
+function foldConfig(into, config) {
+	for (const key in config) {
+		const value = config[key];
+		const prev = into[key];
+		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}\``);
+	}
 }
-const hasUsableSecret = (secrets) => secrets == null ? false : Array.isArray(secrets) ? secrets.some((s) => s != null) : true;
-function compileCookieConfig(routeSchema, appConfig) {
-	const routeConfig = routeSchema?.config ?? void 0;
+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);
+	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 (field === void 0) {
+			foldConfig(into.config, schema.config);
+			for (const name in schema.properties) gather(schema.properties[name], into, name, /* @__PURE__ */ new Set());
+		} else if (schema.config) foldConfig(into.fields[field] ??= nullObject(), schema.config);
+		if (targets.length > 1) {
+			let first;
+			for (const target of targets) {
+				const from = gathered();
+				gather(target, from, field, path);
+				if ((first ??= unsigned(from)) !== unsigned(from)) throw unclear();
+				foldConfig(into.config, from.config);
+				for (const name in from.fields) foldConfig(into.fields[name] ??= nullObject(), from.fields[name]);
+			}
+		} else gather(targets[0], into, field, path);
+		for (const key of compositionKeys) if (Array.isArray(schema[key])) for (const member of schema[key]) gather(member, into, field, path);
+		if (schema["~kind"] === "Deferred") for (const operand of [].concat(schema.parameters?.[0])) gather(operand, into, field, path);
+		path.delete(schema);
+	};
+	const route = gathered();
+	for (const root of roots) gather(root, route, void 0, /* @__PURE__ */ new Set());
+	const routeConfig = route.config;
+	const fieldConfigs = route.fields;
 	const appAttributes = getAttributes(appConfig);
 	const routeAttributes = getAttributes(routeConfig);
 	const defaults = appAttributes && routeAttributes ? {
@@ -40,20 +93,24 @@ function compileCookieConfig(routeSchema, appConfig) {
 		...routeAttributes
 	} : appAttributes ?? routeAttributes ?? nullObject();
 	if (!defaults.path) defaults.path = "/";
-	const globalSign = normalizeSign(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 fields = nullObject();
-	const properties = routeSchema?.properties;
 	let hasSign = false;
-	if (properties) for (const name in properties) {
-		const config = properties[name]?.config;
-		if (!config) continue;
-		const sign = !!config.secrets || config.sign === true;
+	for (const name in fieldConfigs) {
+		const config = fieldConfigs[name];
+		const sign = config.secrets != null || config.sign === true;
 		if (sign) hasSign = true;
 		fields[name] = {
 			secrets: config.secrets,
 			sign,
-			defaults: getAttributes(config)
+			defaults: getAttributes(config),
+			legacySignature: config.legacySignature
 		};
 	}
 	if (globalSign !== void 0) hasSign = true;
@@ -73,9 +130,11 @@ function compileCookieConfig(routeSchema, appConfig) {
 		globalSignSet: Array.isArray(globalSign) ? new Set(globalSign) : void 0,
 		globalSecrets,
 		hasSign,
-		verify: appConfig?.verify ?? "lazy"
+		verify: appConfig?.verify ?? "lazy",
+		legacySignature: (routeConfig?.legacySignature ?? appConfig?.legacySignature) !== false
 	};
 }
+const legacySignatureOf = (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;
@@ -92,4 +151,4 @@ function isCookieSigned(name, config) {
 }
 
 //#endregion
-export { compileCookieConfig, isCookieSigned, resolveSignSecrets };
+export { compileCookieConfig, isCookieSigned, legacySignatureOf, resolveSignSecrets };

package/dist/cookie/cookie.d.ts

@@ -10,10 +10,10 @@ declare class Cookie<T = any> implements BaseCookie {
   constructor(name: string, setRef: {
     cookie?: Record<string, BaseCookie>;
   }, initial?: Partial<BaseCookie>);
+  static isCookie(v: unknown): v is Cookie;
   get cookie(): BaseCookie;
   set cookie(jar: BaseCookie);
   protected get setCookie(): BaseCookie;
-  protected set setCookie(jar: BaseCookie);
   get value(): T;
   set value(value: T);
   update(config: Updater<Partial<BaseCookie>>): this;

package/dist/cookie/cookie.js

@@ -1,4 +1,5 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
+const require_utils = require('../utils.js');
 const require_cookie_crypto = require('./crypto.js');
 
 //#region src/cookie/cookie.ts
@@ -23,6 +24,9 @@ var Cookie = class {
 		this.#setRef = setRef;
 		this.#initial = initial;
 	}
+	static isCookie(v) {
+		return typeof v === "object" && v !== null && #name in v;
+	}
 	get #jar() {
 		return this.#setRef.cookie ??= Object.create(null);
 	}
@@ -41,9 +45,6 @@ var Cookie = class {
 		if (entry && "~unsign" in entry) require_cookie_crypto.resolvePendingCookie(entry, this.#name);
 		return entry;
 	}
-	set setCookie(jar) {
-		this.cookie = jar;
-	}
 	get value() {
 		const cookie = this.cookie;
 		const value = cookie.value;
@@ -56,22 +57,19 @@ var Cookie = class {
 	set value(value) {
 		if (this.cookie.value === value && (!value || typeof value !== "object")) return;
 		const j = this.#jar;
-		if (!(this.#name in j)) j[this.#name] = { ...this.#initial };
+		if (!(this.#name in j)) j[this.#name] = Object.assign(require_utils.nullObject(), this.#initial);
 		j[this.#name].value = value;
 	}
 	update(config) {
 		const cookie = Object.assign(this.cookie, typeof config === "function" ? config(this.cookie) : config);
 		delete cookie["~raw"];
-		this.setCookie = cookie;
+		this.cookie = cookie;
 		return this;
 	}
 	set(config) {
-		const cookie = Object.assign({
-			...this.#initial,
-			value: this.value
-		}, typeof config === "function" ? config(this.cookie) : config);
+		const cookie = Object.assign(require_utils.nullObject(), this.#initial, { value: this.value }, typeof config === "function" ? config(this.cookie) : config);
 		delete cookie["~raw"];
-		this.setCookie = cookie;
+		this.cookie = cookie;
 		return this;
 	}
 	remove() {

package/dist/cookie/cookie.mjs

@@ -1,3 +1,4 @@
+import { nullObject } from "../utils.mjs";
 import { resolvePendingCookie } from "./crypto.mjs";
 
 //#region src/cookie/cookie.ts
@@ -22,6 +23,9 @@ var Cookie = class {
 		this.#setRef = setRef;
 		this.#initial = initial;
 	}
+	static isCookie(v) {
+		return typeof v === "object" && v !== null && #name in v;
+	}
 	get #jar() {
 		return this.#setRef.cookie ??= Object.create(null);
 	}
@@ -40,9 +44,6 @@ var Cookie = class {
 		if (entry && "~unsign" in entry) resolvePendingCookie(entry, this.#name);
 		return entry;
 	}
-	set setCookie(jar) {
-		this.cookie = jar;
-	}
 	get value() {
 		const cookie = this.cookie;
 		const value = cookie.value;
@@ -55,22 +56,19 @@ var Cookie = class {
 	set value(value) {
 		if (this.cookie.value === value && (!value || typeof value !== "object")) return;
 		const j = this.#jar;
-		if (!(this.#name in j)) j[this.#name] = { ...this.#initial };
+		if (!(this.#name in j)) j[this.#name] = Object.assign(nullObject(), this.#initial);
 		j[this.#name].value = value;
 	}
 	update(config) {
 		const cookie = Object.assign(this.cookie, typeof config === "function" ? config(this.cookie) : config);
 		delete cookie["~raw"];
-		this.setCookie = cookie;
+		this.cookie = cookie;
 		return this;
 	}
 	set(config) {
-		const cookie = Object.assign({
-			...this.#initial,
-			value: this.value
-		}, typeof config === "function" ? config(this.cookie) : config);
+		const cookie = Object.assign(nullObject(), this.#initial, { value: this.value }, typeof config === "function" ? config(this.cookie) : config);
 		delete cookie["~raw"];
-		this.setCookie = cookie;
+		this.cookie = cookie;
 		return this;
 	}
 	remove() {

package/dist/cookie/crypto.d.ts

@@ -7,14 +7,15 @@ declare const signCookieSyncImpl: (val: string, secret: string) => string;
 declare const keyCache: Map<string, Promise<CryptoKey>>;
 declare function importSecretKey(secret: string): Promise<CryptoKey>;
 declare function signCookieSubtle(val: string, secret: string): Promise<string>;
-declare function signCookie(val: string, secret: string | null): Promise<string>;
-declare function signCookieSync(val: string, secret: string | null): string;
-declare function unsignCookie(input: string, secret: string | null): Promise<string | false>;
-declare function unsignCookieSync(input: string, secret: string | null): string | false;
-declare function unsignWithSecretsSync(name: string, value: unknown, secrets: string | null | (string | null)[] | undefined): string;
-declare function unsignWithSecrets(name: string, value: unknown, secrets: string | null | (string | null)[] | undefined): Promise<string>;
+declare const deriveSignKey: (secret: string, name: string) => string;
+declare function signCookie(val: string, secret: string | null, name?: string): Promise<string>;
+declare function signCookieSync(val: string, secret: string | null, name?: string): string;
+declare function unsignCookie(input: string, secret: string | null, name?: string): Promise<string | false>;
+declare function unsignCookieSync(input: string, secret: string | null, name?: string): string | false;
+declare function unsignWithSecretsSync(name: string, value: unknown, secrets: string | null | (string | null)[] | undefined, legacy?: boolean): string;
+declare function unsignWithSecrets(name: string, value: unknown, secrets: string | null | (string | null)[] | undefined, legacy?: boolean): Promise<string>;
 declare const rawJsonValue: WeakMap<object, string>;
 declare function maybeJsonDecode(value: unknown): any;
 declare function resolvePendingCookie(entry: Record<string, any>, name: string): void;
 //#endregion
-export { hasSyncHmac, hmacProvider, importSecretKey, keyCache, maybeJsonDecode, rawJsonValue, resolvePendingCookie, signCookie, signCookieBun, signCookieNode, signCookieSubtle, signCookieSync, signCookieSyncImpl, unsignCookie, unsignCookieSync, unsignWithSecrets, unsignWithSecretsSync };
+export { deriveSignKey, hasSyncHmac, hmacProvider, importSecretKey, keyCache, maybeJsonDecode, rawJsonValue, resolvePendingCookie, signCookie, signCookieBun, signCookieNode, signCookieSubtle, signCookieSync, signCookieSyncImpl, unsignCookie, unsignCookieSync, unsignWithSecrets, unsignWithSecretsSync };