@atscript/typescript 0.0.17 → 0.0.18

package/dist/cli.cjs

@@ -271,17 +271,41 @@ var TypeRenderer = class extends BaseRenderer {
 	}
 	renderStructure(struct, asClass) {
 		this.blockln("{}");
+		const patterns = [];
+		let hasProp = false;
 		for (const prop of Array.from(struct.props.values())) {
+			if (prop.token("identifier")?.pattern) {
+				patterns.push(prop);
+				continue;
+			}
+			hasProp = true;
 			const optional = !!prop.token("optional");
 			this.write(wrapProp(prop.id), optional ? "?" : "", ": ");
 			this.renderTypeDef(prop.getDefinition());
 			this.writeln();
 		}
+		if (patterns.length) {
+			this.write(`[key: string]: `);
+			if (hasProp) this.writeln("any");
+else if (patterns.length === 1) {
+				this.renderTypeDef(patterns[0].getDefinition());
+				this.writeln();
+			} else {
+				this.indent();
+				for (const prop of patterns) {
+					this.writeln();
+					this.write("| ");
+					this.renderTypeDef(prop.getDefinition());
+				}
+				this.unindent();
+				this.writeln();
+			}
+		}
 		if (asClass) {
 			this.writeln("static __is_atscript_annotated_type: true");
 			this.writeln(`static type: TAtscriptTypeObject<keyof ${asClass}>`);
 			this.writeln(`static metadata: TMetadataMap<AtscriptMetadata>`);
-			this.writeln(`static validator: <TT extends TAtscriptAnnotatedTypeConstructor = ${asClass}>(opts?: TValidatorOptions) => Validator<TT>`);
+			this.writeln(`static validator: <TT extends TAtscriptAnnotatedTypeConstructor = ${asClass}>(opts?: Partial<TValidatorOptions>) => Validator<TT>`);
 		}
 		this.pop();
 	}
@@ -323,7 +347,7 @@ else if ((0, __atscript_core.isPrimitive)(realDef)) typeDef = "TAtscriptTypeFina
 		this.writeln(`const __is_atscript_annotated_type: true`);
 		this.writeln(`const type: ${typeDef}`);
 		this.writeln(`const metadata: TMetadataMap<AtscriptMetadata>`);
-		this.writeln(`static validator: <TT extends TAtscriptAnnotatedTypeConstructor = ${node.id}>(opts?: TValidatorOptions) => Validator<TT>`);
+		this.writeln(`const validator: <TT extends TAtscriptAnnotatedTypeConstructor = ${node.id}>(opts?: Partial<TValidatorOptions>) => Validator<TT>`);
 		this.popln();
 	}
 	renderJsDoc(node) {
@@ -508,6 +532,17 @@ var JsRenderer = class extends BaseRenderer {
 					this.unindent();
 					this.write(`)`);
 				}
+				for (const [key, propDef] of Object.entries(def.propsPatterns)) {
+					const optional = typeof propDef === "object" && propDef.optional;
+					this.writeln(`.propPattern(`);
+					this.indent();
+					this.writeln(`${key},`);
+					this.renderPrimitiveDef(propDef);
+					if (optional) this.writeln(".optional()");
+					this.writeln(".$type");
+					this.unindent();
+					this.write(`)`);
+				}
 				this.unindent();
 				return;
 			default: return this.writeln(`$(${d()}).designType("any")`);
@@ -516,10 +551,17 @@ var JsRenderer = class extends BaseRenderer {
 	defineObject(node) {
 		const props = Array.from(node.props.values());
 		for (const prop of props) {
+			const pattern = prop.token("identifier")?.pattern;
 			const optional = !!prop.token("optional");
-			this.writeln(`.prop(`);
-			this.indent();
-			this.writeln(`"${escapeQuotes(prop.id)}",`);
+			if (pattern) {
+				this.writeln(`.propPattern(`);
+				this.indent();
+				this.writeln(`/${pattern.source}/${pattern.flags},`);
+			} else {
+				this.writeln(`.prop(`);
+				this.indent();
+				this.writeln(`"${escapeQuotes(prop.id)}",`);
+			}
 			this.annotateType(prop.getDefinition());
 			this.indent().defineMetadata(prop).unindent();
 			if (optional) this.writeln("  .optional()");

package/dist/index.cjs

@@ -269,17 +269,41 @@ var TypeRenderer = class extends BaseRenderer {
 	}
 	renderStructure(struct, asClass) {
 		this.blockln("{}");
+		const patterns = [];
+		let hasProp = false;
 		for (const prop of Array.from(struct.props.values())) {
+			if (prop.token("identifier")?.pattern) {
+				patterns.push(prop);
+				continue;
+			}
+			hasProp = true;
 			const optional = !!prop.token("optional");
 			this.write(wrapProp(prop.id), optional ? "?" : "", ": ");
 			this.renderTypeDef(prop.getDefinition());
 			this.writeln();
 		}
+		if (patterns.length) {
+			this.write(`[key: string]: `);
+			if (hasProp) this.writeln("any");
+else if (patterns.length === 1) {
+				this.renderTypeDef(patterns[0].getDefinition());
+				this.writeln();
+			} else {
+				this.indent();
+				for (const prop of patterns) {
+					this.writeln();
+					this.write("| ");
+					this.renderTypeDef(prop.getDefinition());
+				}
+				this.unindent();
+				this.writeln();
+			}
+		}
 		if (asClass) {
 			this.writeln("static __is_atscript_annotated_type: true");
 			this.writeln(`static type: TAtscriptTypeObject<keyof ${asClass}>`);
 			this.writeln(`static metadata: TMetadataMap<AtscriptMetadata>`);
-			this.writeln(`static validator: <TT extends TAtscriptAnnotatedTypeConstructor = ${asClass}>(opts?: TValidatorOptions) => Validator<TT>`);
+			this.writeln(`static validator: <TT extends TAtscriptAnnotatedTypeConstructor = ${asClass}>(opts?: Partial<TValidatorOptions>) => Validator<TT>`);
 		}
 		this.pop();
 	}
@@ -321,7 +345,7 @@ else if ((0, __atscript_core.isPrimitive)(realDef)) typeDef = "TAtscriptTypeFina
 		this.writeln(`const __is_atscript_annotated_type: true`);
 		this.writeln(`const type: ${typeDef}`);
 		this.writeln(`const metadata: TMetadataMap<AtscriptMetadata>`);
-		this.writeln(`static validator: <TT extends TAtscriptAnnotatedTypeConstructor = ${node.id}>(opts?: TValidatorOptions) => Validator<TT>`);
+		this.writeln(`const validator: <TT extends TAtscriptAnnotatedTypeConstructor = ${node.id}>(opts?: Partial<TValidatorOptions>) => Validator<TT>`);
 		this.popln();
 	}
 	renderJsDoc(node) {
@@ -506,6 +530,17 @@ var JsRenderer = class extends BaseRenderer {
 					this.unindent();
 					this.write(`)`);
 				}
+				for (const [key, propDef] of Object.entries(def.propsPatterns)) {
+					const optional = typeof propDef === "object" && propDef.optional;
+					this.writeln(`.propPattern(`);
+					this.indent();
+					this.writeln(`${key},`);
+					this.renderPrimitiveDef(propDef);
+					if (optional) this.writeln(".optional()");
+					this.writeln(".$type");
+					this.unindent();
+					this.write(`)`);
+				}
 				this.unindent();
 				return;
 			default: return this.writeln(`$(${d()}).designType("any")`);
@@ -514,10 +549,17 @@ var JsRenderer = class extends BaseRenderer {
 	defineObject(node) {
 		const props = Array.from(node.props.values());
 		for (const prop of props) {
+			const pattern = prop.token("identifier")?.pattern;
 			const optional = !!prop.token("optional");
-			this.writeln(`.prop(`);
-			this.indent();
-			this.writeln(`"${escapeQuotes(prop.id)}",`);
+			if (pattern) {
+				this.writeln(`.propPattern(`);
+				this.indent();
+				this.writeln(`/${pattern.source}/${pattern.flags},`);
+			} else {
+				this.writeln(`.prop(`);
+				this.indent();
+				this.writeln(`"${escapeQuotes(prop.id)}",`);
+			}
 			this.annotateType(prop.getDefinition());
 			this.indent().defineMetadata(prop).unindent();
 			if (optional) this.writeln("  .optional()");
@@ -653,7 +695,7 @@ var Validator = class {
 	error(message, path$2, details) {
 		const errors = this.stackErrors[this.stackErrors.length - 1] || this.errors;
 		const error = {
-			path: path$2 || this.stackPath.join(".").slice(1),
+			path: path$2 || this.path,
 			message
 		};
 		if (details?.length) error.details = details;
@@ -666,7 +708,7 @@ var Validator = class {
 		this.push("");
 		this.errors = [];
 		this.stackErrors = [];
-		const passed = this._validate(this.def, value);
+		const passed = this.validateSafe(this.def, value);
 		this.pop(!passed);
 		if (!passed) {
 			if (safe) return false;
@@ -674,10 +716,21 @@ var Validator = class {
 		}
 		return true;
 	}
-	_validate(def, value) {
+	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.path);
 		if (def.optional && value === undefined) return true;
+		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.stackPath.slice(1).join(".");
+	}
+	validateAnnotatedType(def, value) {
 		switch (def.type.kind) {
 			case "object": return this.validateObject(def, value);
 			case "union": return this.validateUnion(def, value);
@@ -693,7 +746,7 @@ var Validator = class {
 		const popped = [];
 		for (const item of def.type.items) {
 			this.push(`[${item.type.kind || item.type.designType}(${i})]`);
-			if (this._validate(item, value)) {
+			if (this.validateSafe(item, value)) {
 				this.pop(false);
 				return true;
 			}
@@ -707,7 +760,7 @@ var Validator = class {
 		return false;
 	}
 	validateIntersection(def, value) {
-		for (const item of def.type.items) if (!this._validate(item, value)) return false;
+		for (const item of def.type.items) if (!this.validateSafe(item, value)) return false;
 		return true;
 	}
 	validateTuple(def, value) {
@@ -718,7 +771,7 @@ var Validator = class {
 		let i = 0;
 		for (const item of def.type.items) {
 			this.push(`[${i}]`);
-			if (!this._validate(item, value[i])) {
+			if (!this.validateSafe(item, value[i])) {
 				this.pop(true);
 				return false;
 			}
@@ -746,7 +799,7 @@ var Validator = class {
 		let passed = true;
 		for (const item of value) {
 			this.push(`[${i}]`);
-			if (!this._validate(def.type.of, item)) {
+			if (!this.validateSafe(def.type.of, item)) {
 				passed = false;
 				this.pop(true);
 				if (this.isLimitExceeded()) return false;
@@ -765,7 +818,7 @@ var Validator = class {
 		const typeKeys = new Set();
 		const skipList = new Set();
 		if (this.opts.skipList) {
-			const path$2 = this.stackPath.length > 1 ? this.stackPath.slice(1).join(".") + "." : "";
+			const path$2 = this.stackPath.length > 1 ? this.path + "." : "";
 			this.opts.skipList.forEach((item) => {
 				if (item.startsWith(path$2)) {
 					const key = item.slice(path$2.length);
@@ -775,7 +828,7 @@ var Validator = class {
 			});
 		}
 		let partialFunctionMatched = false;
-		if (typeof this.opts.partial === "function") partialFunctionMatched = this.opts.partial(def, this.stackPath.join(".").slice(1));
+		if (typeof this.opts.partial === "function") partialFunctionMatched = this.opts.partial(def, this.path);
 		for (const [key, item] of def.type.props.entries()) {
 			if (skipList.has(key)) continue;
 			typeKeys.add(key);
@@ -783,15 +836,35 @@ var Validator = class {
 				if (partialFunctionMatched || this.opts.partial === "deep" || this.opts.partial === true && this.stackPath.length <= 1) continue;
 			}
 			this.push(key);
-			if (this._validate(item, value[key])) this.pop(false);
+			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) if (this.opts.unknwonProps !== "ignore") {
-			if (!typeKeys.has(key)) {
+		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) {
+				let keyPassed = false;
+				for (const { def: def$1 } of matched) if (this.validateSafe(def$1, value[key])) {
+					this.pop(false);
+					keyPassed = true;
+					break;
+				}
+				if (!keyPassed) {
+					this.push(key);
+					this.validateSafe(matched[0].def, value[key]);
+					this.pop(true);
+					passed = false;
+					if (this.isLimitExceeded()) return false;
+				}
+			} else if (this.opts.unknwonProps !== "ignore") {
 				if (this.opts.unknwonProps === "error") {
 					this.push(key);
 					this.error(`Unexpected property`);
@@ -909,7 +982,8 @@ else {
 			partial: false,
 			unknwonProps: "error",
 			errorLimit: 10,
-			...opts
+			...opts,
+			plugins: opts?.plugins || []
 		};
 	}
 };
@@ -933,7 +1007,10 @@ function defineAnnotatedType(_kind, base) {
 		"intersection",
 		"tuple"
 	].includes(kind)) type.items = [];
-	if (kind === "object") type.props = new Map();
+	if (kind === "object") {
+		type.props = new Map();
+		type.propsPatterns = [];
+	}
 	type.tags = new Set();
 	const metadata = base?.metadata || new Map();
 	if (base) Object.assign(base, {
@@ -981,8 +1058,19 @@ else base = {
 			this.$def.props.set(name, value);
 			return this;
 		},
-		optional() {
-			this.$type.optional = true;
+		propPattern(pattern, def) {
+			this.$def.propsPatterns.push({
+				pattern,
+				def
+			});
+			return this;
+		},
+		optional(value = true) {
+			this.$type.optional = value;
+			return this;
+		},
+		copyMetadata(fromMetadata, ignore) {
+			for (const [key, value] of fromMetadata.entries()) if (!ignore || !ignore.has(key)) this.$metadata.set(key, value);
 			return this;
 		},
 		refTo(type$1, chain) {
@@ -992,7 +1080,7 @@ else base = {
 				let keys = "";
 				for (const c of chain || []) {
 					keys += `["${c}"]`;
-					if (newBase.type.kind === "object") newBase = newBase.type.props.get(c);
+					if (newBase.type.kind === "object" && newBase.type.props.has(c)) newBase = newBase.type.props.get(c);
 else throw new Error(`Can't find prop ${typeName}${keys}`);
 				}
 				if (!newBase && keys) throw new Error(`Can't find prop ${typeName}${keys}`);
@@ -1020,6 +1108,19 @@ else this.$metadata.set(key, value);
 	};
 	return handle;
 }
+function isAnnotatedTypeOfPrimitive(t) {
+	if (["array", "object"].includes(t.type.kind)) return false;
+	if (!t.type.kind) return true;
+	if ([
+		"union",
+		"tuple",
+		"intersection"
+	].includes(t.type.kind)) {
+		for (const item of t.type.items) if (!isAnnotatedTypeOfPrimitive(item)) return false;
+		return true;
+	}
+	return false;
+}
 
 //#endregion
 //#region packages/typescript/src/index.ts
@@ -1030,4 +1131,5 @@ exports.Validator = Validator
 exports.ValidatorError = ValidatorError
 exports.default = src_default
 exports.defineAnnotatedType = defineAnnotatedType
-exports.isAnnotatedType = isAnnotatedType
+exports.isAnnotatedType = isAnnotatedType
+exports.isAnnotatedTypeOfPrimitive = isAnnotatedTypeOfPrimitive

package/dist/index.d.ts

@@ -7,16 +7,25 @@ interface TError {
     message: string;
     details?: TError[];
 }
+type TValidatorPlugin = (ctx: TValidatorPluginContext, def: TAtscriptAnnotatedType, value: any) => boolean | undefined;
 interface TValidatorOptions {
     partial: boolean | 'deep' | ((type: TAtscriptAnnotatedType<TAtscriptTypeObject>, path: string) => boolean);
+    replace?: (type: TAtscriptAnnotatedType, path: string) => TAtscriptAnnotatedType;
+    plugins: TValidatorPlugin[];
     unknwonProps: 'strip' | 'ignore' | 'error';
     errorLimit: number;
     skipList?: Set<string>;
 }
+interface TValidatorPluginContext {
+    opts: Validator<any>['opts'];
+    validateAnnotatedType: Validator<any>['validateAnnotatedType'];
+    error: Validator<any>['error'];
+    path: Validator<any>['path'];
+}
 declare class Validator<T extends TAtscriptAnnotatedTypeConstructor> {
-    protected readonly def: T;
+    protected readonly def: T | TAtscriptAnnotatedType<any>;
     protected opts: TValidatorOptions;
-    constructor(def: T, opts?: Partial<TValidatorOptions>);
+    constructor(def: T | TAtscriptAnnotatedType<any>, opts?: Partial<TValidatorOptions>);
     errors: TError[];
     protected stackErrors: TError[][];
     protected stackPath: string[];
@@ -27,7 +36,9 @@ declare class Validator<T extends TAtscriptAnnotatedTypeConstructor> {
     protected error(message: string, path?: string, details?: TError[]): void;
     protected throw(): void;
     validate<TT = T>(value: any, safe?: boolean): value is TT;
-    protected _validate(def: TAtscriptAnnotatedType, value: any): boolean;
+    protected validateSafe(def: TAtscriptAnnotatedType, value: any): boolean;
+    protected get path(): string;
+    protected validateAnnotatedType(def: TAtscriptAnnotatedType, value: any): boolean;
     protected validateUnion(def: TAtscriptAnnotatedType<TAtscriptTypeComplex>, value: any): boolean;
     protected validateIntersection(def: TAtscriptAnnotatedType<TAtscriptTypeComplex>, value: any): boolean;
     protected validateTuple(def: TAtscriptAnnotatedType<TAtscriptTypeComplex>, value: any): boolean;
@@ -56,11 +67,21 @@ interface TAtscriptTypeArray {
 interface TAtscriptTypeObject<K extends string = string> {
     kind: 'object';
     props: Map<K, TAtscriptAnnotatedType>;
+    propsPatterns: {
+        pattern: RegExp;
+        def: TAtscriptAnnotatedType;
+    }[];
     tags: Set<AtscriptPrimitiveTags>;
 }
 interface TAtscriptTypeFinal {
     kind: '';
+    /**
+     * design type
+     */
     designType: 'string' | 'number' | 'boolean' | 'undefined' | 'null' | 'object' | 'any' | 'never';
+    /**
+     * value for literals
+     */
     value?: string | number | boolean;
     tags: Set<AtscriptPrimitiveTags>;
 }
@@ -73,28 +94,40 @@ interface TAtscriptAnnotatedType<T = TAtscriptTypeDef> {
     optional?: boolean;
 }
 type TAtscriptAnnotatedTypeConstructor = TAtscriptAnnotatedType & (new (...args: any[]) => any);
+/**
+ * Type Guard to check if a type is atscript-annotated
+ */
 declare function isAnnotatedType(type: any): type is TAtscriptAnnotatedType;
 type TKind = '' | 'array' | 'object' | 'union' | 'intersection' | 'tuple';
-declare function defineAnnotatedType(_kind?: TKind, base?: any): {
-    $type: any;
-    $def: {
-        kind: TKind;
-    } & Omit<TAtscriptTypeComplex, "kind"> & Omit<TAtscriptTypeFinal, "kind"> & Omit<TAtscriptTypeArray, "kind"> & Omit<TAtscriptTypeObject<string>, "kind">;
-    $metadata: Map<string, unknown>;
-    _existingObject: TAtscriptAnnotatedType | undefined;
-    tags(...tags: string[]): any;
-    designType(value: TAtscriptTypeFinal["designType"]): any;
-    value(value: string | number | boolean): any;
-    of(value: TAtscriptAnnotatedType): any;
-    item(value: TAtscriptAnnotatedType): any;
-    prop(name: string, value: TAtscriptAnnotatedType): any;
-    optional(): any;
-    refTo(type: any, chain?: string[]): any;
-    annotate(key: string, value: any, asArray?: boolean): any;
-};
+declare function defineAnnotatedType(_kind?: TKind, base?: any): TAnnotatedTypeHandle;
+/**
+ * Atscript Metadata Map with typed setters/getters
+ */
 interface TMetadataMap<O extends object> extends Map<keyof O, O[keyof O]> {
     get<K extends keyof O>(key: K): O[K] | undefined;
     set<K extends keyof O>(key: K, value: O[K]): this;
 }
+interface TAnnotatedTypeHandle {
+    $type: TAtscriptAnnotatedType;
+    $def: {
+        kind: TKind;
+    } & Omit<TAtscriptTypeComplex, 'kind'> & Omit<TAtscriptTypeFinal, 'kind'> & Omit<TAtscriptTypeArray, 'kind'> & Omit<TAtscriptTypeObject<string>, 'kind'>;
+    $metadata: TMetadataMap<AtscriptMetadata>;
+    _existingObject: TAtscriptAnnotatedType | undefined;
+    tags(...tags: string[]): TAnnotatedTypeHandle;
+    designType(value: TAtscriptTypeFinal['designType']): TAnnotatedTypeHandle;
+    value(value: string | number | boolean): TAnnotatedTypeHandle;
+    of(value: TAtscriptAnnotatedType): TAnnotatedTypeHandle;
+    item(value: TAtscriptAnnotatedType): TAnnotatedTypeHandle;
+    prop(name: string, value: TAtscriptAnnotatedType): TAnnotatedTypeHandle;
+    propPattern(pattern: RegExp, value: TAtscriptAnnotatedType): TAnnotatedTypeHandle;
+    optional(value?: boolean): TAnnotatedTypeHandle;
+    copyMetadata(fromMetadata: TMetadataMap<AtscriptMetadata>): TAnnotatedTypeHandle;
+    refTo(type: TAtscriptAnnotatedType & {
+        name?: string;
+    }, chain?: string[]): TAnnotatedTypeHandle;
+    annotate(key: keyof AtscriptMetadata, value: any, asArray?: boolean): TAnnotatedTypeHandle;
+}
+declare function isAnnotatedTypeOfPrimitive(t: TAtscriptAnnotatedType): boolean;
 
-export { type TAtscriptAnnotatedType, type TAtscriptAnnotatedTypeConstructor, type TAtscriptTypeArray, type TAtscriptTypeComplex, type TAtscriptTypeDef, type TAtscriptTypeFinal, type TAtscriptTypeObject, type TMetadataMap, type TValidatorOptions, Validator, ValidatorError, tsPlugin as default, defineAnnotatedType, isAnnotatedType };
+export { type TAnnotatedTypeHandle, type TAtscriptAnnotatedType, type TAtscriptAnnotatedTypeConstructor, type TAtscriptTypeArray, type TAtscriptTypeComplex, type TAtscriptTypeDef, type TAtscriptTypeFinal, type TAtscriptTypeObject, type TMetadataMap, type TValidatorOptions, type TValidatorPlugin, type TValidatorPluginContext, Validator, ValidatorError, tsPlugin as default, defineAnnotatedType, isAnnotatedType, isAnnotatedTypeOfPrimitive };

package/dist/index.mjs

@@ -244,17 +244,41 @@ var TypeRenderer = class extends BaseRenderer {
 	}
 	renderStructure(struct, asClass) {
 		this.blockln("{}");
+		const patterns = [];
+		let hasProp = false;
 		for (const prop of Array.from(struct.props.values())) {
+			if (prop.token("identifier")?.pattern) {
+				patterns.push(prop);
+				continue;
+			}
+			hasProp = true;
 			const optional = !!prop.token("optional");
 			this.write(wrapProp(prop.id), optional ? "?" : "", ": ");
 			this.renderTypeDef(prop.getDefinition());
 			this.writeln();
 		}
+		if (patterns.length) {
+			this.write(`[key: string]: `);
+			if (hasProp) this.writeln("any");
+else if (patterns.length === 1) {
+				this.renderTypeDef(patterns[0].getDefinition());
+				this.writeln();
+			} else {
+				this.indent();
+				for (const prop of patterns) {
+					this.writeln();
+					this.write("| ");
+					this.renderTypeDef(prop.getDefinition());
+				}
+				this.unindent();
+				this.writeln();
+			}
+		}
 		if (asClass) {
 			this.writeln("static __is_atscript_annotated_type: true");
 			this.writeln(`static type: TAtscriptTypeObject<keyof ${asClass}>`);
 			this.writeln(`static metadata: TMetadataMap<AtscriptMetadata>`);
-			this.writeln(`static validator: <TT extends TAtscriptAnnotatedTypeConstructor = ${asClass}>(opts?: TValidatorOptions) => Validator<TT>`);
+			this.writeln(`static validator: <TT extends TAtscriptAnnotatedTypeConstructor = ${asClass}>(opts?: Partial<TValidatorOptions>) => Validator<TT>`);
 		}
 		this.pop();
 	}
@@ -296,7 +320,7 @@ else if (isPrimitive(realDef)) typeDef = "TAtscriptTypeFinal";
 		this.writeln(`const __is_atscript_annotated_type: true`);
 		this.writeln(`const type: ${typeDef}`);
 		this.writeln(`const metadata: TMetadataMap<AtscriptMetadata>`);
-		this.writeln(`static validator: <TT extends TAtscriptAnnotatedTypeConstructor = ${node.id}>(opts?: TValidatorOptions) => Validator<TT>`);
+		this.writeln(`const validator: <TT extends TAtscriptAnnotatedTypeConstructor = ${node.id}>(opts?: Partial<TValidatorOptions>) => Validator<TT>`);
 		this.popln();
 	}
 	renderJsDoc(node) {
@@ -481,6 +505,17 @@ var JsRenderer = class extends BaseRenderer {
 					this.unindent();
 					this.write(`)`);
 				}
+				for (const [key, propDef] of Object.entries(def.propsPatterns)) {
+					const optional = typeof propDef === "object" && propDef.optional;
+					this.writeln(`.propPattern(`);
+					this.indent();
+					this.writeln(`${key},`);
+					this.renderPrimitiveDef(propDef);
+					if (optional) this.writeln(".optional()");
+					this.writeln(".$type");
+					this.unindent();
+					this.write(`)`);
+				}
 				this.unindent();
 				return;
 			default: return this.writeln(`$(${d()}).designType("any")`);
@@ -489,10 +524,17 @@ var JsRenderer = class extends BaseRenderer {
 	defineObject(node) {
 		const props = Array.from(node.props.values());
 		for (const prop of props) {
+			const pattern = prop.token("identifier")?.pattern;
 			const optional = !!prop.token("optional");
-			this.writeln(`.prop(`);
-			this.indent();
-			this.writeln(`"${escapeQuotes(prop.id)}",`);
+			if (pattern) {
+				this.writeln(`.propPattern(`);
+				this.indent();
+				this.writeln(`/${pattern.source}/${pattern.flags},`);
+			} else {
+				this.writeln(`.prop(`);
+				this.indent();
+				this.writeln(`"${escapeQuotes(prop.id)}",`);
+			}
 			this.annotateType(prop.getDefinition());
 			this.indent().defineMetadata(prop).unindent();
 			if (optional) this.writeln("  .optional()");
@@ -628,7 +670,7 @@ var Validator = class {
 	error(message, path$1, details) {
 		const errors = this.stackErrors[this.stackErrors.length - 1] || this.errors;
 		const error = {
-			path: path$1 || this.stackPath.join(".").slice(1),
+			path: path$1 || this.path,
 			message
 		};
 		if (details?.length) error.details = details;
@@ -641,7 +683,7 @@ var Validator = class {
 		this.push("");
 		this.errors = [];
 		this.stackErrors = [];
-		const passed = this._validate(this.def, value);
+		const passed = this.validateSafe(this.def, value);
 		this.pop(!passed);
 		if (!passed) {
 			if (safe) return false;
@@ -649,10 +691,21 @@ var Validator = class {
 		}
 		return true;
 	}
-	_validate(def, value) {
+	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.path);
 		if (def.optional && value === undefined) return true;
+		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.stackPath.slice(1).join(".");
+	}
+	validateAnnotatedType(def, value) {
 		switch (def.type.kind) {
 			case "object": return this.validateObject(def, value);
 			case "union": return this.validateUnion(def, value);
@@ -668,7 +721,7 @@ var Validator = class {
 		const popped = [];
 		for (const item of def.type.items) {
 			this.push(`[${item.type.kind || item.type.designType}(${i})]`);
-			if (this._validate(item, value)) {
+			if (this.validateSafe(item, value)) {
 				this.pop(false);
 				return true;
 			}
@@ -682,7 +735,7 @@ var Validator = class {
 		return false;
 	}
 	validateIntersection(def, value) {
-		for (const item of def.type.items) if (!this._validate(item, value)) return false;
+		for (const item of def.type.items) if (!this.validateSafe(item, value)) return false;
 		return true;
 	}
 	validateTuple(def, value) {
@@ -693,7 +746,7 @@ var Validator = class {
 		let i = 0;
 		for (const item of def.type.items) {
 			this.push(`[${i}]`);
-			if (!this._validate(item, value[i])) {
+			if (!this.validateSafe(item, value[i])) {
 				this.pop(true);
 				return false;
 			}
@@ -721,7 +774,7 @@ var Validator = class {
 		let passed = true;
 		for (const item of value) {
 			this.push(`[${i}]`);
-			if (!this._validate(def.type.of, item)) {
+			if (!this.validateSafe(def.type.of, item)) {
 				passed = false;
 				this.pop(true);
 				if (this.isLimitExceeded()) return false;
@@ -740,7 +793,7 @@ var Validator = class {
 		const typeKeys = new Set();
 		const skipList = new Set();
 		if (this.opts.skipList) {
-			const path$1 = this.stackPath.length > 1 ? this.stackPath.slice(1).join(".") + "." : "";
+			const path$1 = this.stackPath.length > 1 ? this.path + "." : "";
 			this.opts.skipList.forEach((item) => {
 				if (item.startsWith(path$1)) {
 					const key = item.slice(path$1.length);
@@ -750,7 +803,7 @@ var Validator = class {
 			});
 		}
 		let partialFunctionMatched = false;
-		if (typeof this.opts.partial === "function") partialFunctionMatched = this.opts.partial(def, this.stackPath.join(".").slice(1));
+		if (typeof this.opts.partial === "function") partialFunctionMatched = this.opts.partial(def, this.path);
 		for (const [key, item] of def.type.props.entries()) {
 			if (skipList.has(key)) continue;
 			typeKeys.add(key);
@@ -758,15 +811,35 @@ var Validator = class {
 				if (partialFunctionMatched || this.opts.partial === "deep" || this.opts.partial === true && this.stackPath.length <= 1) continue;
 			}
 			this.push(key);
-			if (this._validate(item, value[key])) this.pop(false);
+			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) if (this.opts.unknwonProps !== "ignore") {
-			if (!typeKeys.has(key)) {
+		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) {
+				let keyPassed = false;
+				for (const { def: def$1 } of matched) if (this.validateSafe(def$1, value[key])) {
+					this.pop(false);
+					keyPassed = true;
+					break;
+				}
+				if (!keyPassed) {
+					this.push(key);
+					this.validateSafe(matched[0].def, value[key]);
+					this.pop(true);
+					passed = false;
+					if (this.isLimitExceeded()) return false;
+				}
+			} else if (this.opts.unknwonProps !== "ignore") {
 				if (this.opts.unknwonProps === "error") {
 					this.push(key);
 					this.error(`Unexpected property`);
@@ -884,7 +957,8 @@ else {
 			partial: false,
 			unknwonProps: "error",
 			errorLimit: 10,
-			...opts
+			...opts,
+			plugins: opts?.plugins || []
 		};
 	}
 };
@@ -908,7 +982,10 @@ function defineAnnotatedType(_kind, base) {
 		"intersection",
 		"tuple"
 	].includes(kind)) type.items = [];
-	if (kind === "object") type.props = new Map();
+	if (kind === "object") {
+		type.props = new Map();
+		type.propsPatterns = [];
+	}
 	type.tags = new Set();
 	const metadata = base?.metadata || new Map();
 	if (base) Object.assign(base, {
@@ -956,8 +1033,19 @@ else base = {
 			this.$def.props.set(name, value);
 			return this;
 		},
-		optional() {
-			this.$type.optional = true;
+		propPattern(pattern, def) {
+			this.$def.propsPatterns.push({
+				pattern,
+				def
+			});
+			return this;
+		},
+		optional(value = true) {
+			this.$type.optional = value;
+			return this;
+		},
+		copyMetadata(fromMetadata, ignore) {
+			for (const [key, value] of fromMetadata.entries()) if (!ignore || !ignore.has(key)) this.$metadata.set(key, value);
 			return this;
 		},
 		refTo(type$1, chain) {
@@ -967,7 +1055,7 @@ else base = {
 				let keys = "";
 				for (const c of chain || []) {
 					keys += `["${c}"]`;
-					if (newBase.type.kind === "object") newBase = newBase.type.props.get(c);
+					if (newBase.type.kind === "object" && newBase.type.props.has(c)) newBase = newBase.type.props.get(c);
 else throw new Error(`Can't find prop ${typeName}${keys}`);
 				}
 				if (!newBase && keys) throw new Error(`Can't find prop ${typeName}${keys}`);
@@ -995,10 +1083,23 @@ else this.$metadata.set(key, value);
 	};
 	return handle;
 }
+function isAnnotatedTypeOfPrimitive(t) {
+	if (["array", "object"].includes(t.type.kind)) return false;
+	if (!t.type.kind) return true;
+	if ([
+		"union",
+		"tuple",
+		"intersection"
+	].includes(t.type.kind)) {
+		for (const item of t.type.items) if (!isAnnotatedTypeOfPrimitive(item)) return false;
+		return true;
+	}
+	return false;
+}
 
 //#endregion
 //#region packages/typescript/src/index.ts
 var src_default = tsPlugin;
 
 //#endregion
-export { Validator, ValidatorError, src_default as default, defineAnnotatedType, isAnnotatedType };
+export { Validator, ValidatorError, src_default as default, defineAnnotatedType, isAnnotatedType, isAnnotatedTypeOfPrimitive };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atscript/typescript",
-  "version": "0.0.17",
+  "version": "0.0.18",
   "description": "Atscript: typescript-gen support.",
   "type": "module",
   "main": "dist/index.mjs",
@@ -46,13 +46,15 @@
   },
   "homepage": "https://github.com/moostjs/atscript/tree/main/packages/typescript#readme",
   "license": "ISC",
+  "peerDependencies": {
+    "@atscript/core": "^0.0.18"
+  },
   "dependencies": {
-    "@moostjs/event-cli": "^0.5.26",
-    "moost": "^0.5.26",
-    "@atscript/core": "^0.0.17"
+    "@moostjs/event-cli": "^0.5.30",
+    "moost": "^0.5.30"
   },
   "devDependencies": {
-    "vitest": "^3.0.0"
+    "vitest": "3.2.4"
   },
   "scripts": {
     "pub": "pnpm publish --access public",