@atscript/typescript 0.1.40 → 0.1.42

package/dist/cli.cjs

@@ -688,27 +688,26 @@ else obj[key] = value;
 }
 const regexCache = new Map();
 var Validator = class {
-	isLimitExceeded() {
-		if (this.stackErrors.length > 0) {
-			const top = this.stackErrors[this.stackErrors.length - 1];
-			return top !== null && top.length >= this.opts.errorLimit;
-		}
-		return this.errors.length >= this.opts.errorLimit;
+	buildPath() {
+		if (this.depth <= 0) return "";
+		let path$4 = this.pathSegments[0];
+		for (let i = 1; i < this.depth; i++) path$4 += `.${this.pathSegments[i]}`;
+		return path$4;
 	}
 	push(name) {
-		this.stackPath.push(name);
+		this.pathSegments[this.depth] = name;
+		this.depth++;
 		this.stackErrors.push(null);
-		this.cachedPath = this.stackPath.length <= 1 ? "" : this.stackPath[1] + (this.stackPath.length > 2 ? "." + this.stackPath.slice(2).join(".") : "");
 	}
 	pop(saveErrors) {
-		this.stackPath.pop();
+		this.depth--;
 		const popped = this.stackErrors.pop();
 		if (saveErrors && popped !== null && popped !== undefined && popped.length > 0) for (const err of popped) this.error(err.message, err.path, err.details);
-		this.cachedPath = this.stackPath.length <= 1 ? "" : this.stackPath[1] + (this.stackPath.length > 2 ? "." + this.stackPath.slice(2).join(".") : "");
 		return popped;
 	}
 	clear() {
 		this.stackErrors[this.stackErrors.length - 1] = null;
+		if (this.limitExceeded) this.limitExceeded = false;
 	}
 	error(message, path$4, details) {
 		let errors = this.stackErrors[this.stackErrors.length - 1];
@@ -717,11 +716,12 @@ var Validator = class {
 			this.stackErrors[this.stackErrors.length - 1] = errors;
 		} else errors = this.errors;
 		const error = {
-			path: path$4 || this.cachedPath,
+			path: path$4 || this.buildPath(),
 			message
 		};
 		if (details?.length) error.details = details;
 		errors.push(error);
+		if (errors.length >= this.opts.errorLimit) this.limitExceeded = true;
 	}
 	throw() {
 		throw new ValidatorError(this.errors);
@@ -738,12 +738,11 @@ var Validator = class {
 	* @throws {ValidatorError} When validation fails and `safe` is not `true`.
 	*/ validate(value, safe, context) {
 		this.errors = [];
-		this.stackErrors = [];
-		this.stackPath = [""];
-		this.cachedPath = "";
+		this.stackErrors.length = 0;
+		this.depth = 0;
+		this.limitExceeded = false;
 		this.context = context;
 		const passed = this.validateSafe(this.def, value);
-		this.pop(!passed);
 		this.context = undefined;
 		if (!passed) {
 			if (safe) return false;
@@ -752,18 +751,24 @@ var Validator = class {
 		return true;
 	}
 	validateSafe(def, value) {
-		if (this.isLimitExceeded()) return false;
-		if (!isAnnotatedType(def)) throw new Error("Can not validate not-annotated type");
-		if (typeof this.opts.replace === "function") def = this.opts.replace(def, this.cachedPath);
+		if (this.limitExceeded) return false;
+		if (this.hasReplace) {
+			let replaced = this.replaceCache.get(def);
+			if (replaced === undefined) {
+				replaced = this.opts.replace(def, this.buildPath());
+				this.replaceCache.set(def, replaced);
+			}
+			def = replaced;
+		}
 		if (def.optional && (value === undefined || value === null)) return true;
-		for (const plugin of this.opts.plugins) {
+		if (this.hasPlugins) for (const plugin of this.opts.plugins) {
 			const result = plugin(this, def, value);
 			if (result === false || result === true) return result;
 		}
 		return this.validateAnnotatedType(def, value);
 	}
 	get path() {
-		return this.cachedPath;
+		return this.buildPath();
 	}
 	validateAnnotatedType(def, value) {
 		switch (def.type.kind) {
@@ -780,21 +785,21 @@ var Validator = class {
 		}
 	}
 	validateUnion(def, value) {
-		let i = 0;
-		const popped = [];
-		for (const item of def.type.items) {
-			this.push(`[${item.type.kind || item.type.designType}(${i})]`);
+		const items = def.type.items;
+		let details;
+		for (const item of items) {
+			this.stackErrors.push(null);
 			if (this.validateSafe(item, value)) {
-				this.pop(false);
+				this.stackErrors.pop();
 				return true;
 			}
-			const errors = this.pop(false);
-			if (errors) popped.push(...errors);
-			i++;
+			const branchErrors = this.stackErrors.pop();
+			if (this.limitExceeded) this.limitExceeded = false;
+			if (branchErrors) if (details) for (const err of branchErrors) details.push(err);
+else details = branchErrors;
 		}
-		this.clear();
-		const expected = def.type.items.map((item, i$1) => `[${item.type.kind || item.type.designType}(${i$1})]`).join(", ");
-		this.error(`Value does not match any of the allowed types: ${expected}`, undefined, popped);
+		const expected = items.map((item, i) => `[${item.type.kind || item.type.designType}(${i})]`).join(", ");
+		this.error(`Value does not match any of the allowed types: ${expected}`, undefined, details);
 		return false;
 	}
 	validateIntersection(def, value) {
@@ -872,7 +877,7 @@ var Validator = class {
 			if (!this.validateSafe(def.type.of, item)) {
 				passed = false;
 				this.pop(true);
-				if (this.isLimitExceeded()) return false;
+				if (this.limitExceeded) return false;
 			} else this.pop(false);
 			i++;
 		}
@@ -884,67 +889,72 @@ var Validator = class {
 			return false;
 		}
 		let passed = true;
-		const valueKeys = new Set(Object.keys(value));
-		const typeKeys = new Set();
+		let keysToStrip;
 		let skipList;
 		if (this.opts.skipList) {
-			const path$4 = this.stackPath.length > 1 ? `${this.cachedPath}.` : "";
+			const path$4 = this.depth > 0 ? `${this.buildPath()}.` : "";
 			for (const item of this.opts.skipList) if (item.startsWith(path$4)) {
 				const key = item.slice(path$4.length);
 				if (!skipList) skipList = new Set();
 				skipList.add(key);
-				valueKeys.delete(key);
 			}
 		}
 		let partialFunctionMatched = false;
-		if (typeof this.opts.partial === "function") partialFunctionMatched = this.opts.partial(def, this.cachedPath);
+		if (typeof this.opts.partial === "function") partialFunctionMatched = this.opts.partial(def, this.buildPath());
 		for (const [key, item] of def.type.props.entries()) {
 			if (skipList && skipList.has(key) || isPhantomType(item)) continue;
-			typeKeys.add(key);
 			if (value[key] === undefined) {
-				if (partialFunctionMatched || this.opts.partial === "deep" || this.opts.partial === true && this.stackPath.length <= 1) continue;
+				if (partialFunctionMatched || this.opts.partial === "deep" || this.opts.partial === true && this.depth === 0) continue;
 			}
 			this.push(key);
 			if (this.validateSafe(item, value[key])) this.pop(false);
 else {
 				passed = false;
 				this.pop(true);
-				if (this.isLimitExceeded()) return false;
-			}
-		}
-		for (const key of valueKeys)
- /** matched patterns for unknown keys */ if (!typeKeys.has(key)) {
-			const matched = [];
-			for (const { pattern, def: propDef } of def.type.propsPatterns) if (pattern.test(key)) matched.push({
-				pattern,
-				def: propDef
-			});
-			if (matched.length > 0) {
-				this.push(key);
-				let keyPassed = false;
-				for (const { def: propDef } of matched) {
-					if (this.validateSafe(propDef, value[key])) {
-						keyPassed = true;
-						break;
+				if (this.limitExceeded) return false;
+			}
+		}
+		const hasPatterns = def.type.propsPatterns.length > 0;
+		if (this.opts.unknownProps !== "ignore" || hasPatterns) {
+			const keys = Object.keys(value);
+			for (const key of keys) {
+				if (skipList && skipList.has(key)) continue;
+				const knownProp = def.type.props.get(key);
+				if (knownProp && !isPhantomType(knownProp)) continue;
+				const matched = [];
+				for (const { pattern, def: propDef } of def.type.propsPatterns) if (pattern.test(key)) matched.push({
+					pattern,
+					def: propDef
+				});
+				if (matched.length > 0) {
+					this.push(key);
+					let keyPassed = false;
+					for (const { def: propDef } of matched) {
+						if (this.validateSafe(propDef, value[key])) {
+							keyPassed = true;
+							break;
+						}
+						this.clear();
 					}
-					this.clear();
-				}
-				if (!keyPassed) {
-					this.validateSafe(matched[0].def, value[key]);
-					this.pop(true);
-					passed = false;
-					if (this.isLimitExceeded()) return false;
-				} else this.pop(false);
-			} else if (this.opts.unknownProps !== "ignore") {
-				if (this.opts.unknownProps === "error") {
+					if (!keyPassed) {
+						this.validateSafe(matched[0].def, value[key]);
+						this.pop(true);
+						passed = false;
+						if (this.limitExceeded) return false;
+					} else this.pop(false);
+				} else if (this.opts.unknownProps === "error") {
 					this.push(key);
 					this.error(`Unexpected property`);
 					this.pop(true);
-					if (this.isLimitExceeded()) return false;
+					if (this.limitExceeded) return false;
 					passed = false;
-				} else if (this.opts.unknownProps === "strip") delete value[key];
+				} else if (this.opts.unknownProps === "strip") {
+					if (!keysToStrip) keysToStrip = [];
+					keysToStrip.push(key);
+				}
 			}
 		}
+		if (passed && keysToStrip) for (const key of keysToStrip) delete value[key];
 		return passed;
 	}
 	validatePrimitive(def, value) {
@@ -1008,6 +1018,7 @@ else {
 		}
 	}
 	validateString(def, value) {
+		if (def.metadata.size === 0) return true;
 		const filled = def.metadata.get("meta.required");
 		if (filled) {
 			if (value.trim().length === 0) {
@@ -1051,6 +1062,7 @@ else {
 		return true;
 	}
 	validateNumber(def, value) {
+		if (def.metadata.size === 0) return true;
 		const int = def.metadata.get("expect.int");
 		if (int && value % 1 !== 0) {
 			const message = typeof int === "object" && int.message ? int.message : `Expected integer, got ${value}`;
@@ -1078,6 +1090,7 @@ else {
 		return true;
 	}
 	validateBoolean(def, value) {
+		if (def.metadata.size === 0) return true;
 		const filled = def.metadata.get("meta.required");
 		if (filled) {
 			if (value !== true) {
@@ -1091,16 +1104,21 @@ else {
 	constructor(def, opts) {
 		_define_property$4(this, "def", void 0);
 		_define_property$4(this, "opts", void 0);
+		_define_property$4(this, "hasPlugins", void 0);
+		_define_property$4(this, "hasReplace", void 0);
+		_define_property$4(this, "replaceCache", void 0);
 		/** Validation errors collected during the last {@link validate} call. */ _define_property$4(this, "errors", void 0);
 		_define_property$4(this, "stackErrors", void 0);
-		_define_property$4(this, "stackPath", void 0);
-		_define_property$4(this, "cachedPath", void 0);
+		_define_property$4(this, "pathSegments", void 0);
+		_define_property$4(this, "depth", void 0);
+		_define_property$4(this, "limitExceeded", void 0);
 		_define_property$4(this, "context", void 0);
 		this.def = def;
 		this.errors = [];
 		this.stackErrors = [];
-		this.stackPath = [];
-		this.cachedPath = "";
+		this.pathSegments = [];
+		this.depth = 0;
+		this.limitExceeded = false;
 		this.opts = {
 			partial: false,
 			unknownProps: "error",
@@ -1108,6 +1126,9 @@ else {
 			...opts,
 			plugins: opts?.plugins || []
 		};
+		this.hasPlugins = this.opts.plugins.length > 0;
+		this.hasReplace = typeof this.opts.replace === "function";
+		if (this.hasReplace) this.replaceCache = new WeakMap();
 	}
 };
 var ValidatorError = class extends Error {
@@ -2426,7 +2447,7 @@ const BANNER = DYE_COLORS.cyan(`
 const PLAN_HEADER = [
 	"",
 	DYE_COLORS.bold("╔══════════════════════════════════════╗"),
-	DYE_COLORS.bold("║        Schema Sync Plan              ║"),
+	DYE_COLORS.bold("║           Schema Sync Plan           ║"),
 	DYE_COLORS.bold("╚══════════════════════════════════════╝"),
 	""
 ];
@@ -2515,7 +2536,7 @@ var DbSyncController = class {
 		}
 		this.printer.typeCount(dbTypes.length);
 		this.printer.banner();
-		const { SchemaSync } = await this.importFromCwd("@atscripthttps://db.atscript.dev/sync", true);
+		const { SchemaSync } = await this.importFromCwd("@atscript/db/sync", true);
 		const sync = new SchemaSync(dbSpace);
 		const plan = await sync.plan(dbTypes, {
 			force,

package/dist/index.cjs

@@ -23,7 +23,7 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 }) : target, mod));
 
 //#endregion
-const require_json_schema = require('./json-schema-B55uxKNQ.cjs');
+const require_json_schema = require('./json-schema-Bu4xgpQn.cjs');
 const path = __toESM(require("path"));
 const __atscript_core = __toESM(require("@atscript/core"));
 

package/dist/index.mjs

@@ -1,4 +1,4 @@
-import { buildJsonSchema, defineAnnotatedType } from "./json-schema-DaFltW4t.mjs";
+import { buildJsonSchema, defineAnnotatedType } from "./json-schema-Bl8jkrCj.mjs";
 import path from "path";
 import { DEFAULT_FORMAT, flattenInterfaceNode, hasNavPropAnnotation, isArray, isConst, isGroup, isInterface, isPrimitive, isQueryLogical, isRef, isStructure } from "@atscript/core";
 

package/dist/{json-schema-DaFltW4t.mjs → json-schema-Bl8jkrCj.mjs}

@@ -12,27 +12,26 @@ else obj[key] = value;
 }
 const regexCache = new Map();
 var Validator = class {
-	isLimitExceeded() {
-		if (this.stackErrors.length > 0) {
-			const top = this.stackErrors[this.stackErrors.length - 1];
-			return top !== null && top.length >= this.opts.errorLimit;
-		}
-		return this.errors.length >= this.opts.errorLimit;
+	buildPath() {
+		if (this.depth <= 0) return "";
+		let path = this.pathSegments[0];
+		for (let i = 1; i < this.depth; i++) path += `.${this.pathSegments[i]}`;
+		return path;
 	}
 	push(name) {
-		this.stackPath.push(name);
+		this.pathSegments[this.depth] = name;
+		this.depth++;
 		this.stackErrors.push(null);
-		this.cachedPath = this.stackPath.length <= 1 ? "" : this.stackPath[1] + (this.stackPath.length > 2 ? "." + this.stackPath.slice(2).join(".") : "");
 	}
 	pop(saveErrors) {
-		this.stackPath.pop();
+		this.depth--;
 		const popped = this.stackErrors.pop();
 		if (saveErrors && popped !== null && popped !== undefined && popped.length > 0) for (const err of popped) this.error(err.message, err.path, err.details);
-		this.cachedPath = this.stackPath.length <= 1 ? "" : this.stackPath[1] + (this.stackPath.length > 2 ? "." + this.stackPath.slice(2).join(".") : "");
 		return popped;
 	}
 	clear() {
 		this.stackErrors[this.stackErrors.length - 1] = null;
+		if (this.limitExceeded) this.limitExceeded = false;
 	}
 	error(message, path, details) {
 		let errors = this.stackErrors[this.stackErrors.length - 1];
@@ -41,11 +40,12 @@ var Validator = class {
 			this.stackErrors[this.stackErrors.length - 1] = errors;
 		} else errors = this.errors;
 		const error = {
-			path: path || this.cachedPath,
+			path: path || this.buildPath(),
 			message
 		};
 		if (details?.length) error.details = details;
 		errors.push(error);
+		if (errors.length >= this.opts.errorLimit) this.limitExceeded = true;
 	}
 	throw() {
 		throw new ValidatorError(this.errors);
@@ -62,12 +62,11 @@ var Validator = class {
 	* @throws {ValidatorError} When validation fails and `safe` is not `true`.
 	*/ validate(value, safe, context) {
 		this.errors = [];
-		this.stackErrors = [];
-		this.stackPath = [""];
-		this.cachedPath = "";
+		this.stackErrors.length = 0;
+		this.depth = 0;
+		this.limitExceeded = false;
 		this.context = context;
 		const passed = this.validateSafe(this.def, value);
-		this.pop(!passed);
 		this.context = undefined;
 		if (!passed) {
 			if (safe) return false;
@@ -76,18 +75,24 @@ var Validator = class {
 		return true;
 	}
 	validateSafe(def, value) {
-		if (this.isLimitExceeded()) return false;
-		if (!isAnnotatedType(def)) throw new Error("Can not validate not-annotated type");
-		if (typeof this.opts.replace === "function") def = this.opts.replace(def, this.cachedPath);
+		if (this.limitExceeded) return false;
+		if (this.hasReplace) {
+			let replaced = this.replaceCache.get(def);
+			if (replaced === undefined) {
+				replaced = this.opts.replace(def, this.buildPath());
+				this.replaceCache.set(def, replaced);
+			}
+			def = replaced;
+		}
 		if (def.optional && (value === undefined || value === null)) return true;
-		for (const plugin of this.opts.plugins) {
+		if (this.hasPlugins) for (const plugin of this.opts.plugins) {
 			const result = plugin(this, def, value);
 			if (result === false || result === true) return result;
 		}
 		return this.validateAnnotatedType(def, value);
 	}
 	get path() {
-		return this.cachedPath;
+		return this.buildPath();
 	}
 	validateAnnotatedType(def, value) {
 		switch (def.type.kind) {
@@ -104,21 +109,21 @@ var Validator = class {
 		}
 	}
 	validateUnion(def, value) {
-		let i = 0;
-		const popped = [];
-		for (const item of def.type.items) {
-			this.push(`[${item.type.kind || item.type.designType}(${i})]`);
+		const items = def.type.items;
+		let details;
+		for (const item of items) {
+			this.stackErrors.push(null);
 			if (this.validateSafe(item, value)) {
-				this.pop(false);
+				this.stackErrors.pop();
 				return true;
 			}
-			const errors = this.pop(false);
-			if (errors) popped.push(...errors);
-			i++;
+			const branchErrors = this.stackErrors.pop();
+			if (this.limitExceeded) this.limitExceeded = false;
+			if (branchErrors) if (details) for (const err of branchErrors) details.push(err);
+else details = branchErrors;
 		}
-		this.clear();
-		const expected = def.type.items.map((item, i$1) => `[${item.type.kind || item.type.designType}(${i$1})]`).join(", ");
-		this.error(`Value does not match any of the allowed types: ${expected}`, undefined, popped);
+		const expected = items.map((item, i) => `[${item.type.kind || item.type.designType}(${i})]`).join(", ");
+		this.error(`Value does not match any of the allowed types: ${expected}`, undefined, details);
 		return false;
 	}
 	validateIntersection(def, value) {
@@ -196,7 +201,7 @@ var Validator = class {
 			if (!this.validateSafe(def.type.of, item)) {
 				passed = false;
 				this.pop(true);
-				if (this.isLimitExceeded()) return false;
+				if (this.limitExceeded) return false;
 			} else this.pop(false);
 			i++;
 		}
@@ -208,67 +213,72 @@ var Validator = class {
 			return false;
 		}
 		let passed = true;
-		const valueKeys = new Set(Object.keys(value));
-		const typeKeys = new Set();
+		let keysToStrip;
 		let skipList;
 		if (this.opts.skipList) {
-			const path = this.stackPath.length > 1 ? `${this.cachedPath}.` : "";
+			const path = this.depth > 0 ? `${this.buildPath()}.` : "";
 			for (const item of this.opts.skipList) if (item.startsWith(path)) {
 				const key = item.slice(path.length);
 				if (!skipList) skipList = new Set();
 				skipList.add(key);
-				valueKeys.delete(key);
 			}
 		}
 		let partialFunctionMatched = false;
-		if (typeof this.opts.partial === "function") partialFunctionMatched = this.opts.partial(def, this.cachedPath);
+		if (typeof this.opts.partial === "function") partialFunctionMatched = this.opts.partial(def, this.buildPath());
 		for (const [key, item] of def.type.props.entries()) {
 			if (skipList && skipList.has(key) || isPhantomType(item)) continue;
-			typeKeys.add(key);
 			if (value[key] === undefined) {
-				if (partialFunctionMatched || this.opts.partial === "deep" || this.opts.partial === true && this.stackPath.length <= 1) continue;
+				if (partialFunctionMatched || this.opts.partial === "deep" || this.opts.partial === true && this.depth === 0) continue;
 			}
 			this.push(key);
 			if (this.validateSafe(item, value[key])) this.pop(false);
 else {
 				passed = false;
 				this.pop(true);
-				if (this.isLimitExceeded()) return false;
-			}
-		}
-		for (const key of valueKeys)
- /** matched patterns for unknown keys */ if (!typeKeys.has(key)) {
-			const matched = [];
-			for (const { pattern, def: propDef } of def.type.propsPatterns) if (pattern.test(key)) matched.push({
-				pattern,
-				def: propDef
-			});
-			if (matched.length > 0) {
-				this.push(key);
-				let keyPassed = false;
-				for (const { def: propDef } of matched) {
-					if (this.validateSafe(propDef, value[key])) {
-						keyPassed = true;
-						break;
+				if (this.limitExceeded) return false;
+			}
+		}
+		const hasPatterns = def.type.propsPatterns.length > 0;
+		if (this.opts.unknownProps !== "ignore" || hasPatterns) {
+			const keys = Object.keys(value);
+			for (const key of keys) {
+				if (skipList && skipList.has(key)) continue;
+				const knownProp = def.type.props.get(key);
+				if (knownProp && !isPhantomType(knownProp)) continue;
+				const matched = [];
+				for (const { pattern, def: propDef } of def.type.propsPatterns) if (pattern.test(key)) matched.push({
+					pattern,
+					def: propDef
+				});
+				if (matched.length > 0) {
+					this.push(key);
+					let keyPassed = false;
+					for (const { def: propDef } of matched) {
+						if (this.validateSafe(propDef, value[key])) {
+							keyPassed = true;
+							break;
+						}
+						this.clear();
 					}
-					this.clear();
-				}
-				if (!keyPassed) {
-					this.validateSafe(matched[0].def, value[key]);
-					this.pop(true);
-					passed = false;
-					if (this.isLimitExceeded()) return false;
-				} else this.pop(false);
-			} else if (this.opts.unknownProps !== "ignore") {
-				if (this.opts.unknownProps === "error") {
+					if (!keyPassed) {
+						this.validateSafe(matched[0].def, value[key]);
+						this.pop(true);
+						passed = false;
+						if (this.limitExceeded) return false;
+					} else this.pop(false);
+				} else if (this.opts.unknownProps === "error") {
 					this.push(key);
 					this.error(`Unexpected property`);
 					this.pop(true);
-					if (this.isLimitExceeded()) return false;
+					if (this.limitExceeded) return false;
 					passed = false;
-				} else if (this.opts.unknownProps === "strip") delete value[key];
+				} else if (this.opts.unknownProps === "strip") {
+					if (!keysToStrip) keysToStrip = [];
+					keysToStrip.push(key);
+				}
 			}
 		}
+		if (passed && keysToStrip) for (const key of keysToStrip) delete value[key];
 		return passed;
 	}
 	validatePrimitive(def, value) {
@@ -332,6 +342,7 @@ else {
 		}
 	}
 	validateString(def, value) {
+		if (def.metadata.size === 0) return true;
 		const filled = def.metadata.get("meta.required");
 		if (filled) {
 			if (value.trim().length === 0) {
@@ -375,6 +386,7 @@ else {
 		return true;
 	}
 	validateNumber(def, value) {
+		if (def.metadata.size === 0) return true;
 		const int = def.metadata.get("expect.int");
 		if (int && value % 1 !== 0) {
 			const message = typeof int === "object" && int.message ? int.message : `Expected integer, got ${value}`;
@@ -402,6 +414,7 @@ else {
 		return true;
 	}
 	validateBoolean(def, value) {
+		if (def.metadata.size === 0) return true;
 		const filled = def.metadata.get("meta.required");
 		if (filled) {
 			if (value !== true) {
@@ -415,16 +428,21 @@ else {
 	constructor(def, opts) {
 		_define_property(this, "def", void 0);
 		_define_property(this, "opts", void 0);
+		_define_property(this, "hasPlugins", void 0);
+		_define_property(this, "hasReplace", void 0);
+		_define_property(this, "replaceCache", void 0);
 		/** Validation errors collected during the last {@link validate} call. */ _define_property(this, "errors", void 0);
 		_define_property(this, "stackErrors", void 0);
-		_define_property(this, "stackPath", void 0);
-		_define_property(this, "cachedPath", void 0);
+		_define_property(this, "pathSegments", void 0);
+		_define_property(this, "depth", void 0);
+		_define_property(this, "limitExceeded", void 0);
 		_define_property(this, "context", void 0);
 		this.def = def;
 		this.errors = [];
 		this.stackErrors = [];
-		this.stackPath = [];
-		this.cachedPath = "";
+		this.pathSegments = [];
+		this.depth = 0;
+		this.limitExceeded = false;
 		this.opts = {
 			partial: false,
 			unknownProps: "error",
@@ -432,6 +450,9 @@ else {
 			...opts,
 			plugins: opts?.plugins || []
 		};
+		this.hasPlugins = this.opts.plugins.length > 0;
+		this.hasReplace = typeof this.opts.replace === "function";
+		if (this.hasReplace) this.replaceCache = new WeakMap();
 	}
 };
 var ValidatorError = class extends Error {

package/dist/{json-schema-B55uxKNQ.cjs → json-schema-Bu4xgpQn.cjs}

@@ -13,27 +13,26 @@ else obj[key] = value;
 }
 const regexCache = new Map();
 var Validator = class {
-	isLimitExceeded() {
-		if (this.stackErrors.length > 0) {
-			const top = this.stackErrors[this.stackErrors.length - 1];
-			return top !== null && top.length >= this.opts.errorLimit;
-		}
-		return this.errors.length >= this.opts.errorLimit;
+	buildPath() {
+		if (this.depth <= 0) return "";
+		let path = this.pathSegments[0];
+		for (let i = 1; i < this.depth; i++) path += `.${this.pathSegments[i]}`;
+		return path;
 	}
 	push(name) {
-		this.stackPath.push(name);
+		this.pathSegments[this.depth] = name;
+		this.depth++;
 		this.stackErrors.push(null);
-		this.cachedPath = this.stackPath.length <= 1 ? "" : this.stackPath[1] + (this.stackPath.length > 2 ? "." + this.stackPath.slice(2).join(".") : "");
 	}
 	pop(saveErrors) {
-		this.stackPath.pop();
+		this.depth--;
 		const popped = this.stackErrors.pop();
 		if (saveErrors && popped !== null && popped !== undefined && popped.length > 0) for (const err of popped) this.error(err.message, err.path, err.details);
-		this.cachedPath = this.stackPath.length <= 1 ? "" : this.stackPath[1] + (this.stackPath.length > 2 ? "." + this.stackPath.slice(2).join(".") : "");
 		return popped;
 	}
 	clear() {
 		this.stackErrors[this.stackErrors.length - 1] = null;
+		if (this.limitExceeded) this.limitExceeded = false;
 	}
 	error(message, path, details) {
 		let errors = this.stackErrors[this.stackErrors.length - 1];
@@ -42,11 +41,12 @@ var Validator = class {
 			this.stackErrors[this.stackErrors.length - 1] = errors;
 		} else errors = this.errors;
 		const error = {
-			path: path || this.cachedPath,
+			path: path || this.buildPath(),
 			message
 		};
 		if (details?.length) error.details = details;
 		errors.push(error);
+		if (errors.length >= this.opts.errorLimit) this.limitExceeded = true;
 	}
 	throw() {
 		throw new ValidatorError(this.errors);
@@ -63,12 +63,11 @@ var Validator = class {
 	* @throws {ValidatorError} When validation fails and `safe` is not `true`.
 	*/ validate(value, safe, context) {
 		this.errors = [];
-		this.stackErrors = [];
-		this.stackPath = [""];
-		this.cachedPath = "";
+		this.stackErrors.length = 0;
+		this.depth = 0;
+		this.limitExceeded = false;
 		this.context = context;
 		const passed = this.validateSafe(this.def, value);
-		this.pop(!passed);
 		this.context = undefined;
 		if (!passed) {
 			if (safe) return false;
@@ -77,18 +76,24 @@ var Validator = class {
 		return true;
 	}
 	validateSafe(def, value) {
-		if (this.isLimitExceeded()) return false;
-		if (!isAnnotatedType(def)) throw new Error("Can not validate not-annotated type");
-		if (typeof this.opts.replace === "function") def = this.opts.replace(def, this.cachedPath);
+		if (this.limitExceeded) return false;
+		if (this.hasReplace) {
+			let replaced = this.replaceCache.get(def);
+			if (replaced === undefined) {
+				replaced = this.opts.replace(def, this.buildPath());
+				this.replaceCache.set(def, replaced);
+			}
+			def = replaced;
+		}
 		if (def.optional && (value === undefined || value === null)) return true;
-		for (const plugin of this.opts.plugins) {
+		if (this.hasPlugins) for (const plugin of this.opts.plugins) {
 			const result = plugin(this, def, value);
 			if (result === false || result === true) return result;
 		}
 		return this.validateAnnotatedType(def, value);
 	}
 	get path() {
-		return this.cachedPath;
+		return this.buildPath();
 	}
 	validateAnnotatedType(def, value) {
 		switch (def.type.kind) {
@@ -105,21 +110,21 @@ var Validator = class {
 		}
 	}
 	validateUnion(def, value) {
-		let i = 0;
-		const popped = [];
-		for (const item of def.type.items) {
-			this.push(`[${item.type.kind || item.type.designType}(${i})]`);
+		const items = def.type.items;
+		let details;
+		for (const item of items) {
+			this.stackErrors.push(null);
 			if (this.validateSafe(item, value)) {
-				this.pop(false);
+				this.stackErrors.pop();
 				return true;
 			}
-			const errors = this.pop(false);
-			if (errors) popped.push(...errors);
-			i++;
+			const branchErrors = this.stackErrors.pop();
+			if (this.limitExceeded) this.limitExceeded = false;
+			if (branchErrors) if (details) for (const err of branchErrors) details.push(err);
+else details = branchErrors;
 		}
-		this.clear();
-		const expected = def.type.items.map((item, i$1) => `[${item.type.kind || item.type.designType}(${i$1})]`).join(", ");
-		this.error(`Value does not match any of the allowed types: ${expected}`, undefined, popped);
+		const expected = items.map((item, i) => `[${item.type.kind || item.type.designType}(${i})]`).join(", ");
+		this.error(`Value does not match any of the allowed types: ${expected}`, undefined, details);
 		return false;
 	}
 	validateIntersection(def, value) {
@@ -197,7 +202,7 @@ var Validator = class {
 			if (!this.validateSafe(def.type.of, item)) {
 				passed = false;
 				this.pop(true);
-				if (this.isLimitExceeded()) return false;
+				if (this.limitExceeded) return false;
 			} else this.pop(false);
 			i++;
 		}
@@ -209,67 +214,72 @@ var Validator = class {
 			return false;
 		}
 		let passed = true;
-		const valueKeys = new Set(Object.keys(value));
-		const typeKeys = new Set();
+		let keysToStrip;
 		let skipList;
 		if (this.opts.skipList) {
-			const path = this.stackPath.length > 1 ? `${this.cachedPath}.` : "";
+			const path = this.depth > 0 ? `${this.buildPath()}.` : "";
 			for (const item of this.opts.skipList) if (item.startsWith(path)) {
 				const key = item.slice(path.length);
 				if (!skipList) skipList = new Set();
 				skipList.add(key);
-				valueKeys.delete(key);
 			}
 		}
 		let partialFunctionMatched = false;
-		if (typeof this.opts.partial === "function") partialFunctionMatched = this.opts.partial(def, this.cachedPath);
+		if (typeof this.opts.partial === "function") partialFunctionMatched = this.opts.partial(def, this.buildPath());
 		for (const [key, item] of def.type.props.entries()) {
 			if (skipList && skipList.has(key) || isPhantomType(item)) continue;
-			typeKeys.add(key);
 			if (value[key] === undefined) {
-				if (partialFunctionMatched || this.opts.partial === "deep" || this.opts.partial === true && this.stackPath.length <= 1) continue;
+				if (partialFunctionMatched || this.opts.partial === "deep" || this.opts.partial === true && this.depth === 0) continue;
 			}
 			this.push(key);
 			if (this.validateSafe(item, value[key])) this.pop(false);
 else {
 				passed = false;
 				this.pop(true);
-				if (this.isLimitExceeded()) return false;
+				if (this.limitExceeded) return false;
 			}
 		}
-		for (const key of valueKeys)
- /** matched patterns for unknown keys */ if (!typeKeys.has(key)) {
-			const matched = [];
-			for (const { pattern, def: propDef } of def.type.propsPatterns) if (pattern.test(key)) matched.push({
-				pattern,
-				def: propDef
-			});
-			if (matched.length > 0) {
-				this.push(key);
-				let keyPassed = false;
-				for (const { def: propDef } of matched) {
-					if (this.validateSafe(propDef, value[key])) {
-						keyPassed = true;
-						break;
+		const hasPatterns = def.type.propsPatterns.length > 0;
+		if (this.opts.unknownProps !== "ignore" || hasPatterns) {
+			const keys = Object.keys(value);
+			for (const key of keys) {
+				if (skipList && skipList.has(key)) continue;
+				const knownProp = def.type.props.get(key);
+				if (knownProp && !isPhantomType(knownProp)) continue;
+				const matched = [];
+				for (const { pattern, def: propDef } of def.type.propsPatterns) if (pattern.test(key)) matched.push({
+					pattern,
+					def: propDef
+				});
+				if (matched.length > 0) {
+					this.push(key);
+					let keyPassed = false;
+					for (const { def: propDef } of matched) {
+						if (this.validateSafe(propDef, value[key])) {
+							keyPassed = true;
+							break;
+						}
+						this.clear();
 					}
-					this.clear();
-				}
-				if (!keyPassed) {
-					this.validateSafe(matched[0].def, value[key]);
-					this.pop(true);
-					passed = false;
-					if (this.isLimitExceeded()) return false;
-				} else this.pop(false);
-			} else if (this.opts.unknownProps !== "ignore") {
-				if (this.opts.unknownProps === "error") {
+					if (!keyPassed) {
+						this.validateSafe(matched[0].def, value[key]);
+						this.pop(true);
+						passed = false;
+						if (this.limitExceeded) return false;
+					} else this.pop(false);
+				} else if (this.opts.unknownProps === "error") {
 					this.push(key);
 					this.error(`Unexpected property`);
 					this.pop(true);
-					if (this.isLimitExceeded()) return false;
+					if (this.limitExceeded) return false;
 					passed = false;
-				} else if (this.opts.unknownProps === "strip") delete value[key];
+				} else if (this.opts.unknownProps === "strip") {
+					if (!keysToStrip) keysToStrip = [];
+					keysToStrip.push(key);
+				}
 			}
 		}
+		if (passed && keysToStrip) for (const key of keysToStrip) delete value[key];
 		return passed;
 	}
 	validatePrimitive(def, value) {
@@ -333,6 +343,7 @@ else {
 		}
 	}
 	validateString(def, value) {
+		if (def.metadata.size === 0) return true;
 		const filled = def.metadata.get("meta.required");
 		if (filled) {
 			if (value.trim().length === 0) {
@@ -376,6 +387,7 @@ else {
 		return true;
 	}
 	validateNumber(def, value) {
+		if (def.metadata.size === 0) return true;
 		const int = def.metadata.get("expect.int");
 		if (int && value % 1 !== 0) {
 			const message = typeof int === "object" && int.message ? int.message : `Expected integer, got ${value}`;
@@ -403,6 +415,7 @@ else {
 		return true;
 	}
 	validateBoolean(def, value) {
+		if (def.metadata.size === 0) return true;
 		const filled = def.metadata.get("meta.required");
 		if (filled) {
 			if (value !== true) {
@@ -416,16 +429,21 @@ else {
 	constructor(def, opts) {
 		_define_property(this, "def", void 0);
 		_define_property(this, "opts", void 0);
+		_define_property(this, "hasPlugins", void 0);
+		_define_property(this, "hasReplace", void 0);
+		_define_property(this, "replaceCache", void 0);
 		/** Validation errors collected during the last {@link validate} call. */ _define_property(this, "errors", void 0);
 		_define_property(this, "stackErrors", void 0);
-		_define_property(this, "stackPath", void 0);
-		_define_property(this, "cachedPath", void 0);
+		_define_property(this, "pathSegments", void 0);
+		_define_property(this, "depth", void 0);
+		_define_property(this, "limitExceeded", void 0);
 		_define_property(this, "context", void 0);
 		this.def = def;
 		this.errors = [];
 		this.stackErrors = [];
-		this.stackPath = [];
-		this.cachedPath = "";
+		this.pathSegments = [];
+		this.depth = 0;
+		this.limitExceeded = false;
 		this.opts = {
 			partial: false,
 			unknownProps: "error",
@@ -433,6 +451,9 @@ else {
 			...opts,
 			plugins: opts?.plugins || []
 		};
+		this.hasPlugins = this.opts.plugins.length > 0;
+		this.hasReplace = typeof this.opts.replace === "function";
+		if (this.hasReplace) this.replaceCache = new WeakMap();
 	}
 };
 var ValidatorError = class extends Error {

package/dist/utils.cjs

@@ -1,5 +1,5 @@
 "use strict";
-const require_json_schema = require('./json-schema-B55uxKNQ.cjs');
+const require_json_schema = require('./json-schema-Bu4xgpQn.cjs');
 
 //#region packages/typescript/src/runtime/default-value.ts
 /**

package/dist/utils.d.ts

@@ -51,14 +51,18 @@ interface TValidatorPluginContext {
 declare class Validator<T extends TAtscriptAnnotatedType = TAtscriptAnnotatedType, DataType = TAtscriptDataType<T>> {
     protected readonly def: T;
     protected opts: TValidatorOptions;
+    protected hasPlugins: boolean;
+    protected hasReplace: boolean;
+    private replaceCache?;
     constructor(def: T, opts?: Partial<TValidatorOptions>);
     /** Validation errors collected during the last {@link validate} call. */
     errors: TError[];
     protected stackErrors: Array<TError[] | null>;
-    protected stackPath: string[];
-    protected cachedPath: string;
+    protected pathSegments: string[];
+    protected depth: number;
+    protected limitExceeded: boolean;
     protected context: unknown;
-    protected isLimitExceeded(): boolean;
+    protected buildPath(): string;
     protected push(name: string): void;
     protected pop(saveErrors: boolean): TError[] | null | undefined;
     protected clear(): void;

package/dist/utils.mjs

@@ -1,4 +1,4 @@
-import { Validator, ValidatorError, annotate, buildJsonSchema, cloneRefProp, createAnnotatedTypeNode, defineAnnotatedType, forAnnotatedType, fromJsonSchema, isAnnotatedType, isAnnotatedTypeOfPrimitive, isPhantomType, mergeJsonSchemas } from "./json-schema-DaFltW4t.mjs";
+import { Validator, ValidatorError, annotate, buildJsonSchema, cloneRefProp, createAnnotatedTypeNode, defineAnnotatedType, forAnnotatedType, fromJsonSchema, isAnnotatedType, isAnnotatedTypeOfPrimitive, isPhantomType, mergeJsonSchemas } from "./json-schema-Bl8jkrCj.mjs";
 
 //#region packages/typescript/src/runtime/default-value.ts
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atscript/typescript",
-  "version": "0.1.40",
+  "version": "0.1.42",
   "description": "Atscript: typescript-gen support.",
   "keywords": [
     "annotations",
@@ -61,11 +61,12 @@
     "moost": "^0.6.2"
   },
   "devDependencies": {
-    "vitest": "3.2.4"
+    "vitest": "3.2.4",
+    "@atscript/db": "^0.1.41"
   },
   "peerDependencies": {
-    "@atscript/db": "^0.1.39",
-    "@atscript/core": "^0.1.40"
+    "@atscript/db": "^0.1.41",
+    "@atscript/core": "^0.1.42"
   },
   "peerDependenciesMeta": {
     "@atscript/db": {