@atscript/typescript 0.1.16 → 0.1.18

package/dist/cli.cjs

@@ -23,10 +23,10 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 
 //#endregion
 const __moostjs_event_cli = __toESM(require("@moostjs/event-cli"));
-const moost = __toESM(require("moost"));
+const fs = __toESM(require("fs"));
 const path = __toESM(require("path"));
 const __atscript_core = __toESM(require("@atscript/core"));
-const fs = __toESM(require("fs"));
+const moost = __toESM(require("moost"));
 
 //#region packages/typescript/src/codegen/code-printer.ts
 function _define_property$5(obj, key, value) {
@@ -111,7 +111,7 @@ else if (this.currentLine.length > 0) this.lines.push(this.currentLine);
 		return this;
 	}
 	doPop(withNewLine) {
-		if (!this.blockStack.length) throw new Error("No block to pop (stack is empty).");
+		if (this.blockStack.length === 0) throw new Error("No block to pop (stack is empty).");
 		const closing = this.blockStack.pop();
 		this.unindent();
 		if (withNewLine) this.writeln(closing);
@@ -310,7 +310,7 @@ var TypeRenderer = class TypeRenderer extends BaseRenderer {
 			propsDefs.add(renderedDef);
 			renderedDef.split("\n").forEach((l) => this.writeln(l));
 		}
-		if (patterns.length) {
+		if (patterns.length > 0) {
 			this.write(`[key: string]: `);
 			if (patterns.length > 0) {
 				for (const prop of patterns) propsDefs.add(this.renderTypeDefString(prop.getDefinition()));
@@ -588,7 +588,7 @@ var Validator = class {
 		}
 		let i = 0;
 		for (const item of def.type.items) {
-			this.push(`[${i}]`);
+			this.push(String(i));
 			if (!this.validateSafe(item, value[i])) {
 				this.pop(true);
 				return false;
@@ -624,7 +624,7 @@ var Validator = class {
 		let i = 0;
 		let passed = true;
 		for (const item of value) {
-			this.push(`[${i}]`);
+			this.push(String(i));
 			if (!this.validateSafe(def.type.of, item)) {
 				passed = false;
 				this.pop(true);
@@ -676,7 +676,7 @@ else {
 				pattern,
 				def: propDef
 			});
-			if (matched.length) {
+			if (matched.length > 0) {
 				let keyPassed = false;
 				for (const { def: def$1 } of matched) if (this.validateSafe(def$1, value[key])) {
 					this.pop(false);
@@ -703,7 +703,7 @@ else {
 		return passed;
 	}
 	validatePrimitive(def, value) {
-		if (typeof def.type.value !== "undefined") {
+		if (def.type.value !== undefined) {
 			if (value !== def.type.value) {
 				this.error(`Expected ${def.type.value}, got ${value}`);
 				return false;
@@ -712,40 +712,46 @@ else {
 		}
 		const typeOfValue = Array.isArray(value) ? "array" : typeof value;
 		switch (def.type.designType) {
-			case "never":
+			case "never": {
 				this.error(`This type is impossible, must be an internal problem`);
 				return false;
+			}
 			case "any": return true;
-			case "string":
+			case "string": {
 				if (typeOfValue !== def.type.designType) {
 					this.error(`Expected ${def.type.designType}, got ${typeOfValue}`);
 					return false;
 				}
 				return this.validateString(def, value);
-			case "number":
+			}
+			case "number": {
 				if (typeOfValue !== def.type.designType) {
 					this.error(`Expected ${def.type.designType}, got ${typeOfValue}`);
 					return false;
 				}
 				return this.validateNumber(def, value);
-			case "boolean":
+			}
+			case "boolean": {
 				if (typeOfValue !== def.type.designType) {
 					this.error(`Expected ${def.type.designType}, got ${typeOfValue}`);
 					return false;
 				}
 				return this.validateBoolean(def, value);
-			case "undefined":
+			}
+			case "undefined": {
 				if (value !== undefined) {
 					this.error(`Expected ${def.type.designType}, got ${typeOfValue}`);
 					return false;
 				}
 				return true;
-			case "null":
+			}
+			case "null": {
 				if (value !== null) {
 					this.error(`Expected ${def.type.designType}, got ${typeOfValue}`);
 					return false;
 				}
 				return true;
+			}
 			default: throw new Error(`Unknown type "${def.type.designType}"`);
 		}
 	}
@@ -957,7 +963,6 @@ else throw new Error(`Can't find prop ${typeName}${keys}`);
 				}
 				if (!newBase && keys) throw new Error(`Can't find prop ${typeName}${keys}`);
 else if (!newBase) throw new Error(`"${typeName}" is not annotated type`);
-				for (const [k, v] of newBase.metadata.entries()) if (!metadata.has(k)) metadata.set(k, Array.isArray(v) ? [...v] : v);
 				this.$type = {
 					__is_atscript_annotated_type: true,
 					type: newBase.type,
@@ -1001,7 +1006,7 @@ function buildJsonSchema(type) {
 					type: "object",
 					properties
 				};
-				if (required.length) schema.required = required;
+				if (required.length > 0) schema.required = required;
 				return schema;
 			},
 			array(d) {
@@ -1264,34 +1269,39 @@ else handle.prop(prop.id, propHandle.$type);
 		annotations?.forEach((a) => {
 			switch (a.name) {
 				case "expect.minLength":
-				case "expect.maxLength":
+				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":
+				}
+				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":
+				}
+				case "expect.max": {
 					if (a.args[0]) handle.annotate(a.name, {
 						maxValue: Number(a.args[0].text),
 						message: a.args[1]?.text
 					});
 					break;
-				case "expect.pattern":
+				}
+				case "expect.pattern": {
 					handle.annotate(a.name, {
 						pattern: a.args[0]?.text || "",
 						flags: a.args[1]?.text,
 						message: a.args[2]?.text
 					}, true);
 					break;
-				case "expect.int":
+				}
+				case "expect.int": {
 					handle.annotate(a.name, true);
 					break;
+				}
 				default:
 			}
 		});
@@ -1306,11 +1316,24 @@ else handle.prop(prop.id, propHandle.$type);
 				const ref = node;
 				const decl = this.doc.unwindType(ref.id, ref.chain)?.def;
 				if ((0, __atscript_core.isPrimitive)(decl)) {
-					this.annotateType(decl, name);
-					return this;
+					const ownerDecl = this.doc.getDeclarationOwnerNode(ref.id);
+					if (!ownerDecl?.node || ownerDecl.node.entity !== "type" && ownerDecl.node.entity !== "interface") {
+						this.annotateType(decl, name);
+						return this;
+					}
 				}
 				const chain = ref.hasChain ? `, [${ref.chain.map((c) => `"${escapeQuotes(c.text)}"`).join(", ")}]` : "";
-				this.writeln(`$(${name ? `"", ${name}` : ""})`).indent().writeln(`.refTo(${ref.id}${chain})`).unindent();
+				this.writeln(`$(${name ? `"", ${name}` : ""})`).indent().writeln(`.refTo(${ref.id}${chain})`);
+				if (!ref.hasChain) {
+					const ownerDecl = this.doc.getDeclarationOwnerNode(ref.id);
+					if (ownerDecl?.node) {
+						const typeAnnotations = ownerDecl.doc.evalAnnotationsForNode(ownerDecl.node);
+						typeAnnotations?.forEach((an) => {
+							this.resolveAnnotationValue(ownerDecl.node, an);
+						});
+					}
+				}
+				this.unindent();
 				return this;
 			}
 			case "primitive": {
@@ -1339,7 +1362,7 @@ else handle.prop(prop.id, propHandle.$type);
 				return this;
 			}
 			default: {
-				console.log("!!!!!!! UNKNOWN ", node.entity);
+				console.log("!!!!!!! UNKNOWN", node.entity);
 				return this;
 			}
 		}
@@ -1364,7 +1387,7 @@ else handle.prop(prop.id, propHandle.$type);
 			case "final": return this.writeln(`$(${d()}).designType("${def.value === "void" ? "undefined" : def.value}")`);
 			case "union":
 			case "intersection":
-			case "tuple":
+			case "tuple": {
 				this.writeln(`$(${d(def.kind)})`);
 				this.indent();
 				for (const itemDef of def.items) {
@@ -1377,7 +1400,8 @@ else handle.prop(prop.id, propHandle.$type);
 				}
 				this.unindent();
 				return;
-			case "array":
+			}
+			case "array": {
 				this.writeln(`$(${d("array")})`);
 				this.indent();
 				this.write(".of(");
@@ -1388,7 +1412,8 @@ else handle.prop(prop.id, propHandle.$type);
 				this.writeln(`)`);
 				this.unindent();
 				return;
-			case "object":
+			}
+			case "object": {
 				this.writeln(`$(${d("object")})`);
 				this.indent();
 				for (const [key, propDef] of Object.entries(def.props)) {
@@ -1415,6 +1440,7 @@ else handle.prop(prop.id, propHandle.$type);
 				}
 				this.unindent();
 				return;
+			}
 			default: return this.writeln(`$(${d()}).designType("any")`);
 		}
 	}
@@ -1454,7 +1480,20 @@ else handle.prop(prop.id, propHandle.$type);
 		return this;
 	}
 	defineMetadata(node) {
-		let annotations = this.doc.evalAnnotationsForNode(node);
+		let annotations;
+		const nodeDef = node.getDefinition?.();
+		if (nodeDef && (0, __atscript_core.isRef)(nodeDef)) {
+			const refNode = nodeDef;
+			if (!refNode.hasChain) {
+				const resolved = this.doc.unwindType(refNode.id, refNode.chain)?.def;
+				if (resolved && !(0, __atscript_core.isPrimitive)(resolved)) annotations = node.annotations ?? [];
+else if (resolved && (0, __atscript_core.isPrimitive)(resolved)) {
+					const ownerDecl = this.doc.getDeclarationOwnerNode(refNode.id);
+					if (ownerDecl?.node && (ownerDecl.node.entity === "type" || ownerDecl.node.entity === "interface")) annotations = node.annotations ?? [];
+				}
+			}
+		}
+		if (annotations === undefined) annotations = this.doc.evalAnnotationsForNode(node);
 		if (this._adHocAnnotations && this._propPath.length > 0) {
 			const path$3 = this._propPath.join(".");
 			const adHoc = this._adHocAnnotations.get(path$3);
@@ -1505,7 +1544,7 @@ else targetValue = "true";
 			}
 		} else {
 			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 (an.args.length > 0) targetValue = an.args[0].type === "text" ? `"${escapeQuotes(an.args[0].text)}"` : an.args[0].text;
 		}
 		return {
 			value: targetValue,
@@ -1567,7 +1606,7 @@ else targetValue = "true";
 	* Returns multiple paths when a property appears in multiple union branches.
 	*/ buildMutatingAccessors(targetName, targetDef, parts) {
 		let accessors = [{
-			prefix: targetName + ".type",
+			prefix: `${targetName}.type`,
 			def: targetDef
 		}];
 		for (let i = 0; i < parts.length; i++) {
@@ -1575,17 +1614,17 @@ else targetValue = "true";
 			for (const { prefix, def } of accessors) {
 				const results = this.buildPropPaths(def, parts[i]);
 				if (results.length > 0) for (const result of results) if (i < parts.length - 1) nextAccessors.push({
-					prefix: prefix + result.path + "?.type",
+					prefix: `${prefix}${result.path}?.type`,
 					def: result.propDef
 				});
 else nextAccessors.push({
-					prefix: prefix + result.path + "?",
+					prefix: `${prefix}${result.path}?`,
 					def: result.propDef
 				});
 else {
-					const suffix = `.props.get("${escapeQuotes(parts[i])}")` + (i < parts.length - 1 ? "?.type" : "?");
+					const suffix = `.props.get("${escapeQuotes(parts[i])}")${i < parts.length - 1 ? "?.type" : "?"}`;
 					nextAccessors.push({
-						prefix: prefix + suffix,
+						prefix: `${prefix}${suffix}`,
 						def: undefined
 					});
 				}
@@ -1640,9 +1679,9 @@ function resolveJsonSchemaMode(opts) {
 }
 const tsPlugin = (opts) => {
 	return {
-		name: "typesccript",
+		name: "typescript",
 		render(doc, format) {
-			if (format === "dts") return [{
+			if (format === "dts" || format === __atscript_core.DEFAULT_FORMAT) return [{
 				fileName: `${doc.name}.d.ts`,
 				content: new TypeRenderer(doc, opts).render()
 			}];
@@ -1652,19 +1691,19 @@ const tsPlugin = (opts) => {
 			}];
 		},
 		async buildEnd(output, format, repo) {
-			if (format === "dts") {
+			if (format === "dts" || format === __atscript_core.DEFAULT_FORMAT) {
 				const annotations = await repo.getUsedAnnotations();
 				const tags = await repo.getPrimitivesTags() || new Set();
-				let rendered = [];
+				const rendered = [];
 				for (const [key, val] of Object.entries(annotations)) {
 					const multiple = val.multiple;
-					let typeLine = Array.from(val.types).map((t) => {
+					const typeLine = Array.from(val.types).map((t) => {
 						if (t.type === "object") return `{ ${Object.entries(t.props).map(([k, v]) => `${wrapProp(k)}${v.optional ? "?" : ""}: ${v.type}`).join(", ")} }`;
 else return t.optional ? `${t.type} | true` : t.type;
 					}).join(" | ");
 					rendered.push(`${wrapProp(key)}: ${multiple ? "(" : ""}${typeLine}${multiple ? ")[]" : ""}`);
 				}
-				let renderedTags = Array.from(tags).map((f) => `"${escapeQuotes(f)}"`).join(" | ");
+				const renderedTags = Array.from(tags).map((f) => `"${escapeQuotes(f)}"`).join(" | ");
 				output.push({
 					content: "// prettier-ignore-start\n/* eslint-disable */\n/* oxlint-disable */\n/**\n * 🪄 This file was generated by Atscript\n * It is generated based on annotations used in this project\n * Do not edit this file!\n *\n * Use `npx asc -f dts` command to re-generate this file\n */\nexport {}\n\ndeclare global {\n  interface AtscriptMetadata {\n    " + rendered.join("\n    ") + "\n  }\n" + "  type AtscriptPrimitiveTags = " + renderedTags + "\n" + "}\n" + "// prettier-ignore-end",
 					fileName: "atscript.d.ts",
@@ -1705,7 +1744,7 @@ function _ts_param(paramIndex, decorator) {
 var Commands = class {
 	async default(configFile, format, noEmit, skipDiag) {
 		const config = await this.getConfig(configFile);
-		if (format) config.format = format;
+		config.format = format || __atscript_core.DEFAULT_FORMAT;
 		this.logger.log(`Format: ${"\x1B[36m"}${config.format}${"\x1B[39m"}`);
 		const builder = await (0, __atscript_core.build)(config);
 		let errorCount = 0;
@@ -1751,7 +1790,7 @@ else if (m.severity === 2) warningCount++;
 			}
 			this.logger.log(`No atscript config file found`);
 			return {
-				format: "dts",
+				format: __atscript_core.DEFAULT_FORMAT,
 				plugins: [tsPlugin()]
 			};
 		}
@@ -1773,7 +1812,7 @@ _ts_decorate([
 	_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(1, (0, moost.Description)("Output format (e.g. js, dts). Omit to run all plugins with their default output.")),
 	_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")),
@@ -1793,7 +1832,7 @@ Commands = _ts_decorate([
 	(0, moost.Controller)(),
 	_ts_param(0, (0, moost.InjectMoostLogger)("asc")),
 	_ts_metadata("design:type", Function),
-	_ts_metadata("design:paramtypes", [typeof moost.TConsoleBase === "undefined" ? Object : moost.TConsoleBase])
+	_ts_metadata("design:paramtypes", [typeof TConsoleBase === "undefined" ? Object : TConsoleBase])
 ], Commands);
 
 //#endregion