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

package/dist/type/validator/validator-cache.js

@@ -1,10 +1,8 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
-const require_runtime = require('../../_virtual/_rolldown/runtime.js');
 const require_universal_constants = require('../../universal/constants.js');
 const require_utils = require('../../utils.js');
 const require_type_constants = require('../constants.js');
 const require_type_coerce = require('../coerce.js');
-let typebox_value = require("typebox/value");
 
 //#region src/type/validator/validator-cache.ts
 const DEFAULT_CACHE_LIMIT = 1024;
@@ -46,6 +44,13 @@ function walk(value, key, mode, state) {
 			if (!state.hasRef && value["$ref"]) state.hasRef = true;
 		}
 		if (!state.hasFileType && (elyTyp === require_type_constants.ELYSIA_TYPES.File || elyTyp === require_type_constants.ELYSIA_TYPES.Files)) state.hasFileType = true;
+		if (!state.hasCodec) {
+			const codec = value["~codec"];
+			if (codec !== null && typeof codec === "object" && "encode" in codec && "decode" in codec) {
+				state.hasCodec = true;
+				if (!state.forceKey) state.buildKey = false;
+			}
+		}
 		const toJSON = value.toJSON;
 		if (typeof toJSON === "function") value = toJSON.call(value, typeof key === "number" ? "" + key : key);
 	}
@@ -119,17 +124,17 @@ function walkArray(value, mode, state) {
 	return serialized + "]";
 }
 function computeSchemaMeta(schema, forceKey) {
-	const hasCodec = (0, typebox_value.HasCodec)(schema);
 	const state = {
 		isOpaque: false,
 		hasRef: false,
 		hasFileType: false,
+		hasCodec: false,
 		forceKey,
-		buildKey: forceKey || !hasCodec,
+		buildKey: true,
 		depth: 0
 	};
 	const key = walk(schema, "", NODE, state);
-	const special = hasCodec || state.isOpaque;
+	const special = state.hasCodec || state.isOpaque;
 	return {
 		special,
 		hasRef: state.hasRef,
@@ -137,8 +142,8 @@ function computeSchemaMeta(schema, forceKey) {
 		key: forceKey ? key : special ? "" : key
 	};
 }
-const schemaCacheKey = (schema) => computeSchemaMeta(schema, true).key;
 const mayHaveFileType = (schema) => !("~standard" in schema) && TypeBoxValidatorCache.meta(schema).hasFileType;
+let clearWeak;
 var TypeBoxValidatorCache = class TypeBoxValidatorCache {
 	static {
 		this.EMPTY = require_utils.nullObject();
@@ -175,17 +180,18 @@ var TypeBoxValidatorCache = class TypeBoxValidatorCache {
 	constructor(gcTime = DEFAULT_GC_TIME) {
 		this.#gcTime = gcTime;
 	}
-	#scheduleClear() {
-		if (require_universal_constants.isCloudflareWorker) return;
-		if (this.#gc) clearTimeout(this.#gc);
-		this.#gc = setTimeout(() => this.clear(), this.#gcTime);
-		this.#gc.unref?.();
-	}
 	get(schema, coercions = TypeBoxValidatorCache.EMPTY, normalize = "", models) {
 		const meta = TypeBoxValidatorCache.meta(schema);
 		normalize += TypeBoxValidatorCache.#modelsToken(models, meta.hasRef);
-		const refBucket = this.#referenceCache.get(schema)?.get(normalize);
-		if (refBucket?.has(coercions)) return refBucket.get(coercions);
+		const byNormalize = this.#referenceCache.get(schema);
+		const refBucket = byNormalize?.get(normalize);
+		if (refBucket?.has(coercions)) {
+			if (byNormalize.size >= DEFAULT_CACHE_LIMIT) {
+				byNormalize.delete(normalize);
+				byNormalize.set(normalize, refBucket);
+			}
+			return refBucket.get(coercions);
+		}
 		if (meta.special) return;
 		const key = meta.key + "\0" + normalize;
 		const coercionsCache = this.#cache.get(key);
@@ -197,35 +203,46 @@ var TypeBoxValidatorCache = class TypeBoxValidatorCache {
 			if (coercionsCache.has(coercions)) return coercionsCache.get(coercions);
 		}
 	}
-	#refBucket(schema) {
+	#setRefBucket(schema, normalize, cache) {
 		let byNormalize = this.#referenceCache.get(schema);
 		if (!byNormalize) {
 			byNormalize = /* @__PURE__ */ new Map();
 			this.#referenceCache.set(schema, byNormalize);
 		}
-		return byNormalize;
+		if (!byNormalize.has(normalize) && byNormalize.size >= DEFAULT_CACHE_LIMIT) require_utils.evictOldestHalf(byNormalize);
+		byNormalize.set(normalize, cache);
 	}
 	set(schema, coercions = TypeBoxValidatorCache.EMPTY, validator, normalize = "", models) {
-		this.#scheduleClear();
+		if (!require_universal_constants.isCloudflareWorker) {
+			if (this.#gc) clearTimeout(this.#gc);
+			this.#gc = setTimeout(clearWeak ??= (() => {
+				try {
+					return Function("r", "r.deref()?.clear()");
+				} catch {
+					return (ref) => ref.deref()?.clear();
+				}
+			})(), this.#gcTime, new WeakRef(this));
+			this.#gc.unref?.();
+		}
 		const meta = TypeBoxValidatorCache.meta(schema);
 		normalize += TypeBoxValidatorCache.#modelsToken(models, meta.hasRef);
 		if (meta.special) {
 			const cache = (/* @__PURE__ */ new WeakMap()).set(coercions, validator);
-			this.#refBucket(schema).set(normalize, cache);
+			this.#setRefBucket(schema, normalize, cache);
 			return;
 		}
 		const key = meta.key + "\0" + normalize;
 		if (this.#cache.has(key)) {
 			const cache = this.#cache.get(key).set(coercions, validator);
-			const byNormalize = this.#refBucket(schema);
-			if (byNormalize.has(normalize)) byNormalize.get(normalize).set(coercions, validator);
-			else byNormalize.set(normalize, cache);
+			const byNormalize = this.#referenceCache.get(schema);
+			if (byNormalize?.has(normalize)) byNormalize.get(normalize).set(coercions, validator);
+			else this.#setRefBucket(schema, normalize, cache);
 			return;
 		}
 		if (this.#cache.size >= DEFAULT_CACHE_LIMIT) require_utils.evictOldestHalf(this.#cache);
 		const cache = (/* @__PURE__ */ new WeakMap()).set(coercions, validator);
 		this.#cache.set(key, cache);
-		this.#refBucket(schema).set(normalize, cache);
+		this.#setRefBucket(schema, normalize, cache);
 	}
 	clear() {
 		if (this.#gc) {
@@ -242,6 +259,6 @@ var TypeBoxValidatorCache = class TypeBoxValidatorCache {
 
 //#endregion
 exports.TypeBoxValidatorCache = TypeBoxValidatorCache;
+exports.computeSchemaMeta = computeSchemaMeta;
 exports.fnKey = fnKey;
-exports.mayHaveFileType = mayHaveFileType;
-exports.schemaCacheKey = schemaCacheKey;
+exports.mayHaveFileType = mayHaveFileType;

package/dist/type/validator/validator-cache.mjs

@@ -2,7 +2,6 @@ import { isCloudflareWorker } from "../../universal/constants.mjs";
 import { evictOldestHalf, nullObject } from "../../utils.mjs";
 import { ELYSIA_TYPES } from "../constants.mjs";
 import { deferCoercions } from "../coerce.mjs";
-import { HasCodec } from "typebox/value";
 
 //#region src/type/validator/validator-cache.ts
 const DEFAULT_CACHE_LIMIT = 1024;
@@ -44,6 +43,13 @@ function walk(value, key, mode, state) {
 			if (!state.hasRef && value["$ref"]) state.hasRef = true;
 		}
 		if (!state.hasFileType && (elyTyp === ELYSIA_TYPES.File || elyTyp === ELYSIA_TYPES.Files)) state.hasFileType = true;
+		if (!state.hasCodec) {
+			const codec = value["~codec"];
+			if (codec !== null && typeof codec === "object" && "encode" in codec && "decode" in codec) {
+				state.hasCodec = true;
+				if (!state.forceKey) state.buildKey = false;
+			}
+		}
 		const toJSON = value.toJSON;
 		if (typeof toJSON === "function") value = toJSON.call(value, typeof key === "number" ? "" + key : key);
 	}
@@ -117,17 +123,17 @@ function walkArray(value, mode, state) {
 	return serialized + "]";
 }
 function computeSchemaMeta(schema, forceKey) {
-	const hasCodec = HasCodec(schema);
 	const state = {
 		isOpaque: false,
 		hasRef: false,
 		hasFileType: false,
+		hasCodec: false,
 		forceKey,
-		buildKey: forceKey || !hasCodec,
+		buildKey: true,
 		depth: 0
 	};
 	const key = walk(schema, "", NODE, state);
-	const special = hasCodec || state.isOpaque;
+	const special = state.hasCodec || state.isOpaque;
 	return {
 		special,
 		hasRef: state.hasRef,
@@ -135,8 +141,8 @@ function computeSchemaMeta(schema, forceKey) {
 		key: forceKey ? key : special ? "" : key
 	};
 }
-const schemaCacheKey = (schema) => computeSchemaMeta(schema, true).key;
 const mayHaveFileType = (schema) => !("~standard" in schema) && TypeBoxValidatorCache.meta(schema).hasFileType;
+let clearWeak;
 var TypeBoxValidatorCache = class TypeBoxValidatorCache {
 	static {
 		this.EMPTY = nullObject();
@@ -173,17 +179,18 @@ var TypeBoxValidatorCache = class TypeBoxValidatorCache {
 	constructor(gcTime = DEFAULT_GC_TIME) {
 		this.#gcTime = gcTime;
 	}
-	#scheduleClear() {
-		if (isCloudflareWorker) return;
-		if (this.#gc) clearTimeout(this.#gc);
-		this.#gc = setTimeout(() => this.clear(), this.#gcTime);
-		this.#gc.unref?.();
-	}
 	get(schema, coercions = TypeBoxValidatorCache.EMPTY, normalize = "", models) {
 		const meta = TypeBoxValidatorCache.meta(schema);
 		normalize += TypeBoxValidatorCache.#modelsToken(models, meta.hasRef);
-		const refBucket = this.#referenceCache.get(schema)?.get(normalize);
-		if (refBucket?.has(coercions)) return refBucket.get(coercions);
+		const byNormalize = this.#referenceCache.get(schema);
+		const refBucket = byNormalize?.get(normalize);
+		if (refBucket?.has(coercions)) {
+			if (byNormalize.size >= DEFAULT_CACHE_LIMIT) {
+				byNormalize.delete(normalize);
+				byNormalize.set(normalize, refBucket);
+			}
+			return refBucket.get(coercions);
+		}
 		if (meta.special) return;
 		const key = meta.key + "\0" + normalize;
 		const coercionsCache = this.#cache.get(key);
@@ -195,35 +202,46 @@ var TypeBoxValidatorCache = class TypeBoxValidatorCache {
 			if (coercionsCache.has(coercions)) return coercionsCache.get(coercions);
 		}
 	}
-	#refBucket(schema) {
+	#setRefBucket(schema, normalize, cache) {
 		let byNormalize = this.#referenceCache.get(schema);
 		if (!byNormalize) {
 			byNormalize = /* @__PURE__ */ new Map();
 			this.#referenceCache.set(schema, byNormalize);
 		}
-		return byNormalize;
+		if (!byNormalize.has(normalize) && byNormalize.size >= DEFAULT_CACHE_LIMIT) evictOldestHalf(byNormalize);
+		byNormalize.set(normalize, cache);
 	}
 	set(schema, coercions = TypeBoxValidatorCache.EMPTY, validator, normalize = "", models) {
-		this.#scheduleClear();
+		if (!isCloudflareWorker) {
+			if (this.#gc) clearTimeout(this.#gc);
+			this.#gc = setTimeout(clearWeak ??= (() => {
+				try {
+					return Function("r", "r.deref()?.clear()");
+				} catch {
+					return (ref) => ref.deref()?.clear();
+				}
+			})(), this.#gcTime, new WeakRef(this));
+			this.#gc.unref?.();
+		}
 		const meta = TypeBoxValidatorCache.meta(schema);
 		normalize += TypeBoxValidatorCache.#modelsToken(models, meta.hasRef);
 		if (meta.special) {
 			const cache = (/* @__PURE__ */ new WeakMap()).set(coercions, validator);
-			this.#refBucket(schema).set(normalize, cache);
+			this.#setRefBucket(schema, normalize, cache);
 			return;
 		}
 		const key = meta.key + "\0" + normalize;
 		if (this.#cache.has(key)) {
 			const cache = this.#cache.get(key).set(coercions, validator);
-			const byNormalize = this.#refBucket(schema);
-			if (byNormalize.has(normalize)) byNormalize.get(normalize).set(coercions, validator);
-			else byNormalize.set(normalize, cache);
+			const byNormalize = this.#referenceCache.get(schema);
+			if (byNormalize?.has(normalize)) byNormalize.get(normalize).set(coercions, validator);
+			else this.#setRefBucket(schema, normalize, cache);
 			return;
 		}
 		if (this.#cache.size >= DEFAULT_CACHE_LIMIT) evictOldestHalf(this.#cache);
 		const cache = (/* @__PURE__ */ new WeakMap()).set(coercions, validator);
 		this.#cache.set(key, cache);
-		this.#refBucket(schema).set(normalize, cache);
+		this.#setRefBucket(schema, normalize, cache);
 	}
 	clear() {
 		if (this.#gc) {
@@ -239,4 +257,4 @@ var TypeBoxValidatorCache = class TypeBoxValidatorCache {
 };
 
 //#endregion
-export { TypeBoxValidatorCache, fnKey, mayHaveFileType, schemaCacheKey };
+export { TypeBoxValidatorCache, computeSchemaMeta, fnKey, mayHaveFileType };