@atscript/typescript 0.1.15 → 0.1.17

package/dist/cli.cjs

@@ -957,7 +957,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,
@@ -1310,7 +1309,17 @@ else handle.prop(prop.id, propHandle.$type);
 					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": {
@@ -1454,7 +1463,16 @@ 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 ?? [];
+			}
+		}
+		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);

package/dist/index.cjs

@@ -954,7 +954,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,
@@ -1307,7 +1306,17 @@ else handle.prop(prop.id, propHandle.$type);
 					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": {
@@ -1451,7 +1460,16 @@ 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 ?? [];
+			}
+		}
+		if (annotations === undefined) annotations = this.doc.evalAnnotationsForNode(node);
 		if (this._adHocAnnotations && this._propPath.length > 0) {
 			const path$2 = this._propPath.join(".");
 			const adHoc = this._adHocAnnotations.get(path$2);

package/dist/index.mjs

@@ -930,7 +930,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,
@@ -1283,7 +1282,17 @@ else handle.prop(prop.id, propHandle.$type);
 					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": {
@@ -1427,7 +1436,16 @@ 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 && isRef(nodeDef)) {
+			const refNode = nodeDef;
+			if (!refNode.hasChain) {
+				const resolved = this.doc.unwindType(refNode.id, refNode.chain)?.def;
+				if (resolved && !isPrimitive(resolved)) annotations = node.annotations ?? [];
+			}
+		}
+		if (annotations === undefined) annotations = this.doc.evalAnnotationsForNode(node);
 		if (this._adHocAnnotations && this._propPath.length > 0) {
 			const path$1 = this._propPath.join(".");
 			const adHoc = this._adHocAnnotations.get(path$1);

package/dist/utils.cjs

@@ -509,7 +509,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,

package/dist/utils.mjs

@@ -508,7 +508,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,

package/package.json

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