@atscript/typescript 0.1.77 → 0.1.78

package/dist/cli.cjs

@@ -1174,8 +1174,45 @@ else metadata.set(key, [a, value]);
 	} else metadata.set(key, [value]);
 else metadata.set(key, value);
 }
+function cloneTypeDef(type) {
+	if (type.kind === "object") {
+		const obj = type;
+		const props = new Map();
+		for (const [k, v] of obj.props) props.set(k, createAnnotatedTypeNode(v.type, new Map(v.metadata), {
+			id: v.id,
+			optional: v.optional
+		}));
+		return {
+			kind: "object",
+			props,
+			propsPatterns: [...obj.propsPatterns],
+			tags: new Set(obj.tags)
+		};
+	}
+	if (type.kind === "array") {
+		const arr = type;
+		return {
+			kind: "array",
+			of: arr.of,
+			tags: new Set(arr.tags)
+		};
+	}
+	if (type.kind === "union" || type.kind === "intersection" || type.kind === "tuple") {
+		const complex = type;
+		return {
+			kind: type.kind,
+			items: [...complex.items],
+			tags: new Set(complex.tags)
+		};
+	}
+	return {
+		...type,
+		tags: new Set(type.tags)
+	};
+}
 function defineAnnotatedType(_kind, base) {
 	const kind = _kind || "";
+	const baseProvided = base !== undefined;
 	const type = base?.type || {};
 	type.kind = kind;
 	if (COMPLEX_KINDS.has(kind)) type.items = [];
@@ -1236,6 +1273,7 @@ function defineAnnotatedType(_kind, base) {
 			return this;
 		},
 		refTo(type$1, chain) {
+			const node = this.$type;
 			if (isAnnotatedType(type$1)) {
 				let newBase = type$1;
 				const typeName = type$1.name || "Unknown";
@@ -1247,20 +1285,19 @@ else {
 						throw new Error(`Can't find prop ${typeName}${keys}`);
 					}
 				}
-				this.$type = createAnnotatedTypeNode(newBase.type, metadata, {
-					id: newBase.id,
-					ref: chain && chain.length > 0 ? {
-						type: () => type$1,
-						field: chain.join(".")
-					} : undefined
-				});
+				node.type = baseProvided ? cloneTypeDef(newBase.type) : newBase.type;
+				node.id = node.id ?? newBase.id;
+				if (chain && chain.length > 0) node.ref = {
+					type: () => type$1,
+					field: chain.join(".")
+				};
 			} else if (typeof type$1 === "function") {
 				const lazyType = type$1;
-				this.$type = createAnnotatedTypeNode({ kind: "" }, metadata, { ref: {
+				const ownId = node.id;
+				node.ref = {
 					type: lazyType,
 					field: chain ? chain.join(".") : ""
-				} });
-				const node = this.$type;
+				};
 				const placeholder = node.type;
 				Object.defineProperty(node, "type", {
 					get() {
@@ -1276,13 +1313,14 @@ else {
 						let target = t;
 						if (chain) for (const c of chain) if (target.type.kind === "object" && target.type.props.has(c)) target = target.type.props.get(c);
 else return t.type;
-						node.id = chain ? target.id : target.id || t.id;
+						node.id = ownId ?? target.id;
+						const resolved = baseProvided ? cloneTypeDef(target.type) : target.type;
 						Object.defineProperty(node, "type", {
-							value: target.type,
+							value: resolved,
 							writable: false,
 							configurable: true
 						});
-						return target.type;
+						return resolved;
 					},
 					configurable: true
 				});

package/dist/index.cjs

@@ -1,6 +1,6 @@
 Object.defineProperty(exports, '__esModule', { value: true });
-const require_plugin = require('./plugin-nPmWdkR5.cjs');
-require('./json-schema-CeDOlb_F.cjs');
+const require_plugin = require('./plugin-Dpxtfrdy.cjs');
+require('./json-schema-3mti4G4J.cjs');
 
 exports.default = require_plugin.tsPlugin
 exports.tsPlugin = require_plugin.tsPlugin

package/dist/index.mjs

@@ -1,4 +1,4 @@
-import { tsPlugin } from "./plugin-Bmibxc6X.mjs";
-import "./json-schema-Bq1dwNoo.mjs";
+import { tsPlugin } from "./plugin-MGtqc_Ev.mjs";
+import "./json-schema-B64qclVa.mjs";
 
 export { tsPlugin as default, tsPlugin };

package/dist/{json-schema-CeDOlb_F.cjs → json-schema-3mti4G4J.cjs}

@@ -549,6 +549,7 @@ function cloneTypeDef(type) {
 }
 function defineAnnotatedType(_kind, base) {
 	const kind = _kind || "";
+	const baseProvided = base !== undefined;
 	const type = base?.type || {};
 	type.kind = kind;
 	if (COMPLEX_KINDS.has(kind)) type.items = [];
@@ -609,6 +610,7 @@ function defineAnnotatedType(_kind, base) {
 			return this;
 		},
 		refTo(type$1, chain) {
+			const node = this.$type;
 			if (isAnnotatedType(type$1)) {
 				let newBase = type$1;
 				const typeName = type$1.name || "Unknown";
@@ -620,20 +622,19 @@ else {
 						throw new Error(`Can't find prop ${typeName}${keys}`);
 					}
 				}
-				this.$type = createAnnotatedTypeNode(newBase.type, metadata, {
-					id: newBase.id,
-					ref: chain && chain.length > 0 ? {
-						type: () => type$1,
-						field: chain.join(".")
-					} : undefined
-				});
+				node.type = baseProvided ? cloneTypeDef(newBase.type) : newBase.type;
+				node.id = node.id ?? newBase.id;
+				if (chain && chain.length > 0) node.ref = {
+					type: () => type$1,
+					field: chain.join(".")
+				};
 			} else if (typeof type$1 === "function") {
 				const lazyType = type$1;
-				this.$type = createAnnotatedTypeNode({ kind: "" }, metadata, { ref: {
+				const ownId = node.id;
+				node.ref = {
 					type: lazyType,
 					field: chain ? chain.join(".") : ""
-				} });
-				const node = this.$type;
+				};
 				const placeholder = node.type;
 				Object.defineProperty(node, "type", {
 					get() {
@@ -649,13 +650,14 @@ else {
 						let target = t;
 						if (chain) for (const c of chain) if (target.type.kind === "object" && target.type.props.has(c)) target = target.type.props.get(c);
 else return t.type;
-						node.id = chain ? target.id : target.id || t.id;
+						node.id = ownId ?? target.id;
+						const resolved = baseProvided ? cloneTypeDef(target.type) : target.type;
 						Object.defineProperty(node, "type", {
-							value: target.type,
+							value: resolved,
 							writable: false,
 							configurable: true
 						});
-						return target.type;
+						return resolved;
 					},
 					configurable: true
 				});

package/dist/{json-schema-Bq1dwNoo.mjs → json-schema-B64qclVa.mjs}

@@ -548,6 +548,7 @@ function cloneTypeDef(type) {
 }
 function defineAnnotatedType(_kind, base) {
 	const kind = _kind || "";
+	const baseProvided = base !== undefined;
 	const type = base?.type || {};
 	type.kind = kind;
 	if (COMPLEX_KINDS.has(kind)) type.items = [];
@@ -608,6 +609,7 @@ function defineAnnotatedType(_kind, base) {
 			return this;
 		},
 		refTo(type$1, chain) {
+			const node = this.$type;
 			if (isAnnotatedType(type$1)) {
 				let newBase = type$1;
 				const typeName = type$1.name || "Unknown";
@@ -619,20 +621,19 @@ else {
 						throw new Error(`Can't find prop ${typeName}${keys}`);
 					}
 				}
-				this.$type = createAnnotatedTypeNode(newBase.type, metadata, {
-					id: newBase.id,
-					ref: chain && chain.length > 0 ? {
-						type: () => type$1,
-						field: chain.join(".")
-					} : undefined
-				});
+				node.type = baseProvided ? cloneTypeDef(newBase.type) : newBase.type;
+				node.id = node.id ?? newBase.id;
+				if (chain && chain.length > 0) node.ref = {
+					type: () => type$1,
+					field: chain.join(".")
+				};
 			} else if (typeof type$1 === "function") {
 				const lazyType = type$1;
-				this.$type = createAnnotatedTypeNode({ kind: "" }, metadata, { ref: {
+				const ownId = node.id;
+				node.ref = {
 					type: lazyType,
 					field: chain ? chain.join(".") : ""
-				} });
-				const node = this.$type;
+				};
 				const placeholder = node.type;
 				Object.defineProperty(node, "type", {
 					get() {
@@ -648,13 +649,14 @@ else {
 						let target = t;
 						if (chain) for (const c of chain) if (target.type.kind === "object" && target.type.props.has(c)) target = target.type.props.get(c);
 else return t.type;
-						node.id = chain ? target.id : target.id || t.id;
+						node.id = ownId ?? target.id;
+						const resolved = baseProvided ? cloneTypeDef(target.type) : target.type;
 						Object.defineProperty(node, "type", {
-							value: target.type,
+							value: resolved,
 							writable: false,
 							configurable: true
 						});
-						return target.type;
+						return resolved;
 					},
 					configurable: true
 				});

package/dist/{plugin-nPmWdkR5.cjs → plugin-Dpxtfrdy.cjs}

@@ -22,7 +22,7 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 }) : target, mod));
 
 //#endregion
-const require_json_schema = require('./json-schema-CeDOlb_F.cjs');
+const require_json_schema = require('./json-schema-3mti4G4J.cjs');
 const path = __toESM(require("path"));
 const __atscript_core = __toESM(require("@atscript/core"));
 

package/dist/{plugin-Bmibxc6X.mjs → plugin-MGtqc_Ev.mjs}

@@ -1,4 +1,4 @@
-import { buildJsonSchema, defineAnnotatedType } from "./json-schema-Bq1dwNoo.mjs";
+import { buildJsonSchema, defineAnnotatedType } from "./json-schema-B64qclVa.mjs";
 import path from "path";
 import { DEFAULT_FORMAT, flattenInterfaceNode, getRelPath, hasNavPropAnnotation, isArray, isBareId, isConst, isGroup, isInterface, isPrimitive, isProp, isQueryLogical, isRef, isStructure } from "@atscript/core";
 

package/dist/test-utils.cjs

@@ -1,6 +1,6 @@
 "use strict";
-const require_plugin = require('./plugin-nPmWdkR5.cjs');
-require('./json-schema-CeDOlb_F.cjs');
+const require_plugin = require('./plugin-Dpxtfrdy.cjs');
+require('./json-schema-3mti4G4J.cjs');
 const path = require_plugin.__toESM(require("path"));
 const __atscript_core = require_plugin.__toESM(require("@atscript/core"));
 const fs = require_plugin.__toESM(require("fs"));

package/dist/test-utils.mjs

@@ -1,5 +1,5 @@
-import { tsPlugin } from "./plugin-Bmibxc6X.mjs";
-import "./json-schema-Bq1dwNoo.mjs";
+import { tsPlugin } from "./plugin-MGtqc_Ev.mjs";
+import "./json-schema-B64qclVa.mjs";
 import path from "path";
 import { build } from "@atscript/core";
 import { readFileSync, writeFileSync } from "fs";

package/dist/utils.cjs

@@ -1,5 +1,5 @@
 "use strict";
-const require_json_schema = require('./json-schema-CeDOlb_F.cjs');
+const require_json_schema = require('./json-schema-3mti4G4J.cjs');
 
 //#region packages/typescript/src/runtime/default-value.ts
 /**

package/dist/utils.mjs

@@ -1,4 +1,4 @@
-import { Validator, ValidatorError, annotate, buildJsonSchema, cloneRefProp, createAnnotatedTypeNode, defineAnnotatedType, detectDiscriminator, forAnnotatedType, fromJsonSchema, isAnnotatedType, isAnnotatedTypeOfPrimitive, isPhantomType, mergeJsonSchemas } from "./json-schema-Bq1dwNoo.mjs";
+import { Validator, ValidatorError, annotate, buildJsonSchema, cloneRefProp, createAnnotatedTypeNode, defineAnnotatedType, detectDiscriminator, forAnnotatedType, fromJsonSchema, isAnnotatedType, isAnnotatedTypeOfPrimitive, isPhantomType, mergeJsonSchemas } from "./json-schema-B64qclVa.mjs";
 
 //#region packages/typescript/src/runtime/default-value.ts
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atscript/typescript",
-  "version": "0.1.77",
+  "version": "0.1.78",
   "description": "Atscript: typescript-gen support.",
   "keywords": [
     "annotations",
@@ -63,8 +63,8 @@
     "./package.json": "./package.json"
   },
   "dependencies": {
-    "@moostjs/event-cli": "^0.6.26",
-    "moost": "^0.6.27"
+    "@moostjs/event-cli": "^0.6.28",
+    "moost": "^0.6.28"
   },
   "devDependencies": {
     "@atscript/db": "^0.1.97",
@@ -73,7 +73,7 @@
   },
   "peerDependencies": {
     "@atscript/db": "^0.1.97",
-    "@atscript/core": "^0.1.77"
+    "@atscript/core": "^0.1.78"
   },
   "peerDependenciesMeta": {
     "@atscript/db": {