@atscript/typescript 0.0.31 → 0.1.0

package/dist/cli.cjs

@@ -153,6 +153,7 @@ var BaseRenderer = class extends CodePrinter {
 	}
 	renderInterface(node) {}
 	renderType(node) {}
+	renderAnnotate(node) {}
 	transformFromPath(path$3) {
 		return `${path$3}.as`;
 	}
@@ -187,6 +188,10 @@ var BaseRenderer = class extends CodePrinter {
 				this.renderImport(node);
 				break;
 			}
+			case "annotate": {
+				this.renderAnnotate(node);
+				break;
+			}
 			default: break;
 		}
 	}
@@ -346,6 +351,26 @@ else this.writeln("{}");
 		this.writeln();
 		this.renderTypeNamespace(node);
 	}
+	renderAnnotate(node) {
+		if (node.isMutating) return;
+		const targetName = node.targetName;
+		const unwound = this.doc.unwindType(targetName);
+		if (!unwound?.def) return;
+		const def = this.doc.mergeIntersection(unwound.def);
+		this.writeln();
+		const exported = node.token("export")?.text === "export";
+		this.renderJsDoc(node);
+		if ((0, __atscript_core.isStructure)(def) || (0, __atscript_core.isInterface)(def)) {
+			this.write(exported ? "export declare " : "declare ");
+			this.write(`class ${node.id} `);
+			this.renderStructure(def, node.id);
+		} else {
+			this.write(exported ? "export " : "declare ");
+			this.write(`type ${node.id} = `);
+			this.renderTypeDef(def);
+		}
+		this.writeln();
+	}
 	renderTypeNamespace(node) {
 		this.write(`declare namespace ${node.id} `);
 		this.blockln("{}");
@@ -947,12 +972,42 @@ var JsRenderer = class extends BaseRenderer {
 		if (!this.opts?.preRenderJsonSchema) imports.push("buildJsonSchema as $$");
 		this.writeln(`import { ${imports.join(", ")} } from "@atscript/typescript/utils"`);
 	}
+	buildAdHocMap(annotateNodes) {
+		const map = new Map();
+		for (const annotateNode of annotateNodes) for (const entry of annotateNode.entries) {
+			const path$3 = entry.hasChain ? [entry.id, ...entry.chain.map((c) => c.text)].join(".") : entry.id;
+			const anns = entry.annotations || [];
+			if (anns.length > 0) {
+				const existing = map.get(path$3);
+				map.set(path$3, existing ? [...existing, ...anns] : anns);
+			}
+		}
+		return map.size > 0 ? map : null;
+	}
 	post() {
-		for (const node of this.postAnnotate) {
+		for (const node of this.postAnnotate) if (node.entity === "annotate") {
+			const annotateNode = node;
+			const unwound = this.doc.unwindType(annotateNode.targetName);
+			if (unwound?.def) {
+				let def = this.doc.mergeIntersection(unwound.def);
+				if ((0, __atscript_core.isInterface)(def)) def = def.getDefinition() || def;
+				this._adHocAnnotations = this.buildAdHocMap([annotateNode]);
+				this.annotateType(def, node.id);
+				this._adHocAnnotations = null;
+				this.indent();
+				this.defineMetadataForAnnotateAlias(annotateNode);
+				this.unindent();
+				this.writeln();
+			}
+		} else {
+			const mutatingNodes = this.doc.getAnnotateNodesFor(node.id).filter((n) => n.isMutating);
+			this._adHocAnnotations = this.buildAdHocMap(mutatingNodes);
 			this.annotateType(node.getDefinition(), node.id);
+			this._adHocAnnotations = null;
 			this.indent().defineMetadata(node).unindent();
 			this.writeln();
 		}
+		this.renderMutatingAnnotates();
 		this.writeln("// prettier-ignore-end");
 		super.post();
 	}
@@ -962,21 +1017,7 @@ var JsRenderer = class extends BaseRenderer {
 		this.write(exported ? "export " : "");
 		this.write(`class ${node.id} `);
 		this.blockln("{}");
-		this.writeln("static __is_atscript_annotated_type = true");
-		this.writeln("static type = {}");
-		this.writeln("static metadata = new Map()");
-		if (this.opts?.preRenderJsonSchema) {
-			const schema = JSON.stringify(buildJsonSchema(this.toAnnotatedType(node)));
-			this.writeln(`static _jsonSchema = ${schema}`);
-			this.writeln("static toJsonSchema() {");
-			this.indent().writeln("return this._jsonSchema").unindent();
-			this.writeln("}");
-		} else {
-			this.writeln("static _jsonSchema");
-			this.writeln("static toJsonSchema() {");
-			this.indent().writeln("return this._jsonSchema ?? (this._jsonSchema = $$(this))").unindent();
-			this.writeln("}");
-		}
+		this.renderJsonSchemaMethod(node);
 		this.popln();
 		this.postAnnotate.push(node);
 		this.writeln();
@@ -987,24 +1028,40 @@ var JsRenderer = class extends BaseRenderer {
 		this.write(exported ? "export " : "");
 		this.write(`class ${node.id} `);
 		this.blockln("{}");
-		this.writeln("static __is_atscript_annotated_type = true");
-		this.writeln("static type = {}");
-		this.writeln("static metadata = new Map()");
+		this.renderJsonSchemaMethod(node);
+		this.popln();
+		this.postAnnotate.push(node);
+		this.writeln();
+	}
+	renderAnnotate(node) {
+		if (node.isMutating) {
+			this.mutatingAnnotates.push(node);
+			return;
+		}
+		const targetName = node.targetName;
+		const unwound = this.doc.unwindType(targetName);
+		if (!unwound?.def) return;
+		this.writeln();
+		const exported = node.token("export")?.text === "export";
+		this.write(exported ? "export " : "");
+		this.write(`class ${node.id} `);
+		this.blockln("{}");
+		this.renderJsonSchemaMethod(node);
+		this.popln();
+		this.postAnnotate.push(node);
+		this.writeln();
+	}
+	renderJsonSchemaMethod(node) {
 		if (this.opts?.preRenderJsonSchema) {
 			const schema = JSON.stringify(buildJsonSchema(this.toAnnotatedType(node)));
-			this.writeln(`static _jsonSchema = ${schema}`);
 			this.writeln("static toJsonSchema() {");
-			this.indent().writeln("return this._jsonSchema").unindent();
+			this.indent().writeln(`return ${schema}`).unindent();
 			this.writeln("}");
 		} else {
-			this.writeln("static _jsonSchema");
 			this.writeln("static toJsonSchema() {");
 			this.indent().writeln("return this._jsonSchema ?? (this._jsonSchema = $$(this))").unindent();
 			this.writeln("}");
 		}
-		this.popln();
-		this.postAnnotate.push(node);
-		this.writeln();
 	}
 	toAnnotatedType(node) {
 		return this.toAnnotatedHandle(node).$type;
@@ -1235,6 +1292,7 @@ else handle.prop(prop.id, propHandle.$type);
 		for (const prop of props) {
 			const pattern = prop.token("identifier")?.pattern;
 			const optional = !!prop.token("optional");
+			this._propPath.push(prop.id);
 			if (pattern) {
 				this.writeln(`.propPattern(`);
 				this.indent();
@@ -1250,6 +1308,7 @@ else handle.prop(prop.id, propHandle.$type);
 			this.writeln("  .$type");
 			this.unindent();
 			this.write(`)`);
+			this._propPath.pop();
 		}
 		this.writeln();
 		return this;
@@ -1265,12 +1324,43 @@ else handle.prop(prop.id, propHandle.$type);
 	}
 	defineMetadata(node) {
 		const annotations = this.doc.evalAnnotationsForNode(node);
+		let adHocNames;
+		let adHoc;
+		if (this._adHocAnnotations && this._propPath.length > 0) {
+			const path$3 = this._propPath.join(".");
+			adHoc = this._adHocAnnotations.get(path$3);
+			if (adHoc) adHocNames = new Set(adHoc.map((a) => a.name));
+		}
 		annotations?.forEach((an) => {
+			if (!adHocNames || !adHocNames.has(an.name)) this.resolveAnnotationValue(node, an);
+		});
+		adHoc?.forEach((an) => {
 			this.resolveAnnotationValue(node, an);
 		});
 		return this;
 	}
+	/**
+	* For non-mutating annotate aliases: merge the target's type-level annotations
+	* with the annotate block's own annotations (annotate's take priority).
+	*/ defineMetadataForAnnotateAlias(annotateNode) {
+		const annotateAnnotations = this.doc.evalAnnotationsForNode(annotateNode);
+		const targetDecl = this.doc.getDeclarationOwnerNode(annotateNode.targetName);
+		const targetAnnotations = targetDecl?.node ? targetDecl.doc.evalAnnotationsForNode(targetDecl.node) : undefined;
+		const overriddenNames = new Set(annotateAnnotations?.map((a) => a.name));
+		targetAnnotations?.forEach((an) => {
+			if (!overriddenNames.has(an.name)) this.resolveAnnotationValue(annotateNode, an);
+		});
+		annotateAnnotations?.forEach((an) => {
+			this.resolveAnnotationValue(annotateNode, an);
+		});
+		return this;
+	}
 	resolveAnnotationValue(node, an) {
+		const { value, multiple } = this.computeAnnotationValue(node, an);
+		if (multiple) this.writeln(`.annotate("${escapeQuotes(an.name)}", ${value}, true)`);
+else this.writeln(`.annotate("${escapeQuotes(an.name)}", ${value})`);
+	}
+	computeAnnotationValue(node, an) {
 		const spec = this.doc.resolveAnnotation(an.name);
 		let targetValue = "true";
 		let multiple = false;
@@ -1282,7 +1372,6 @@ else handle.prop(prop.id, propHandle.$type);
 				let i = 0;
 				for (const aSpec of spec.arguments) {
 					if (an.args[i]) targetValue += `${wrapProp(aSpec.name)}: ${aSpec.type === "string" ? `"${escapeQuotes(an.args[i]?.text)}"` : an.args[i]?.text}${i === length - 1 ? "" : ", "} `;
-else {}
 					i++;
 				}
 				targetValue += "}";
@@ -1295,11 +1384,52 @@ else targetValue = "true";
 			multiple = node.countAnnotations(an.name) > 1 || an.args.length > 1;
 			if (an.args.length) targetValue = an.args[0].type === "text" ? `"${escapeQuotes(an.args[0].text)}"` : an.args[0].text;
 		}
-		if (multiple) this.writeln(`.annotate("${escapeQuotes(an.name)}", ${targetValue}, true)`);
-else this.writeln(`.annotate("${escapeQuotes(an.name)}", ${targetValue})`);
+		return {
+			value: targetValue,
+			multiple: !!multiple
+		};
+	}
+	renderMutatingAnnotates() {
+		for (const node of this.mutatingAnnotates) {
+			const targetName = node.targetName;
+			for (const entry of node.entries) {
+				const anns = entry.annotations;
+				if (!anns || anns.length === 0) continue;
+				const parts = entry.hasChain ? [entry.id, ...entry.chain.map((c) => c.text)] : [entry.id];
+				let accessor = targetName;
+				for (const part of parts) accessor += `.type.props.get("${escapeQuotes(part)}")?`;
+				for (const an of anns) {
+					const { value, multiple } = this.computeAnnotationValue(entry, an);
+					if (multiple) {
+						this.writeln(`{`);
+						this.indent();
+						this.writeln(`const __t = ${accessor}.metadata`);
+						this.writeln(`const __k = "${escapeQuotes(an.name)}"`);
+						this.writeln(`const __v = ${value}`);
+						this.writeln(`if (__t) { const __e = __t.get(__k); __t.set(__k, Array.isArray(__e) ? [...__e, __v] : __e !== undefined ? [__e, __v] : [__v]) }`);
+						this.unindent();
+						this.writeln(`}`);
+					} else this.writeln(`${accessor}.metadata.set("${escapeQuotes(an.name)}", ${value})`);
+				}
+			}
+			const topAnnotations = node.annotations;
+			if (topAnnotations && topAnnotations.length > 0) for (const an of topAnnotations) {
+				const { value, multiple } = this.computeAnnotationValue(node, an);
+				if (multiple) {
+					this.writeln(`{`);
+					this.indent();
+					this.writeln(`const __t = ${targetName}.metadata`);
+					this.writeln(`const __k = "${escapeQuotes(an.name)}"`);
+					this.writeln(`const __v = ${value}`);
+					this.writeln(`if (__t) { const __e = __t.get(__k); __t.set(__k, Array.isArray(__e) ? [...__e, __v] : __e !== undefined ? [__e, __v] : [__v]) }`);
+					this.unindent();
+					this.writeln(`}`);
+				} else this.writeln(`${targetName}.metadata.set("${escapeQuotes(an.name)}", ${value})`);
+			}
+		}
 	}
 	constructor(doc, opts) {
-		super(doc), _define_property$1(this, "opts", void 0), _define_property$1(this, "postAnnotate", void 0), this.opts = opts, this.postAnnotate = [];
+		super(doc), _define_property$1(this, "opts", void 0), _define_property$1(this, "postAnnotate", void 0), _define_property$1(this, "mutatingAnnotates", void 0), _define_property$1(this, "_adHocAnnotations", void 0), _define_property$1(this, "_propPath", void 0), this.opts = opts, this.postAnnotate = [], this.mutatingAnnotates = [], this._adHocAnnotations = null, this._propPath = [];
 	}
 };
 
@@ -1370,13 +1500,35 @@ function _ts_param(paramIndex, decorator) {
 	};
 }
 var Commands = class {
-	async default(configFile, format) {
+	async default(configFile, format, noEmit, skipDiag) {
 		const config = await this.getConfig(configFile);
 		if (format) config.format = format;
 		this.logger.log(`Format: ${"\x1B[36m"}${config.format}${"\x1B[39m"}`);
 		const builder = await (0, __atscript_core.build)(config);
-		const out = await builder.write(config);
-		for (const { target } of out) this.logger.log(`✅ created ${"\x1B[32m"}${target}${"\x1B[39m"}`);
+		let errorCount = 0;
+		let warningCount = 0;
+		if (!skipDiag) {
+			const diagMap = await builder.diagnostics();
+			for (const [docId, messages] of diagMap) {
+				const doc = builder.getDoc(docId);
+				for (const m of messages) {
+					if (m.severity === 1) errorCount++;
+else if (m.severity === 2) warningCount++;
+					if (doc) this.logger.log(doc.renderDiagMessage(m, true, true));
+				}
+			}
+		}
+		if (!noEmit) {
+			const out = await builder.write(config);
+			for (const { target } of out) this.logger.log(`✅ created ${"\x1B[32m"}${target}${"\x1B[39m"}`);
+		}
+		if (errorCount > 0 || warningCount > 0) {
+			const parts = [];
+			if (errorCount > 0) parts.push(`${"\x1B[31m"}${errorCount} error${errorCount > 1 ? "s" : ""}${"\x1B[39m"}`);
+			if (warningCount > 0) parts.push(`${"\x1B[33m"}${warningCount} warning${warningCount > 1 ? "s" : ""}${"\x1B[39m"}`);
+			this.logger.log(`\nFound ${parts.join(" and ")}`);
+		}
+		if (errorCount > 0) process.exit(1);
 	}
 	async getConfig(configFile) {
 		const root = process.cwd();
@@ -1411,14 +1563,27 @@ _ts_decorate([
 	(0, moost.Description)("Builds .as files using --config and --format"),
 	(0, __moostjs_event_cli.CliExample)("-c atscript.config.js", "Build .as files using atscript.config.js"),
 	(0, __moostjs_event_cli.CliExample)("-f dts", "Build \"d.ts\" files for \".as\" files"),
+	(0, __moostjs_event_cli.CliExample)("--noEmit", "Only check for errors, do not emit files"),
+	(0, __moostjs_event_cli.CliExample)("--skipDiag", "Emit files without running diagnostics"),
 	_ts_param(0, (0, __moostjs_event_cli.CliOption)("c", "config")),
 	_ts_param(0, (0, moost.Optional)()),
 	_ts_param(0, (0, moost.Description)("Path to config file")),
 	_ts_param(1, (0, __moostjs_event_cli.CliOption)("f", "format")),
 	_ts_param(1, (0, moost.Optional)()),
 	_ts_param(1, (0, moost.Description)("Output format (js|dts), default: \"dts\"")),
+	_ts_param(2, (0, __moostjs_event_cli.CliOption)("noEmit")),
+	_ts_param(2, (0, moost.Optional)()),
+	_ts_param(2, (0, moost.Description)("Only run diagnostics without emitting files")),
+	_ts_param(3, (0, __moostjs_event_cli.CliOption)("skipDiag")),
+	_ts_param(3, (0, moost.Optional)()),
+	_ts_param(3, (0, moost.Description)("Skip diagnostics and always emit files")),
 	_ts_metadata("design:type", Function),
-	_ts_metadata("design:paramtypes", [String, String]),
+	_ts_metadata("design:paramtypes", [
+		String,
+		String,
+		Boolean,
+		Boolean
+	]),
 	_ts_metadata("design:returntype", Promise)
 ], Commands.prototype, "default", null);
 Commands = _ts_decorate([

package/dist/index.cjs

@@ -150,6 +150,7 @@ var BaseRenderer = class extends CodePrinter {
 	}
 	renderInterface(node) {}
 	renderType(node) {}
+	renderAnnotate(node) {}
 	transformFromPath(path$2) {
 		return `${path$2}.as`;
 	}
@@ -184,6 +185,10 @@ var BaseRenderer = class extends CodePrinter {
 				this.renderImport(node);
 				break;
 			}
+			case "annotate": {
+				this.renderAnnotate(node);
+				break;
+			}
 			default: break;
 		}
 	}
@@ -343,6 +348,26 @@ else this.writeln("{}");
 		this.writeln();
 		this.renderTypeNamespace(node);
 	}
+	renderAnnotate(node) {
+		if (node.isMutating) return;
+		const targetName = node.targetName;
+		const unwound = this.doc.unwindType(targetName);
+		if (!unwound?.def) return;
+		const def = this.doc.mergeIntersection(unwound.def);
+		this.writeln();
+		const exported = node.token("export")?.text === "export";
+		this.renderJsDoc(node);
+		if ((0, __atscript_core.isStructure)(def) || (0, __atscript_core.isInterface)(def)) {
+			this.write(exported ? "export declare " : "declare ");
+			this.write(`class ${node.id} `);
+			this.renderStructure(def, node.id);
+		} else {
+			this.write(exported ? "export " : "declare ");
+			this.write(`type ${node.id} = `);
+			this.renderTypeDef(def);
+		}
+		this.writeln();
+	}
 	renderTypeNamespace(node) {
 		this.write(`declare namespace ${node.id} `);
 		this.blockln("{}");
@@ -944,12 +969,42 @@ var JsRenderer = class extends BaseRenderer {
 		if (!this.opts?.preRenderJsonSchema) imports.push("buildJsonSchema as $$");
 		this.writeln(`import { ${imports.join(", ")} } from "@atscript/typescript/utils"`);
 	}
+	buildAdHocMap(annotateNodes) {
+		const map = new Map();
+		for (const annotateNode of annotateNodes) for (const entry of annotateNode.entries) {
+			const path$2 = entry.hasChain ? [entry.id, ...entry.chain.map((c) => c.text)].join(".") : entry.id;
+			const anns = entry.annotations || [];
+			if (anns.length > 0) {
+				const existing = map.get(path$2);
+				map.set(path$2, existing ? [...existing, ...anns] : anns);
+			}
+		}
+		return map.size > 0 ? map : null;
+	}
 	post() {
-		for (const node of this.postAnnotate) {
+		for (const node of this.postAnnotate) if (node.entity === "annotate") {
+			const annotateNode = node;
+			const unwound = this.doc.unwindType(annotateNode.targetName);
+			if (unwound?.def) {
+				let def = this.doc.mergeIntersection(unwound.def);
+				if ((0, __atscript_core.isInterface)(def)) def = def.getDefinition() || def;
+				this._adHocAnnotations = this.buildAdHocMap([annotateNode]);
+				this.annotateType(def, node.id);
+				this._adHocAnnotations = null;
+				this.indent();
+				this.defineMetadataForAnnotateAlias(annotateNode);
+				this.unindent();
+				this.writeln();
+			}
+		} else {
+			const mutatingNodes = this.doc.getAnnotateNodesFor(node.id).filter((n) => n.isMutating);
+			this._adHocAnnotations = this.buildAdHocMap(mutatingNodes);
 			this.annotateType(node.getDefinition(), node.id);
+			this._adHocAnnotations = null;
 			this.indent().defineMetadata(node).unindent();
 			this.writeln();
 		}
+		this.renderMutatingAnnotates();
 		this.writeln("// prettier-ignore-end");
 		super.post();
 	}
@@ -959,21 +1014,7 @@ var JsRenderer = class extends BaseRenderer {
 		this.write(exported ? "export " : "");
 		this.write(`class ${node.id} `);
 		this.blockln("{}");
-		this.writeln("static __is_atscript_annotated_type = true");
-		this.writeln("static type = {}");
-		this.writeln("static metadata = new Map()");
-		if (this.opts?.preRenderJsonSchema) {
-			const schema = JSON.stringify(buildJsonSchema(this.toAnnotatedType(node)));
-			this.writeln(`static _jsonSchema = ${schema}`);
-			this.writeln("static toJsonSchema() {");
-			this.indent().writeln("return this._jsonSchema").unindent();
-			this.writeln("}");
-		} else {
-			this.writeln("static _jsonSchema");
-			this.writeln("static toJsonSchema() {");
-			this.indent().writeln("return this._jsonSchema ?? (this._jsonSchema = $$(this))").unindent();
-			this.writeln("}");
-		}
+		this.renderJsonSchemaMethod(node);
 		this.popln();
 		this.postAnnotate.push(node);
 		this.writeln();
@@ -984,24 +1025,40 @@ var JsRenderer = class extends BaseRenderer {
 		this.write(exported ? "export " : "");
 		this.write(`class ${node.id} `);
 		this.blockln("{}");
-		this.writeln("static __is_atscript_annotated_type = true");
-		this.writeln("static type = {}");
-		this.writeln("static metadata = new Map()");
+		this.renderJsonSchemaMethod(node);
+		this.popln();
+		this.postAnnotate.push(node);
+		this.writeln();
+	}
+	renderAnnotate(node) {
+		if (node.isMutating) {
+			this.mutatingAnnotates.push(node);
+			return;
+		}
+		const targetName = node.targetName;
+		const unwound = this.doc.unwindType(targetName);
+		if (!unwound?.def) return;
+		this.writeln();
+		const exported = node.token("export")?.text === "export";
+		this.write(exported ? "export " : "");
+		this.write(`class ${node.id} `);
+		this.blockln("{}");
+		this.renderJsonSchemaMethod(node);
+		this.popln();
+		this.postAnnotate.push(node);
+		this.writeln();
+	}
+	renderJsonSchemaMethod(node) {
 		if (this.opts?.preRenderJsonSchema) {
 			const schema = JSON.stringify(buildJsonSchema(this.toAnnotatedType(node)));
-			this.writeln(`static _jsonSchema = ${schema}`);
 			this.writeln("static toJsonSchema() {");
-			this.indent().writeln("return this._jsonSchema").unindent();
+			this.indent().writeln(`return ${schema}`).unindent();
 			this.writeln("}");
 		} else {
-			this.writeln("static _jsonSchema");
 			this.writeln("static toJsonSchema() {");
 			this.indent().writeln("return this._jsonSchema ?? (this._jsonSchema = $$(this))").unindent();
 			this.writeln("}");
 		}
-		this.popln();
-		this.postAnnotate.push(node);
-		this.writeln();
 	}
 	toAnnotatedType(node) {
 		return this.toAnnotatedHandle(node).$type;
@@ -1232,6 +1289,7 @@ else handle.prop(prop.id, propHandle.$type);
 		for (const prop of props) {
 			const pattern = prop.token("identifier")?.pattern;
 			const optional = !!prop.token("optional");
+			this._propPath.push(prop.id);
 			if (pattern) {
 				this.writeln(`.propPattern(`);
 				this.indent();
@@ -1247,6 +1305,7 @@ else handle.prop(prop.id, propHandle.$type);
 			this.writeln("  .$type");
 			this.unindent();
 			this.write(`)`);
+			this._propPath.pop();
 		}
 		this.writeln();
 		return this;
@@ -1262,12 +1321,43 @@ else handle.prop(prop.id, propHandle.$type);
 	}
 	defineMetadata(node) {
 		const annotations = this.doc.evalAnnotationsForNode(node);
+		let adHocNames;
+		let adHoc;
+		if (this._adHocAnnotations && this._propPath.length > 0) {
+			const path$2 = this._propPath.join(".");
+			adHoc = this._adHocAnnotations.get(path$2);
+			if (adHoc) adHocNames = new Set(adHoc.map((a) => a.name));
+		}
 		annotations?.forEach((an) => {
+			if (!adHocNames || !adHocNames.has(an.name)) this.resolveAnnotationValue(node, an);
+		});
+		adHoc?.forEach((an) => {
 			this.resolveAnnotationValue(node, an);
 		});
 		return this;
 	}
+	/**
+	* For non-mutating annotate aliases: merge the target's type-level annotations
+	* with the annotate block's own annotations (annotate's take priority).
+	*/ defineMetadataForAnnotateAlias(annotateNode) {
+		const annotateAnnotations = this.doc.evalAnnotationsForNode(annotateNode);
+		const targetDecl = this.doc.getDeclarationOwnerNode(annotateNode.targetName);
+		const targetAnnotations = targetDecl?.node ? targetDecl.doc.evalAnnotationsForNode(targetDecl.node) : undefined;
+		const overriddenNames = new Set(annotateAnnotations?.map((a) => a.name));
+		targetAnnotations?.forEach((an) => {
+			if (!overriddenNames.has(an.name)) this.resolveAnnotationValue(annotateNode, an);
+		});
+		annotateAnnotations?.forEach((an) => {
+			this.resolveAnnotationValue(annotateNode, an);
+		});
+		return this;
+	}
 	resolveAnnotationValue(node, an) {
+		const { value, multiple } = this.computeAnnotationValue(node, an);
+		if (multiple) this.writeln(`.annotate("${escapeQuotes(an.name)}", ${value}, true)`);
+else this.writeln(`.annotate("${escapeQuotes(an.name)}", ${value})`);
+	}
+	computeAnnotationValue(node, an) {
 		const spec = this.doc.resolveAnnotation(an.name);
 		let targetValue = "true";
 		let multiple = false;
@@ -1279,7 +1369,6 @@ else handle.prop(prop.id, propHandle.$type);
 				let i = 0;
 				for (const aSpec of spec.arguments) {
 					if (an.args[i]) targetValue += `${wrapProp(aSpec.name)}: ${aSpec.type === "string" ? `"${escapeQuotes(an.args[i]?.text)}"` : an.args[i]?.text}${i === length - 1 ? "" : ", "} `;
-else {}
 					i++;
 				}
 				targetValue += "}";
@@ -1292,11 +1381,52 @@ else targetValue = "true";
 			multiple = node.countAnnotations(an.name) > 1 || an.args.length > 1;
 			if (an.args.length) targetValue = an.args[0].type === "text" ? `"${escapeQuotes(an.args[0].text)}"` : an.args[0].text;
 		}
-		if (multiple) this.writeln(`.annotate("${escapeQuotes(an.name)}", ${targetValue}, true)`);
-else this.writeln(`.annotate("${escapeQuotes(an.name)}", ${targetValue})`);
+		return {
+			value: targetValue,
+			multiple: !!multiple
+		};
+	}
+	renderMutatingAnnotates() {
+		for (const node of this.mutatingAnnotates) {
+			const targetName = node.targetName;
+			for (const entry of node.entries) {
+				const anns = entry.annotations;
+				if (!anns || anns.length === 0) continue;
+				const parts = entry.hasChain ? [entry.id, ...entry.chain.map((c) => c.text)] : [entry.id];
+				let accessor = targetName;
+				for (const part of parts) accessor += `.type.props.get("${escapeQuotes(part)}")?`;
+				for (const an of anns) {
+					const { value, multiple } = this.computeAnnotationValue(entry, an);
+					if (multiple) {
+						this.writeln(`{`);
+						this.indent();
+						this.writeln(`const __t = ${accessor}.metadata`);
+						this.writeln(`const __k = "${escapeQuotes(an.name)}"`);
+						this.writeln(`const __v = ${value}`);
+						this.writeln(`if (__t) { const __e = __t.get(__k); __t.set(__k, Array.isArray(__e) ? [...__e, __v] : __e !== undefined ? [__e, __v] : [__v]) }`);
+						this.unindent();
+						this.writeln(`}`);
+					} else this.writeln(`${accessor}.metadata.set("${escapeQuotes(an.name)}", ${value})`);
+				}
+			}
+			const topAnnotations = node.annotations;
+			if (topAnnotations && topAnnotations.length > 0) for (const an of topAnnotations) {
+				const { value, multiple } = this.computeAnnotationValue(node, an);
+				if (multiple) {
+					this.writeln(`{`);
+					this.indent();
+					this.writeln(`const __t = ${targetName}.metadata`);
+					this.writeln(`const __k = "${escapeQuotes(an.name)}"`);
+					this.writeln(`const __v = ${value}`);
+					this.writeln(`if (__t) { const __e = __t.get(__k); __t.set(__k, Array.isArray(__e) ? [...__e, __v] : __e !== undefined ? [__e, __v] : [__v]) }`);
+					this.unindent();
+					this.writeln(`}`);
+				} else this.writeln(`${targetName}.metadata.set("${escapeQuotes(an.name)}", ${value})`);
+			}
+		}
 	}
 	constructor(doc, opts) {
-		super(doc), _define_property(this, "opts", void 0), _define_property(this, "postAnnotate", void 0), this.opts = opts, this.postAnnotate = [];
+		super(doc), _define_property(this, "opts", void 0), _define_property(this, "postAnnotate", void 0), _define_property(this, "mutatingAnnotates", void 0), _define_property(this, "_adHocAnnotations", void 0), _define_property(this, "_propPath", void 0), this.opts = opts, this.postAnnotate = [], this.mutatingAnnotates = [], this._adHocAnnotations = null, this._propPath = [];
 	}
 };
 

package/dist/index.mjs

@@ -126,6 +126,7 @@ var BaseRenderer = class extends CodePrinter {
 	}
 	renderInterface(node) {}
 	renderType(node) {}
+	renderAnnotate(node) {}
 	transformFromPath(path$1) {
 		return `${path$1}.as`;
 	}
@@ -160,6 +161,10 @@ var BaseRenderer = class extends CodePrinter {
 				this.renderImport(node);
 				break;
 			}
+			case "annotate": {
+				this.renderAnnotate(node);
+				break;
+			}
 			default: break;
 		}
 	}
@@ -319,6 +324,26 @@ else this.writeln("{}");
 		this.writeln();
 		this.renderTypeNamespace(node);
 	}
+	renderAnnotate(node) {
+		if (node.isMutating) return;
+		const targetName = node.targetName;
+		const unwound = this.doc.unwindType(targetName);
+		if (!unwound?.def) return;
+		const def = this.doc.mergeIntersection(unwound.def);
+		this.writeln();
+		const exported = node.token("export")?.text === "export";
+		this.renderJsDoc(node);
+		if (isStructure(def) || isInterface(def)) {
+			this.write(exported ? "export declare " : "declare ");
+			this.write(`class ${node.id} `);
+			this.renderStructure(def, node.id);
+		} else {
+			this.write(exported ? "export " : "declare ");
+			this.write(`type ${node.id} = `);
+			this.renderTypeDef(def);
+		}
+		this.writeln();
+	}
 	renderTypeNamespace(node) {
 		this.write(`declare namespace ${node.id} `);
 		this.blockln("{}");
@@ -920,12 +945,42 @@ var JsRenderer = class extends BaseRenderer {
 		if (!this.opts?.preRenderJsonSchema) imports.push("buildJsonSchema as $$");
 		this.writeln(`import { ${imports.join(", ")} } from "@atscript/typescript/utils"`);
 	}
+	buildAdHocMap(annotateNodes) {
+		const map = new Map();
+		for (const annotateNode of annotateNodes) for (const entry of annotateNode.entries) {
+			const path$1 = entry.hasChain ? [entry.id, ...entry.chain.map((c) => c.text)].join(".") : entry.id;
+			const anns = entry.annotations || [];
+			if (anns.length > 0) {
+				const existing = map.get(path$1);
+				map.set(path$1, existing ? [...existing, ...anns] : anns);
+			}
+		}
+		return map.size > 0 ? map : null;
+	}
 	post() {
-		for (const node of this.postAnnotate) {
+		for (const node of this.postAnnotate) if (node.entity === "annotate") {
+			const annotateNode = node;
+			const unwound = this.doc.unwindType(annotateNode.targetName);
+			if (unwound?.def) {
+				let def = this.doc.mergeIntersection(unwound.def);
+				if (isInterface(def)) def = def.getDefinition() || def;
+				this._adHocAnnotations = this.buildAdHocMap([annotateNode]);
+				this.annotateType(def, node.id);
+				this._adHocAnnotations = null;
+				this.indent();
+				this.defineMetadataForAnnotateAlias(annotateNode);
+				this.unindent();
+				this.writeln();
+			}
+		} else {
+			const mutatingNodes = this.doc.getAnnotateNodesFor(node.id).filter((n) => n.isMutating);
+			this._adHocAnnotations = this.buildAdHocMap(mutatingNodes);
 			this.annotateType(node.getDefinition(), node.id);
+			this._adHocAnnotations = null;
 			this.indent().defineMetadata(node).unindent();
 			this.writeln();
 		}
+		this.renderMutatingAnnotates();
 		this.writeln("// prettier-ignore-end");
 		super.post();
 	}
@@ -935,21 +990,7 @@ var JsRenderer = class extends BaseRenderer {
 		this.write(exported ? "export " : "");
 		this.write(`class ${node.id} `);
 		this.blockln("{}");
-		this.writeln("static __is_atscript_annotated_type = true");
-		this.writeln("static type = {}");
-		this.writeln("static metadata = new Map()");
-		if (this.opts?.preRenderJsonSchema) {
-			const schema = JSON.stringify(buildJsonSchema(this.toAnnotatedType(node)));
-			this.writeln(`static _jsonSchema = ${schema}`);
-			this.writeln("static toJsonSchema() {");
-			this.indent().writeln("return this._jsonSchema").unindent();
-			this.writeln("}");
-		} else {
-			this.writeln("static _jsonSchema");
-			this.writeln("static toJsonSchema() {");
-			this.indent().writeln("return this._jsonSchema ?? (this._jsonSchema = $$(this))").unindent();
-			this.writeln("}");
-		}
+		this.renderJsonSchemaMethod(node);
 		this.popln();
 		this.postAnnotate.push(node);
 		this.writeln();
@@ -960,24 +1001,40 @@ var JsRenderer = class extends BaseRenderer {
 		this.write(exported ? "export " : "");
 		this.write(`class ${node.id} `);
 		this.blockln("{}");
-		this.writeln("static __is_atscript_annotated_type = true");
-		this.writeln("static type = {}");
-		this.writeln("static metadata = new Map()");
+		this.renderJsonSchemaMethod(node);
+		this.popln();
+		this.postAnnotate.push(node);
+		this.writeln();
+	}
+	renderAnnotate(node) {
+		if (node.isMutating) {
+			this.mutatingAnnotates.push(node);
+			return;
+		}
+		const targetName = node.targetName;
+		const unwound = this.doc.unwindType(targetName);
+		if (!unwound?.def) return;
+		this.writeln();
+		const exported = node.token("export")?.text === "export";
+		this.write(exported ? "export " : "");
+		this.write(`class ${node.id} `);
+		this.blockln("{}");
+		this.renderJsonSchemaMethod(node);
+		this.popln();
+		this.postAnnotate.push(node);
+		this.writeln();
+	}
+	renderJsonSchemaMethod(node) {
 		if (this.opts?.preRenderJsonSchema) {
 			const schema = JSON.stringify(buildJsonSchema(this.toAnnotatedType(node)));
-			this.writeln(`static _jsonSchema = ${schema}`);
 			this.writeln("static toJsonSchema() {");
-			this.indent().writeln("return this._jsonSchema").unindent();
+			this.indent().writeln(`return ${schema}`).unindent();
 			this.writeln("}");
 		} else {
-			this.writeln("static _jsonSchema");
 			this.writeln("static toJsonSchema() {");
 			this.indent().writeln("return this._jsonSchema ?? (this._jsonSchema = $$(this))").unindent();
 			this.writeln("}");
 		}
-		this.popln();
-		this.postAnnotate.push(node);
-		this.writeln();
 	}
 	toAnnotatedType(node) {
 		return this.toAnnotatedHandle(node).$type;
@@ -1208,6 +1265,7 @@ else handle.prop(prop.id, propHandle.$type);
 		for (const prop of props) {
 			const pattern = prop.token("identifier")?.pattern;
 			const optional = !!prop.token("optional");
+			this._propPath.push(prop.id);
 			if (pattern) {
 				this.writeln(`.propPattern(`);
 				this.indent();
@@ -1223,6 +1281,7 @@ else handle.prop(prop.id, propHandle.$type);
 			this.writeln("  .$type");
 			this.unindent();
 			this.write(`)`);
+			this._propPath.pop();
 		}
 		this.writeln();
 		return this;
@@ -1238,12 +1297,43 @@ else handle.prop(prop.id, propHandle.$type);
 	}
 	defineMetadata(node) {
 		const annotations = this.doc.evalAnnotationsForNode(node);
+		let adHocNames;
+		let adHoc;
+		if (this._adHocAnnotations && this._propPath.length > 0) {
+			const path$1 = this._propPath.join(".");
+			adHoc = this._adHocAnnotations.get(path$1);
+			if (adHoc) adHocNames = new Set(adHoc.map((a) => a.name));
+		}
 		annotations?.forEach((an) => {
+			if (!adHocNames || !adHocNames.has(an.name)) this.resolveAnnotationValue(node, an);
+		});
+		adHoc?.forEach((an) => {
 			this.resolveAnnotationValue(node, an);
 		});
 		return this;
 	}
+	/**
+	* For non-mutating annotate aliases: merge the target's type-level annotations
+	* with the annotate block's own annotations (annotate's take priority).
+	*/ defineMetadataForAnnotateAlias(annotateNode) {
+		const annotateAnnotations = this.doc.evalAnnotationsForNode(annotateNode);
+		const targetDecl = this.doc.getDeclarationOwnerNode(annotateNode.targetName);
+		const targetAnnotations = targetDecl?.node ? targetDecl.doc.evalAnnotationsForNode(targetDecl.node) : undefined;
+		const overriddenNames = new Set(annotateAnnotations?.map((a) => a.name));
+		targetAnnotations?.forEach((an) => {
+			if (!overriddenNames.has(an.name)) this.resolveAnnotationValue(annotateNode, an);
+		});
+		annotateAnnotations?.forEach((an) => {
+			this.resolveAnnotationValue(annotateNode, an);
+		});
+		return this;
+	}
 	resolveAnnotationValue(node, an) {
+		const { value, multiple } = this.computeAnnotationValue(node, an);
+		if (multiple) this.writeln(`.annotate("${escapeQuotes(an.name)}", ${value}, true)`);
+else this.writeln(`.annotate("${escapeQuotes(an.name)}", ${value})`);
+	}
+	computeAnnotationValue(node, an) {
 		const spec = this.doc.resolveAnnotation(an.name);
 		let targetValue = "true";
 		let multiple = false;
@@ -1255,7 +1345,6 @@ else handle.prop(prop.id, propHandle.$type);
 				let i = 0;
 				for (const aSpec of spec.arguments) {
 					if (an.args[i]) targetValue += `${wrapProp(aSpec.name)}: ${aSpec.type === "string" ? `"${escapeQuotes(an.args[i]?.text)}"` : an.args[i]?.text}${i === length - 1 ? "" : ", "} `;
-else {}
 					i++;
 				}
 				targetValue += "}";
@@ -1268,11 +1357,52 @@ else targetValue = "true";
 			multiple = node.countAnnotations(an.name) > 1 || an.args.length > 1;
 			if (an.args.length) targetValue = an.args[0].type === "text" ? `"${escapeQuotes(an.args[0].text)}"` : an.args[0].text;
 		}
-		if (multiple) this.writeln(`.annotate("${escapeQuotes(an.name)}", ${targetValue}, true)`);
-else this.writeln(`.annotate("${escapeQuotes(an.name)}", ${targetValue})`);
+		return {
+			value: targetValue,
+			multiple: !!multiple
+		};
+	}
+	renderMutatingAnnotates() {
+		for (const node of this.mutatingAnnotates) {
+			const targetName = node.targetName;
+			for (const entry of node.entries) {
+				const anns = entry.annotations;
+				if (!anns || anns.length === 0) continue;
+				const parts = entry.hasChain ? [entry.id, ...entry.chain.map((c) => c.text)] : [entry.id];
+				let accessor = targetName;
+				for (const part of parts) accessor += `.type.props.get("${escapeQuotes(part)}")?`;
+				for (const an of anns) {
+					const { value, multiple } = this.computeAnnotationValue(entry, an);
+					if (multiple) {
+						this.writeln(`{`);
+						this.indent();
+						this.writeln(`const __t = ${accessor}.metadata`);
+						this.writeln(`const __k = "${escapeQuotes(an.name)}"`);
+						this.writeln(`const __v = ${value}`);
+						this.writeln(`if (__t) { const __e = __t.get(__k); __t.set(__k, Array.isArray(__e) ? [...__e, __v] : __e !== undefined ? [__e, __v] : [__v]) }`);
+						this.unindent();
+						this.writeln(`}`);
+					} else this.writeln(`${accessor}.metadata.set("${escapeQuotes(an.name)}", ${value})`);
+				}
+			}
+			const topAnnotations = node.annotations;
+			if (topAnnotations && topAnnotations.length > 0) for (const an of topAnnotations) {
+				const { value, multiple } = this.computeAnnotationValue(node, an);
+				if (multiple) {
+					this.writeln(`{`);
+					this.indent();
+					this.writeln(`const __t = ${targetName}.metadata`);
+					this.writeln(`const __k = "${escapeQuotes(an.name)}"`);
+					this.writeln(`const __v = ${value}`);
+					this.writeln(`if (__t) { const __e = __t.get(__k); __t.set(__k, Array.isArray(__e) ? [...__e, __v] : __e !== undefined ? [__e, __v] : [__v]) }`);
+					this.unindent();
+					this.writeln(`}`);
+				} else this.writeln(`${targetName}.metadata.set("${escapeQuotes(an.name)}", ${value})`);
+			}
+		}
 	}
 	constructor(doc, opts) {
-		super(doc), _define_property(this, "opts", void 0), _define_property(this, "postAnnotate", void 0), this.opts = opts, this.postAnnotate = [];
+		super(doc), _define_property(this, "opts", void 0), _define_property(this, "postAnnotate", void 0), _define_property(this, "mutatingAnnotates", void 0), _define_property(this, "_adHocAnnotations", void 0), _define_property(this, "_propPath", void 0), this.opts = opts, this.postAnnotate = [], this.mutatingAnnotates = [], this._adHocAnnotations = null, this._propPath = [];
 	}
 };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atscript/typescript",
-  "version": "0.0.31",
+  "version": "0.1.0",
   "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.0.31"
+    "@atscript/core": "^0.1.0"
   },
   "dependencies": {
     "@moostjs/event-cli": "^0.5.32",