@atscript/typescript 0.1.5 → 0.1.7

package/dist/cli.cjs

@@ -298,8 +298,9 @@ var TypeRenderer = class TypeRenderer extends BaseRenderer {
 				patterns.push(prop);
 				continue;
 			}
-			if (this.isPhantomProp(prop.getDefinition())) {
-				this.writeln(`// ${prop.id}: phantom`);
+			const phantomType = this.phantomPropType(prop.getDefinition());
+			if (phantomType) {
+				this.writeln(`// ${prop.id}: ${phantomType}`);
 				continue;
 			}
 			const optional = !!prop.token("optional");
@@ -345,12 +346,6 @@ var TypeRenderer = class TypeRenderer extends BaseRenderer {
 		if (struct?.entity === "structure") this.renderStructure(struct, node.id);
 else this.writeln("{}");
 		this.writeln();
-		const nsPrefix = exported ? "export declare" : "declare";
-		this.write(`${nsPrefix} namespace ${node.id} `);
-		this.blockln("{}");
-		this.writeln(`type DataType = ${node.id}`);
-		this.popln();
-		this.writeln();
 	}
 	renderType(node) {
 		this.writeln();
@@ -377,12 +372,6 @@ else this.writeln("{}");
 		} else {
 			this.write(exported ? "export declare " : "declare ");
 			this.writeln(`class ${node.id} extends ${targetName} {}`);
-			const nsPrefix = exported ? "export declare" : "declare";
-			this.write(`${nsPrefix} namespace ${node.id} `);
-			this.blockln("{}");
-			this.writeln(`type DataType = ${node.id}`);
-			this.popln();
-			this.writeln();
 		}
 	}
 	renderTypeNamespace(node) {
@@ -401,23 +390,23 @@ else if ((0, __atscript_core.isGroup)(realDef)) typeDef = `TAtscriptTypeComplex<
 else if ((0, __atscript_core.isArray)(realDef)) typeDef = `TAtscriptTypeArray<${name}>`;
 else if ((0, __atscript_core.isPrimitive)(realDef)) typeDef = `TAtscriptTypeFinal<${name}>`;
 		}
-		this.writeln(`type DataType = ${name}`);
 		this.writeln(`const __is_atscript_annotated_type: true`);
 		this.writeln(`const type: ${typeDef}`);
 		this.writeln(`const metadata: TMetadataMap<AtscriptMetadata>`);
-		this.writeln(`const validator: (opts?: Partial<TValidatorOptions>) => Validator<typeof ${name}, ${name}>`);
+		this.writeln(`const validator: (opts?: Partial<TValidatorOptions>) => Validator<typeof ${name}>`);
 		if (resolveJsonSchemaMode(this.opts) === false) this.writeln("/** @deprecated JSON Schema support is disabled. Calling this method will throw a runtime error. To enable, set `jsonSchema: 'lazy'` or `jsonSchema: 'bundle'` in tsPlugin options, or add `@emit.jsonSchema` annotation to individual interfaces. */");
 		this.writeln("const toJsonSchema: () => any");
 		this.popln();
 	}
-	isPhantomProp(def) {
-		if (!def) return false;
-		if ((0, __atscript_core.isPrimitive)(def) && def.id === "phantom") return true;
+	phantomPropType(def) {
+		if (!def) return undefined;
+		if ((0, __atscript_core.isPrimitive)(def) && def.config.type === "phantom") return def.id;
 		if ((0, __atscript_core.isRef)(def)) {
-			const unwound = this.doc.unwindType(def.id, def.chain)?.def;
-			return (0, __atscript_core.isPrimitive)(unwound) && unwound.id === "phantom";
+			const ref = def;
+			const unwound = this.doc.unwindType(ref.id, ref.chain)?.def;
+			if ((0, __atscript_core.isPrimitive)(unwound) && unwound.config.type === "phantom") return ref.hasChain ? `${ref.id}.${ref.chain.map((c) => c.text).join(".")}` : ref.id;
 		}
-		return false;
+		return undefined;
 	}
 	isTypeTarget(name, doc) {
 		const d = doc || this.doc;
@@ -612,14 +601,22 @@ var Validator = class {
 			return false;
 		}
 		const minLength = def.metadata.get("expect.minLength");
-		if (typeof minLength === "number" && value.length < minLength) {
-			this.error(`Expected minimum length of ${minLength} items, got ${value.length} items`);
-			return false;
+		if (minLength) {
+			const length = typeof minLength === "number" ? minLength : minLength.length;
+			if (value.length < length) {
+				const message = typeof minLength === "object" && minLength.message ? minLength.message : `Expected minimum length of ${length} items, got ${value.length} items`;
+				this.error(message);
+				return false;
+			}
 		}
 		const maxLength = def.metadata.get("expect.maxLength");
-		if (typeof maxLength === "number" && value.length > maxLength) {
-			this.error(`Expected maximum length of ${maxLength} items, got ${value.length} items`);
-			return false;
+		if (maxLength) {
+			const length = typeof maxLength === "number" ? maxLength : maxLength.length;
+			if (value.length > length) {
+				const message = typeof maxLength === "object" && maxLength.message ? maxLength.message : `Expected maximum length of ${length} items, got ${value.length} items`;
+				this.error(message);
+				return false;
+			}
 		}
 		let i = 0;
 		let passed = true;
@@ -751,14 +748,22 @@ else {
 	}
 	validateString(def, value) {
 		const minLength = def.metadata.get("expect.minLength");
-		if (typeof minLength === "number" && value.length < minLength) {
-			this.error(`Expected minimum length of ${minLength} characters, got ${value.length} characters`);
-			return false;
+		if (minLength) {
+			const length = typeof minLength === "number" ? minLength : minLength.length;
+			if (value.length < length) {
+				const message = typeof minLength === "object" && minLength.message ? minLength.message : `Expected minimum length of ${length} characters, got ${value.length} characters`;
+				this.error(message);
+				return false;
+			}
 		}
 		const maxLength = def.metadata.get("expect.maxLength");
-		if (typeof maxLength === "number" && value.length > maxLength) {
-			this.error(`Expected maximum length of ${maxLength} characters, got ${value.length} characters`);
-			return false;
+		if (maxLength) {
+			const length = typeof maxLength === "number" ? maxLength : maxLength.length;
+			if (value.length > length) {
+				const message = typeof maxLength === "object" && maxLength.message ? maxLength.message : `Expected maximum length of ${length} characters, got ${value.length} characters`;
+				this.error(message);
+				return false;
+			}
 		}
 		const patterns = def.metadata.get("expect.pattern");
 		for (const { pattern, flags, message } of patterns || []) {
@@ -778,19 +783,28 @@ else {
 	}
 	validateNumber(def, value) {
 		const int = def.metadata.get("expect.int");
-		if (typeof int === "boolean" && int && value % 1 !== 0) {
-			this.error(`Expected integer, got ${value}`);
+		if (int && value % 1 !== 0) {
+			const message = typeof int === "object" && int.message ? int.message : `Expected integer, got ${value}`;
+			this.error(message);
 			return false;
 		}
 		const min = def.metadata.get("expect.min");
-		if (typeof min === "number" && value < min) {
-			this.error(`Expected minimum ${min}, got ${value}`);
-			return false;
+		if (min) {
+			const minValue = typeof min === "number" ? min : min.minValue;
+			if (value < minValue) {
+				const message = typeof min === "object" && min.message ? min.message : `Expected minimum ${minValue}, got ${value}`;
+				this.error(message);
+				return false;
+			}
 		}
 		const max = def.metadata.get("expect.max");
-		if (typeof max === "number" && value > max) {
-			this.error(`Expected maximum ${max}, got ${value}`);
-			return false;
+		if (max) {
+			const maxValue = typeof max === "number" ? max : max.maxValue;
+			if (value > maxValue) {
+				const message = typeof max === "object" && max.message ? max.message : `Expected maximum ${maxValue}, got ${value}`;
+				this.error(message);
+				return false;
+			}
 		}
 		return true;
 	}
@@ -972,9 +986,9 @@ function buildJsonSchema(type) {
 					items: build$1(d.type.of)
 				};
 				const minLength = meta.get("expect.minLength");
-				if (typeof minLength === "number") schema.minItems = minLength;
+				if (minLength) schema.minItems = typeof minLength === "number" ? minLength : minLength.length;
 				const maxLength = meta.get("expect.maxLength");
-				if (typeof maxLength === "number") schema.maxItems = maxLength;
+				if (maxLength) schema.maxItems = typeof maxLength === "number" ? maxLength : maxLength.length;
 				return schema;
 			},
 			union(d) {
@@ -999,18 +1013,18 @@ function buildJsonSchema(type) {
 				}
 				if (schema.type === "string") {
 					const minLength = meta.get("expect.minLength");
-					if (typeof minLength === "number") schema.minLength = minLength;
+					if (minLength) schema.minLength = typeof minLength === "number" ? minLength : minLength.length;
 					const maxLength = meta.get("expect.maxLength");
-					if (typeof maxLength === "number") schema.maxLength = maxLength;
+					if (maxLength) schema.maxLength = typeof maxLength === "number" ? maxLength : maxLength.length;
 					const patterns = meta.get("expect.pattern");
 					if (patterns?.length) if (patterns.length === 1) schema.pattern = patterns[0].pattern;
 else schema.allOf = (schema.allOf || []).concat(patterns.map((p) => ({ pattern: p.pattern })));
 				}
 				if (schema.type === "number" || schema.type === "integer") {
 					const min = meta.get("expect.min");
-					if (typeof min === "number") schema.minimum = min;
+					if (min) schema.minimum = typeof min === "number" ? min : min.minValue;
 					const max = meta.get("expect.max");
-					if (typeof max === "number") schema.maximum = max;
+					if (max) schema.maximum = typeof max === "number" ? max : max.maxValue;
 				}
 				return schema;
 			}
@@ -1225,9 +1239,22 @@ else handle.prop(prop.id, propHandle.$type);
 			switch (a.name) {
 				case "expect.minLength":
 				case "expect.maxLength":
+					if (a.args[0]) handle.annotate(a.name, {
+						length: Number(a.args[0].text),
+						message: a.args[1]?.text
+					});
+					break;
 				case "expect.min":
+					if (a.args[0]) handle.annotate(a.name, {
+						minValue: Number(a.args[0].text),
+						message: a.args[1]?.text
+					});
+					break;
 				case "expect.max":
-					if (a.args[0]) handle.annotate(a.name, Number(a.args[0].text));
+					if (a.args[0]) handle.annotate(a.name, {
+						maxValue: Number(a.args[0].text),
+						message: a.args[1]?.text
+					});
 					break;
 				case "expect.pattern":
 					handle.annotate(a.name, {

package/dist/index.cjs

@@ -295,8 +295,9 @@ var TypeRenderer = class TypeRenderer extends BaseRenderer {
 				patterns.push(prop);
 				continue;
 			}
-			if (this.isPhantomProp(prop.getDefinition())) {
-				this.writeln(`// ${prop.id}: phantom`);
+			const phantomType = this.phantomPropType(prop.getDefinition());
+			if (phantomType) {
+				this.writeln(`// ${prop.id}: ${phantomType}`);
 				continue;
 			}
 			const optional = !!prop.token("optional");
@@ -342,12 +343,6 @@ var TypeRenderer = class TypeRenderer extends BaseRenderer {
 		if (struct?.entity === "structure") this.renderStructure(struct, node.id);
 else this.writeln("{}");
 		this.writeln();
-		const nsPrefix = exported ? "export declare" : "declare";
-		this.write(`${nsPrefix} namespace ${node.id} `);
-		this.blockln("{}");
-		this.writeln(`type DataType = ${node.id}`);
-		this.popln();
-		this.writeln();
 	}
 	renderType(node) {
 		this.writeln();
@@ -374,12 +369,6 @@ else this.writeln("{}");
 		} else {
 			this.write(exported ? "export declare " : "declare ");
 			this.writeln(`class ${node.id} extends ${targetName} {}`);
-			const nsPrefix = exported ? "export declare" : "declare";
-			this.write(`${nsPrefix} namespace ${node.id} `);
-			this.blockln("{}");
-			this.writeln(`type DataType = ${node.id}`);
-			this.popln();
-			this.writeln();
 		}
 	}
 	renderTypeNamespace(node) {
@@ -398,23 +387,23 @@ else if ((0, __atscript_core.isGroup)(realDef)) typeDef = `TAtscriptTypeComplex<
 else if ((0, __atscript_core.isArray)(realDef)) typeDef = `TAtscriptTypeArray<${name}>`;
 else if ((0, __atscript_core.isPrimitive)(realDef)) typeDef = `TAtscriptTypeFinal<${name}>`;
 		}
-		this.writeln(`type DataType = ${name}`);
 		this.writeln(`const __is_atscript_annotated_type: true`);
 		this.writeln(`const type: ${typeDef}`);
 		this.writeln(`const metadata: TMetadataMap<AtscriptMetadata>`);
-		this.writeln(`const validator: (opts?: Partial<TValidatorOptions>) => Validator<typeof ${name}, ${name}>`);
+		this.writeln(`const validator: (opts?: Partial<TValidatorOptions>) => Validator<typeof ${name}>`);
 		if (resolveJsonSchemaMode(this.opts) === false) this.writeln("/** @deprecated JSON Schema support is disabled. Calling this method will throw a runtime error. To enable, set `jsonSchema: 'lazy'` or `jsonSchema: 'bundle'` in tsPlugin options, or add `@emit.jsonSchema` annotation to individual interfaces. */");
 		this.writeln("const toJsonSchema: () => any");
 		this.popln();
 	}
-	isPhantomProp(def) {
-		if (!def) return false;
-		if ((0, __atscript_core.isPrimitive)(def) && def.id === "phantom") return true;
+	phantomPropType(def) {
+		if (!def) return undefined;
+		if ((0, __atscript_core.isPrimitive)(def) && def.config.type === "phantom") return def.id;
 		if ((0, __atscript_core.isRef)(def)) {
-			const unwound = this.doc.unwindType(def.id, def.chain)?.def;
-			return (0, __atscript_core.isPrimitive)(unwound) && unwound.id === "phantom";
+			const ref = def;
+			const unwound = this.doc.unwindType(ref.id, ref.chain)?.def;
+			if ((0, __atscript_core.isPrimitive)(unwound) && unwound.config.type === "phantom") return ref.hasChain ? `${ref.id}.${ref.chain.map((c) => c.text).join(".")}` : ref.id;
 		}
-		return false;
+		return undefined;
 	}
 	isTypeTarget(name, doc) {
 		const d = doc || this.doc;
@@ -609,14 +598,22 @@ var Validator = class {
 			return false;
 		}
 		const minLength = def.metadata.get("expect.minLength");
-		if (typeof minLength === "number" && value.length < minLength) {
-			this.error(`Expected minimum length of ${minLength} items, got ${value.length} items`);
-			return false;
+		if (minLength) {
+			const length = typeof minLength === "number" ? minLength : minLength.length;
+			if (value.length < length) {
+				const message = typeof minLength === "object" && minLength.message ? minLength.message : `Expected minimum length of ${length} items, got ${value.length} items`;
+				this.error(message);
+				return false;
+			}
 		}
 		const maxLength = def.metadata.get("expect.maxLength");
-		if (typeof maxLength === "number" && value.length > maxLength) {
-			this.error(`Expected maximum length of ${maxLength} items, got ${value.length} items`);
-			return false;
+		if (maxLength) {
+			const length = typeof maxLength === "number" ? maxLength : maxLength.length;
+			if (value.length > length) {
+				const message = typeof maxLength === "object" && maxLength.message ? maxLength.message : `Expected maximum length of ${length} items, got ${value.length} items`;
+				this.error(message);
+				return false;
+			}
 		}
 		let i = 0;
 		let passed = true;
@@ -748,14 +745,22 @@ else {
 	}
 	validateString(def, value) {
 		const minLength = def.metadata.get("expect.minLength");
-		if (typeof minLength === "number" && value.length < minLength) {
-			this.error(`Expected minimum length of ${minLength} characters, got ${value.length} characters`);
-			return false;
+		if (minLength) {
+			const length = typeof minLength === "number" ? minLength : minLength.length;
+			if (value.length < length) {
+				const message = typeof minLength === "object" && minLength.message ? minLength.message : `Expected minimum length of ${length} characters, got ${value.length} characters`;
+				this.error(message);
+				return false;
+			}
 		}
 		const maxLength = def.metadata.get("expect.maxLength");
-		if (typeof maxLength === "number" && value.length > maxLength) {
-			this.error(`Expected maximum length of ${maxLength} characters, got ${value.length} characters`);
-			return false;
+		if (maxLength) {
+			const length = typeof maxLength === "number" ? maxLength : maxLength.length;
+			if (value.length > length) {
+				const message = typeof maxLength === "object" && maxLength.message ? maxLength.message : `Expected maximum length of ${length} characters, got ${value.length} characters`;
+				this.error(message);
+				return false;
+			}
 		}
 		const patterns = def.metadata.get("expect.pattern");
 		for (const { pattern, flags, message } of patterns || []) {
@@ -775,19 +780,28 @@ else {
 	}
 	validateNumber(def, value) {
 		const int = def.metadata.get("expect.int");
-		if (typeof int === "boolean" && int && value % 1 !== 0) {
-			this.error(`Expected integer, got ${value}`);
+		if (int && value % 1 !== 0) {
+			const message = typeof int === "object" && int.message ? int.message : `Expected integer, got ${value}`;
+			this.error(message);
 			return false;
 		}
 		const min = def.metadata.get("expect.min");
-		if (typeof min === "number" && value < min) {
-			this.error(`Expected minimum ${min}, got ${value}`);
-			return false;
+		if (min) {
+			const minValue = typeof min === "number" ? min : min.minValue;
+			if (value < minValue) {
+				const message = typeof min === "object" && min.message ? min.message : `Expected minimum ${minValue}, got ${value}`;
+				this.error(message);
+				return false;
+			}
 		}
 		const max = def.metadata.get("expect.max");
-		if (typeof max === "number" && value > max) {
-			this.error(`Expected maximum ${max}, got ${value}`);
-			return false;
+		if (max) {
+			const maxValue = typeof max === "number" ? max : max.maxValue;
+			if (value > maxValue) {
+				const message = typeof max === "object" && max.message ? max.message : `Expected maximum ${maxValue}, got ${value}`;
+				this.error(message);
+				return false;
+			}
 		}
 		return true;
 	}
@@ -969,9 +983,9 @@ function buildJsonSchema(type) {
 					items: build(d.type.of)
 				};
 				const minLength = meta.get("expect.minLength");
-				if (typeof minLength === "number") schema.minItems = minLength;
+				if (minLength) schema.minItems = typeof minLength === "number" ? minLength : minLength.length;
 				const maxLength = meta.get("expect.maxLength");
-				if (typeof maxLength === "number") schema.maxItems = maxLength;
+				if (maxLength) schema.maxItems = typeof maxLength === "number" ? maxLength : maxLength.length;
 				return schema;
 			},
 			union(d) {
@@ -996,18 +1010,18 @@ function buildJsonSchema(type) {
 				}
 				if (schema.type === "string") {
 					const minLength = meta.get("expect.minLength");
-					if (typeof minLength === "number") schema.minLength = minLength;
+					if (minLength) schema.minLength = typeof minLength === "number" ? minLength : minLength.length;
 					const maxLength = meta.get("expect.maxLength");
-					if (typeof maxLength === "number") schema.maxLength = maxLength;
+					if (maxLength) schema.maxLength = typeof maxLength === "number" ? maxLength : maxLength.length;
 					const patterns = meta.get("expect.pattern");
 					if (patterns?.length) if (patterns.length === 1) schema.pattern = patterns[0].pattern;
 else schema.allOf = (schema.allOf || []).concat(patterns.map((p) => ({ pattern: p.pattern })));
 				}
 				if (schema.type === "number" || schema.type === "integer") {
 					const min = meta.get("expect.min");
-					if (typeof min === "number") schema.minimum = min;
+					if (min) schema.minimum = typeof min === "number" ? min : min.minValue;
 					const max = meta.get("expect.max");
-					if (typeof max === "number") schema.maximum = max;
+					if (max) schema.maximum = typeof max === "number" ? max : max.maxValue;
 				}
 				return schema;
 			}
@@ -1222,9 +1236,22 @@ else handle.prop(prop.id, propHandle.$type);
 			switch (a.name) {
 				case "expect.minLength":
 				case "expect.maxLength":
+					if (a.args[0]) handle.annotate(a.name, {
+						length: Number(a.args[0].text),
+						message: a.args[1]?.text
+					});
+					break;
 				case "expect.min":
+					if (a.args[0]) handle.annotate(a.name, {
+						minValue: Number(a.args[0].text),
+						message: a.args[1]?.text
+					});
+					break;
 				case "expect.max":
-					if (a.args[0]) handle.annotate(a.name, Number(a.args[0].text));
+					if (a.args[0]) handle.annotate(a.name, {
+						maxValue: Number(a.args[0].text),
+						message: a.args[1]?.text
+					});
 					break;
 				case "expect.pattern":
 					handle.annotate(a.name, {

package/dist/index.mjs

@@ -271,8 +271,9 @@ var TypeRenderer = class TypeRenderer extends BaseRenderer {
 				patterns.push(prop);
 				continue;
 			}
-			if (this.isPhantomProp(prop.getDefinition())) {
-				this.writeln(`// ${prop.id}: phantom`);
+			const phantomType = this.phantomPropType(prop.getDefinition());
+			if (phantomType) {
+				this.writeln(`// ${prop.id}: ${phantomType}`);
 				continue;
 			}
 			const optional = !!prop.token("optional");
@@ -318,12 +319,6 @@ var TypeRenderer = class TypeRenderer extends BaseRenderer {
 		if (struct?.entity === "structure") this.renderStructure(struct, node.id);
 else this.writeln("{}");
 		this.writeln();
-		const nsPrefix = exported ? "export declare" : "declare";
-		this.write(`${nsPrefix} namespace ${node.id} `);
-		this.blockln("{}");
-		this.writeln(`type DataType = ${node.id}`);
-		this.popln();
-		this.writeln();
 	}
 	renderType(node) {
 		this.writeln();
@@ -350,12 +345,6 @@ else this.writeln("{}");
 		} else {
 			this.write(exported ? "export declare " : "declare ");
 			this.writeln(`class ${node.id} extends ${targetName} {}`);
-			const nsPrefix = exported ? "export declare" : "declare";
-			this.write(`${nsPrefix} namespace ${node.id} `);
-			this.blockln("{}");
-			this.writeln(`type DataType = ${node.id}`);
-			this.popln();
-			this.writeln();
 		}
 	}
 	renderTypeNamespace(node) {
@@ -374,23 +363,23 @@ else if (isGroup(realDef)) typeDef = `TAtscriptTypeComplex<${name}>`;
 else if (isArray(realDef)) typeDef = `TAtscriptTypeArray<${name}>`;
 else if (isPrimitive(realDef)) typeDef = `TAtscriptTypeFinal<${name}>`;
 		}
-		this.writeln(`type DataType = ${name}`);
 		this.writeln(`const __is_atscript_annotated_type: true`);
 		this.writeln(`const type: ${typeDef}`);
 		this.writeln(`const metadata: TMetadataMap<AtscriptMetadata>`);
-		this.writeln(`const validator: (opts?: Partial<TValidatorOptions>) => Validator<typeof ${name}, ${name}>`);
+		this.writeln(`const validator: (opts?: Partial<TValidatorOptions>) => Validator<typeof ${name}>`);
 		if (resolveJsonSchemaMode(this.opts) === false) this.writeln("/** @deprecated JSON Schema support is disabled. Calling this method will throw a runtime error. To enable, set `jsonSchema: 'lazy'` or `jsonSchema: 'bundle'` in tsPlugin options, or add `@emit.jsonSchema` annotation to individual interfaces. */");
 		this.writeln("const toJsonSchema: () => any");
 		this.popln();
 	}
-	isPhantomProp(def) {
-		if (!def) return false;
-		if (isPrimitive(def) && def.id === "phantom") return true;
+	phantomPropType(def) {
+		if (!def) return undefined;
+		if (isPrimitive(def) && def.config.type === "phantom") return def.id;
 		if (isRef(def)) {
-			const unwound = this.doc.unwindType(def.id, def.chain)?.def;
-			return isPrimitive(unwound) && unwound.id === "phantom";
+			const ref = def;
+			const unwound = this.doc.unwindType(ref.id, ref.chain)?.def;
+			if (isPrimitive(unwound) && unwound.config.type === "phantom") return ref.hasChain ? `${ref.id}.${ref.chain.map((c) => c.text).join(".")}` : ref.id;
 		}
-		return false;
+		return undefined;
 	}
 	isTypeTarget(name, doc) {
 		const d = doc || this.doc;
@@ -585,14 +574,22 @@ var Validator = class {
 			return false;
 		}
 		const minLength = def.metadata.get("expect.minLength");
-		if (typeof minLength === "number" && value.length < minLength) {
-			this.error(`Expected minimum length of ${minLength} items, got ${value.length} items`);
-			return false;
+		if (minLength) {
+			const length = typeof minLength === "number" ? minLength : minLength.length;
+			if (value.length < length) {
+				const message = typeof minLength === "object" && minLength.message ? minLength.message : `Expected minimum length of ${length} items, got ${value.length} items`;
+				this.error(message);
+				return false;
+			}
 		}
 		const maxLength = def.metadata.get("expect.maxLength");
-		if (typeof maxLength === "number" && value.length > maxLength) {
-			this.error(`Expected maximum length of ${maxLength} items, got ${value.length} items`);
-			return false;
+		if (maxLength) {
+			const length = typeof maxLength === "number" ? maxLength : maxLength.length;
+			if (value.length > length) {
+				const message = typeof maxLength === "object" && maxLength.message ? maxLength.message : `Expected maximum length of ${length} items, got ${value.length} items`;
+				this.error(message);
+				return false;
+			}
 		}
 		let i = 0;
 		let passed = true;
@@ -724,14 +721,22 @@ else {
 	}
 	validateString(def, value) {
 		const minLength = def.metadata.get("expect.minLength");
-		if (typeof minLength === "number" && value.length < minLength) {
-			this.error(`Expected minimum length of ${minLength} characters, got ${value.length} characters`);
-			return false;
+		if (minLength) {
+			const length = typeof minLength === "number" ? minLength : minLength.length;
+			if (value.length < length) {
+				const message = typeof minLength === "object" && minLength.message ? minLength.message : `Expected minimum length of ${length} characters, got ${value.length} characters`;
+				this.error(message);
+				return false;
+			}
 		}
 		const maxLength = def.metadata.get("expect.maxLength");
-		if (typeof maxLength === "number" && value.length > maxLength) {
-			this.error(`Expected maximum length of ${maxLength} characters, got ${value.length} characters`);
-			return false;
+		if (maxLength) {
+			const length = typeof maxLength === "number" ? maxLength : maxLength.length;
+			if (value.length > length) {
+				const message = typeof maxLength === "object" && maxLength.message ? maxLength.message : `Expected maximum length of ${length} characters, got ${value.length} characters`;
+				this.error(message);
+				return false;
+			}
 		}
 		const patterns = def.metadata.get("expect.pattern");
 		for (const { pattern, flags, message } of patterns || []) {
@@ -751,19 +756,28 @@ else {
 	}
 	validateNumber(def, value) {
 		const int = def.metadata.get("expect.int");
-		if (typeof int === "boolean" && int && value % 1 !== 0) {
-			this.error(`Expected integer, got ${value}`);
+		if (int && value % 1 !== 0) {
+			const message = typeof int === "object" && int.message ? int.message : `Expected integer, got ${value}`;
+			this.error(message);
 			return false;
 		}
 		const min = def.metadata.get("expect.min");
-		if (typeof min === "number" && value < min) {
-			this.error(`Expected minimum ${min}, got ${value}`);
-			return false;
+		if (min) {
+			const minValue = typeof min === "number" ? min : min.minValue;
+			if (value < minValue) {
+				const message = typeof min === "object" && min.message ? min.message : `Expected minimum ${minValue}, got ${value}`;
+				this.error(message);
+				return false;
+			}
 		}
 		const max = def.metadata.get("expect.max");
-		if (typeof max === "number" && value > max) {
-			this.error(`Expected maximum ${max}, got ${value}`);
-			return false;
+		if (max) {
+			const maxValue = typeof max === "number" ? max : max.maxValue;
+			if (value > maxValue) {
+				const message = typeof max === "object" && max.message ? max.message : `Expected maximum ${maxValue}, got ${value}`;
+				this.error(message);
+				return false;
+			}
 		}
 		return true;
 	}
@@ -945,9 +959,9 @@ function buildJsonSchema(type) {
 					items: build(d.type.of)
 				};
 				const minLength = meta.get("expect.minLength");
-				if (typeof minLength === "number") schema.minItems = minLength;
+				if (minLength) schema.minItems = typeof minLength === "number" ? minLength : minLength.length;
 				const maxLength = meta.get("expect.maxLength");
-				if (typeof maxLength === "number") schema.maxItems = maxLength;
+				if (maxLength) schema.maxItems = typeof maxLength === "number" ? maxLength : maxLength.length;
 				return schema;
 			},
 			union(d) {
@@ -972,18 +986,18 @@ function buildJsonSchema(type) {
 				}
 				if (schema.type === "string") {
 					const minLength = meta.get("expect.minLength");
-					if (typeof minLength === "number") schema.minLength = minLength;
+					if (minLength) schema.minLength = typeof minLength === "number" ? minLength : minLength.length;
 					const maxLength = meta.get("expect.maxLength");
-					if (typeof maxLength === "number") schema.maxLength = maxLength;
+					if (maxLength) schema.maxLength = typeof maxLength === "number" ? maxLength : maxLength.length;
 					const patterns = meta.get("expect.pattern");
 					if (patterns?.length) if (patterns.length === 1) schema.pattern = patterns[0].pattern;
 else schema.allOf = (schema.allOf || []).concat(patterns.map((p) => ({ pattern: p.pattern })));
 				}
 				if (schema.type === "number" || schema.type === "integer") {
 					const min = meta.get("expect.min");
-					if (typeof min === "number") schema.minimum = min;
+					if (min) schema.minimum = typeof min === "number" ? min : min.minValue;
 					const max = meta.get("expect.max");
-					if (typeof max === "number") schema.maximum = max;
+					if (max) schema.maximum = typeof max === "number" ? max : max.maxValue;
 				}
 				return schema;
 			}
@@ -1198,9 +1212,22 @@ else handle.prop(prop.id, propHandle.$type);
 			switch (a.name) {
 				case "expect.minLength":
 				case "expect.maxLength":
+					if (a.args[0]) handle.annotate(a.name, {
+						length: Number(a.args[0].text),
+						message: a.args[1]?.text
+					});
+					break;
 				case "expect.min":
+					if (a.args[0]) handle.annotate(a.name, {
+						minValue: Number(a.args[0].text),
+						message: a.args[1]?.text
+					});
+					break;
 				case "expect.max":
-					if (a.args[0]) handle.annotate(a.name, Number(a.args[0].text));
+					if (a.args[0]) handle.annotate(a.name, {
+						maxValue: Number(a.args[0].text),
+						message: a.args[1]?.text
+					});
 					break;
 				case "expect.pattern":
 					handle.annotate(a.name, {

package/dist/utils.cjs

@@ -154,14 +154,22 @@ var Validator = class {
 			return false;
 		}
 		const minLength = def.metadata.get("expect.minLength");
-		if (typeof minLength === "number" && value.length < minLength) {
-			this.error(`Expected minimum length of ${minLength} items, got ${value.length} items`);
-			return false;
+		if (minLength) {
+			const length = typeof minLength === "number" ? minLength : minLength.length;
+			if (value.length < length) {
+				const message = typeof minLength === "object" && minLength.message ? minLength.message : `Expected minimum length of ${length} items, got ${value.length} items`;
+				this.error(message);
+				return false;
+			}
 		}
 		const maxLength = def.metadata.get("expect.maxLength");
-		if (typeof maxLength === "number" && value.length > maxLength) {
-			this.error(`Expected maximum length of ${maxLength} items, got ${value.length} items`);
-			return false;
+		if (maxLength) {
+			const length = typeof maxLength === "number" ? maxLength : maxLength.length;
+			if (value.length > length) {
+				const message = typeof maxLength === "object" && maxLength.message ? maxLength.message : `Expected maximum length of ${length} items, got ${value.length} items`;
+				this.error(message);
+				return false;
+			}
 		}
 		let i = 0;
 		let passed = true;
@@ -293,14 +301,22 @@ else {
 	}
 	validateString(def, value) {
 		const minLength = def.metadata.get("expect.minLength");
-		if (typeof minLength === "number" && value.length < minLength) {
-			this.error(`Expected minimum length of ${minLength} characters, got ${value.length} characters`);
-			return false;
+		if (minLength) {
+			const length = typeof minLength === "number" ? minLength : minLength.length;
+			if (value.length < length) {
+				const message = typeof minLength === "object" && minLength.message ? minLength.message : `Expected minimum length of ${length} characters, got ${value.length} characters`;
+				this.error(message);
+				return false;
+			}
 		}
 		const maxLength = def.metadata.get("expect.maxLength");
-		if (typeof maxLength === "number" && value.length > maxLength) {
-			this.error(`Expected maximum length of ${maxLength} characters, got ${value.length} characters`);
-			return false;
+		if (maxLength) {
+			const length = typeof maxLength === "number" ? maxLength : maxLength.length;
+			if (value.length > length) {
+				const message = typeof maxLength === "object" && maxLength.message ? maxLength.message : `Expected maximum length of ${length} characters, got ${value.length} characters`;
+				this.error(message);
+				return false;
+			}
 		}
 		const patterns = def.metadata.get("expect.pattern");
 		for (const { pattern, flags, message } of patterns || []) {
@@ -320,19 +336,28 @@ else {
 	}
 	validateNumber(def, value) {
 		const int = def.metadata.get("expect.int");
-		if (typeof int === "boolean" && int && value % 1 !== 0) {
-			this.error(`Expected integer, got ${value}`);
+		if (int && value % 1 !== 0) {
+			const message = typeof int === "object" && int.message ? int.message : `Expected integer, got ${value}`;
+			this.error(message);
 			return false;
 		}
 		const min = def.metadata.get("expect.min");
-		if (typeof min === "number" && value < min) {
-			this.error(`Expected minimum ${min}, got ${value}`);
-			return false;
+		if (min) {
+			const minValue = typeof min === "number" ? min : min.minValue;
+			if (value < minValue) {
+				const message = typeof min === "object" && min.message ? min.message : `Expected minimum ${minValue}, got ${value}`;
+				this.error(message);
+				return false;
+			}
 		}
 		const max = def.metadata.get("expect.max");
-		if (typeof max === "number" && value > max) {
-			this.error(`Expected maximum ${max}, got ${value}`);
-			return false;
+		if (max) {
+			const maxValue = typeof max === "number" ? max : max.maxValue;
+			if (value > maxValue) {
+				const message = typeof max === "object" && max.message ? max.message : `Expected maximum ${maxValue}, got ${value}`;
+				this.error(message);
+				return false;
+			}
 		}
 		return true;
 	}
@@ -527,9 +552,9 @@ function buildJsonSchema(type) {
 					items: build(d.type.of)
 				};
 				const minLength = meta.get("expect.minLength");
-				if (typeof minLength === "number") schema.minItems = minLength;
+				if (minLength) schema.minItems = typeof minLength === "number" ? minLength : minLength.length;
 				const maxLength = meta.get("expect.maxLength");
-				if (typeof maxLength === "number") schema.maxItems = maxLength;
+				if (maxLength) schema.maxItems = typeof maxLength === "number" ? maxLength : maxLength.length;
 				return schema;
 			},
 			union(d) {
@@ -554,18 +579,18 @@ function buildJsonSchema(type) {
 				}
 				if (schema.type === "string") {
 					const minLength = meta.get("expect.minLength");
-					if (typeof minLength === "number") schema.minLength = minLength;
+					if (minLength) schema.minLength = typeof minLength === "number" ? minLength : minLength.length;
 					const maxLength = meta.get("expect.maxLength");
-					if (typeof maxLength === "number") schema.maxLength = maxLength;
+					if (maxLength) schema.maxLength = typeof maxLength === "number" ? maxLength : maxLength.length;
 					const patterns = meta.get("expect.pattern");
 					if (patterns?.length) if (patterns.length === 1) schema.pattern = patterns[0].pattern;
 else schema.allOf = (schema.allOf || []).concat(patterns.map((p) => ({ pattern: p.pattern })));
 				}
 				if (schema.type === "number" || schema.type === "integer") {
 					const min = meta.get("expect.min");
-					if (typeof min === "number") schema.minimum = min;
+					if (min) schema.minimum = typeof min === "number" ? min : min.minValue;
 					const max = meta.get("expect.max");
-					if (typeof max === "number") schema.maximum = max;
+					if (max) schema.maximum = typeof max === "number" ? max : max.maxValue;
 				}
 				return schema;
 			}
@@ -631,14 +656,14 @@ function fromJsonSchema(schema) {
 			}
 			const itemType = s.items ? convert(s.items) : defineAnnotatedType().designType("any").$type;
 			const handle = defineAnnotatedType("array").of(itemType);
-			if (typeof s.minItems === "number") handle.annotate("expect.minLength", s.minItems);
-			if (typeof s.maxItems === "number") handle.annotate("expect.maxLength", s.maxItems);
+			if (typeof s.minItems === "number") handle.annotate("expect.minLength", { length: s.minItems });
+			if (typeof s.maxItems === "number") handle.annotate("expect.maxLength", { length: s.maxItems });
 			return handle.$type;
 		}
 		if (s.type === "string") {
 			const handle = defineAnnotatedType().designType("string").tags("string");
-			if (typeof s.minLength === "number") handle.annotate("expect.minLength", s.minLength);
-			if (typeof s.maxLength === "number") handle.annotate("expect.maxLength", s.maxLength);
+			if (typeof s.minLength === "number") handle.annotate("expect.minLength", { length: s.minLength });
+			if (typeof s.maxLength === "number") handle.annotate("expect.maxLength", { length: s.maxLength });
 			if (s.pattern) handle.annotate("expect.pattern", { pattern: s.pattern }, true);
 			if (s.allOf) {
 				for (const item of s.allOf) if (item.pattern) handle.annotate("expect.pattern", { pattern: item.pattern }, true);
@@ -648,14 +673,14 @@ function fromJsonSchema(schema) {
 		if (s.type === "integer") {
 			const handle = defineAnnotatedType().designType("number").tags("number");
 			handle.annotate("expect.int", true);
-			if (typeof s.minimum === "number") handle.annotate("expect.min", s.minimum);
-			if (typeof s.maximum === "number") handle.annotate("expect.max", s.maximum);
+			if (typeof s.minimum === "number") handle.annotate("expect.min", { minValue: s.minimum });
+			if (typeof s.maximum === "number") handle.annotate("expect.max", { maxValue: s.maximum });
 			return handle.$type;
 		}
 		if (s.type === "number") {
 			const handle = defineAnnotatedType().designType("number").tags("number");
-			if (typeof s.minimum === "number") handle.annotate("expect.min", s.minimum);
-			if (typeof s.maximum === "number") handle.annotate("expect.max", s.maximum);
+			if (typeof s.minimum === "number") handle.annotate("expect.min", { minValue: s.minimum });
+			if (typeof s.maximum === "number") handle.annotate("expect.max", { maxValue: s.maximum });
 			return handle.$type;
 		}
 		if (s.type === "boolean") return defineAnnotatedType().designType("boolean").tags("boolean").$type;

package/dist/utils.mjs

@@ -153,14 +153,22 @@ var Validator = class {
 			return false;
 		}
 		const minLength = def.metadata.get("expect.minLength");
-		if (typeof minLength === "number" && value.length < minLength) {
-			this.error(`Expected minimum length of ${minLength} items, got ${value.length} items`);
-			return false;
+		if (minLength) {
+			const length = typeof minLength === "number" ? minLength : minLength.length;
+			if (value.length < length) {
+				const message = typeof minLength === "object" && minLength.message ? minLength.message : `Expected minimum length of ${length} items, got ${value.length} items`;
+				this.error(message);
+				return false;
+			}
 		}
 		const maxLength = def.metadata.get("expect.maxLength");
-		if (typeof maxLength === "number" && value.length > maxLength) {
-			this.error(`Expected maximum length of ${maxLength} items, got ${value.length} items`);
-			return false;
+		if (maxLength) {
+			const length = typeof maxLength === "number" ? maxLength : maxLength.length;
+			if (value.length > length) {
+				const message = typeof maxLength === "object" && maxLength.message ? maxLength.message : `Expected maximum length of ${length} items, got ${value.length} items`;
+				this.error(message);
+				return false;
+			}
 		}
 		let i = 0;
 		let passed = true;
@@ -292,14 +300,22 @@ else {
 	}
 	validateString(def, value) {
 		const minLength = def.metadata.get("expect.minLength");
-		if (typeof minLength === "number" && value.length < minLength) {
-			this.error(`Expected minimum length of ${minLength} characters, got ${value.length} characters`);
-			return false;
+		if (minLength) {
+			const length = typeof minLength === "number" ? minLength : minLength.length;
+			if (value.length < length) {
+				const message = typeof minLength === "object" && minLength.message ? minLength.message : `Expected minimum length of ${length} characters, got ${value.length} characters`;
+				this.error(message);
+				return false;
+			}
 		}
 		const maxLength = def.metadata.get("expect.maxLength");
-		if (typeof maxLength === "number" && value.length > maxLength) {
-			this.error(`Expected maximum length of ${maxLength} characters, got ${value.length} characters`);
-			return false;
+		if (maxLength) {
+			const length = typeof maxLength === "number" ? maxLength : maxLength.length;
+			if (value.length > length) {
+				const message = typeof maxLength === "object" && maxLength.message ? maxLength.message : `Expected maximum length of ${length} characters, got ${value.length} characters`;
+				this.error(message);
+				return false;
+			}
 		}
 		const patterns = def.metadata.get("expect.pattern");
 		for (const { pattern, flags, message } of patterns || []) {
@@ -319,19 +335,28 @@ else {
 	}
 	validateNumber(def, value) {
 		const int = def.metadata.get("expect.int");
-		if (typeof int === "boolean" && int && value % 1 !== 0) {
-			this.error(`Expected integer, got ${value}`);
+		if (int && value % 1 !== 0) {
+			const message = typeof int === "object" && int.message ? int.message : `Expected integer, got ${value}`;
+			this.error(message);
 			return false;
 		}
 		const min = def.metadata.get("expect.min");
-		if (typeof min === "number" && value < min) {
-			this.error(`Expected minimum ${min}, got ${value}`);
-			return false;
+		if (min) {
+			const minValue = typeof min === "number" ? min : min.minValue;
+			if (value < minValue) {
+				const message = typeof min === "object" && min.message ? min.message : `Expected minimum ${minValue}, got ${value}`;
+				this.error(message);
+				return false;
+			}
 		}
 		const max = def.metadata.get("expect.max");
-		if (typeof max === "number" && value > max) {
-			this.error(`Expected maximum ${max}, got ${value}`);
-			return false;
+		if (max) {
+			const maxValue = typeof max === "number" ? max : max.maxValue;
+			if (value > maxValue) {
+				const message = typeof max === "object" && max.message ? max.message : `Expected maximum ${maxValue}, got ${value}`;
+				this.error(message);
+				return false;
+			}
 		}
 		return true;
 	}
@@ -526,9 +551,9 @@ function buildJsonSchema(type) {
 					items: build(d.type.of)
 				};
 				const minLength = meta.get("expect.minLength");
-				if (typeof minLength === "number") schema.minItems = minLength;
+				if (minLength) schema.minItems = typeof minLength === "number" ? minLength : minLength.length;
 				const maxLength = meta.get("expect.maxLength");
-				if (typeof maxLength === "number") schema.maxItems = maxLength;
+				if (maxLength) schema.maxItems = typeof maxLength === "number" ? maxLength : maxLength.length;
 				return schema;
 			},
 			union(d) {
@@ -553,18 +578,18 @@ function buildJsonSchema(type) {
 				}
 				if (schema.type === "string") {
 					const minLength = meta.get("expect.minLength");
-					if (typeof minLength === "number") schema.minLength = minLength;
+					if (minLength) schema.minLength = typeof minLength === "number" ? minLength : minLength.length;
 					const maxLength = meta.get("expect.maxLength");
-					if (typeof maxLength === "number") schema.maxLength = maxLength;
+					if (maxLength) schema.maxLength = typeof maxLength === "number" ? maxLength : maxLength.length;
 					const patterns = meta.get("expect.pattern");
 					if (patterns?.length) if (patterns.length === 1) schema.pattern = patterns[0].pattern;
 else schema.allOf = (schema.allOf || []).concat(patterns.map((p) => ({ pattern: p.pattern })));
 				}
 				if (schema.type === "number" || schema.type === "integer") {
 					const min = meta.get("expect.min");
-					if (typeof min === "number") schema.minimum = min;
+					if (min) schema.minimum = typeof min === "number" ? min : min.minValue;
 					const max = meta.get("expect.max");
-					if (typeof max === "number") schema.maximum = max;
+					if (max) schema.maximum = typeof max === "number" ? max : max.maxValue;
 				}
 				return schema;
 			}
@@ -630,14 +655,14 @@ function fromJsonSchema(schema) {
 			}
 			const itemType = s.items ? convert(s.items) : defineAnnotatedType().designType("any").$type;
 			const handle = defineAnnotatedType("array").of(itemType);
-			if (typeof s.minItems === "number") handle.annotate("expect.minLength", s.minItems);
-			if (typeof s.maxItems === "number") handle.annotate("expect.maxLength", s.maxItems);
+			if (typeof s.minItems === "number") handle.annotate("expect.minLength", { length: s.minItems });
+			if (typeof s.maxItems === "number") handle.annotate("expect.maxLength", { length: s.maxItems });
 			return handle.$type;
 		}
 		if (s.type === "string") {
 			const handle = defineAnnotatedType().designType("string").tags("string");
-			if (typeof s.minLength === "number") handle.annotate("expect.minLength", s.minLength);
-			if (typeof s.maxLength === "number") handle.annotate("expect.maxLength", s.maxLength);
+			if (typeof s.minLength === "number") handle.annotate("expect.minLength", { length: s.minLength });
+			if (typeof s.maxLength === "number") handle.annotate("expect.maxLength", { length: s.maxLength });
 			if (s.pattern) handle.annotate("expect.pattern", { pattern: s.pattern }, true);
 			if (s.allOf) {
 				for (const item of s.allOf) if (item.pattern) handle.annotate("expect.pattern", { pattern: item.pattern }, true);
@@ -647,14 +672,14 @@ function fromJsonSchema(schema) {
 		if (s.type === "integer") {
 			const handle = defineAnnotatedType().designType("number").tags("number");
 			handle.annotate("expect.int", true);
-			if (typeof s.minimum === "number") handle.annotate("expect.min", s.minimum);
-			if (typeof s.maximum === "number") handle.annotate("expect.max", s.maximum);
+			if (typeof s.minimum === "number") handle.annotate("expect.min", { minValue: s.minimum });
+			if (typeof s.maximum === "number") handle.annotate("expect.max", { maxValue: s.maximum });
 			return handle.$type;
 		}
 		if (s.type === "number") {
 			const handle = defineAnnotatedType().designType("number").tags("number");
-			if (typeof s.minimum === "number") handle.annotate("expect.min", s.minimum);
-			if (typeof s.maximum === "number") handle.annotate("expect.max", s.maximum);
+			if (typeof s.minimum === "number") handle.annotate("expect.min", { minValue: s.minimum });
+			if (typeof s.maximum === "number") handle.annotate("expect.max", { maxValue: s.maximum });
 			return handle.$type;
 		}
 		if (s.type === "boolean") return defineAnnotatedType().designType("boolean").tags("boolean").$type;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atscript/typescript",
-  "version": "0.1.5",
+  "version": "0.1.7",
   "description": "Atscript: typescript-gen support.",
   "type": "module",
   "main": "dist/index.mjs",
@@ -70,7 +70,7 @@
   "homepage": "https://github.com/moostjs/atscript/tree/main/packages/typescript#readme",
   "license": "ISC",
   "peerDependencies": {
-    "@atscript/core": "^0.1.5"
+    "@atscript/core": "^0.1.7"
   },
   "dependencies": {
     "@moostjs/event-cli": "^0.5.32",