@atscript/typescript 0.0.28 → 0.0.29

package/dist/cli.cjs

@@ -154,7 +154,7 @@ var BaseRenderer = class extends CodePrinter {
 	renderInterface(node) {}
 	renderType(node) {}
 	transformFromPath(path$3) {
-		return path$3 + ".as";
+		return `${path$3}.as`;
 	}
 	renderImport(node) {
 		const def = node.getDefinition();
@@ -219,7 +219,7 @@ function _define_property$3(obj, key, value) {
 else obj[key] = value;
 	return obj;
 }
-var TypeRenderer = class extends BaseRenderer {
+var TypeRenderer = class TypeRenderer extends BaseRenderer {
 	pre() {
 		this.writeln("// prettier-ignore-start");
 		this.writeln("/* eslint-disable */");
@@ -234,6 +234,11 @@ var TypeRenderer = class extends BaseRenderer {
 	post() {
 		this.writeln("// prettier-ignore-end");
 	}
+	renderTypeDefString(def) {
+		const newThis = new TypeRenderer(this.doc, this.opts);
+		newThis.renderTypeDef(def);
+		return newThis.toString();
+	}
 	renderTypeDef(def) {
 		if (!def) {
 			this.write("unknown");
@@ -282,33 +287,33 @@ var TypeRenderer = class extends BaseRenderer {
 	renderStructure(struct, asClass) {
 		this.blockln("{}");
 		const patterns = [];
-		let hasProp = false;
+		const propsDefs = new Set();
 		for (const prop of Array.from(struct.props.values())) {
 			if (prop.token("identifier")?.pattern) {
 				patterns.push(prop);
 				continue;
 			}
-			hasProp = true;
 			const optional = !!prop.token("optional");
 			this.write(wrapProp(prop.id), optional ? "?" : "", ": ");
-			this.renderTypeDef(prop.getDefinition());
-			this.writeln();
+			const renderedDef = this.renderTypeDefString(prop.getDefinition());
+			propsDefs.add(renderedDef);
+			renderedDef.split("\n").forEach((l) => this.writeln(l));
 		}
 		if (patterns.length) {
 			this.write(`[key: string]: `);
-			if (hasProp) this.writeln("any");
-else if (patterns.length === 1) {
-				this.renderTypeDef(patterns[0].getDefinition());
-				this.writeln();
-			} else {
-				this.indent();
-				for (const prop of patterns) {
+			if (patterns.length > 0) {
+				for (const prop of patterns) propsDefs.add(this.renderTypeDefString(prop.getDefinition()));
+				const defs = Array.from(propsDefs);
+				if (defs.length > 1) {
+					this.indent();
+					for (const def of defs) {
+						this.writeln();
+						this.write("| ");
+						def.split("\n").forEach((l) => this.write(l.trim()));
+					}
+					this.unindent();
 					this.writeln();
-					this.write("| ");
-					this.renderTypeDef(prop.getDefinition());
-				}
-				this.unindent();
-				this.writeln();
+				} else defs[0].split("\n").forEach((l) => this.writeln(l));
 			}
 		}
 		if (asClass) {
@@ -359,7 +364,7 @@ else if ((0, __atscript_core.isPrimitive)(realDef)) typeDef = "TAtscriptTypeFina
 		this.writeln(`const type: ${typeDef}`);
 		this.writeln(`const metadata: TMetadataMap<AtscriptMetadata>`);
 		this.writeln(`const validator: <TT extends TAtscriptAnnotatedTypeConstructor = ${node.id}>(opts?: Partial<TValidatorOptions>) => Validator<TT>`);
-		if (this.opts?.jsonSchema) this.writeln("const toJsonSchema: () => any");
+		this.writeln("const toJsonSchema: () => any");
 		this.popln();
 	}
 	renderJsDoc(node) {

package/dist/index.cjs

@@ -152,7 +152,7 @@ var BaseRenderer = class extends CodePrinter {
 	renderInterface(node) {}
 	renderType(node) {}
 	transformFromPath(path$2) {
-		return path$2 + ".as";
+		return `${path$2}.as`;
 	}
 	renderImport(node) {
 		const def = node.getDefinition();
@@ -217,7 +217,7 @@ function _define_property$2(obj, key, value) {
 else obj[key] = value;
 	return obj;
 }
-var TypeRenderer = class extends BaseRenderer {
+var TypeRenderer = class TypeRenderer extends BaseRenderer {
 	pre() {
 		this.writeln("// prettier-ignore-start");
 		this.writeln("/* eslint-disable */");
@@ -232,6 +232,11 @@ var TypeRenderer = class extends BaseRenderer {
 	post() {
 		this.writeln("// prettier-ignore-end");
 	}
+	renderTypeDefString(def) {
+		const newThis = new TypeRenderer(this.doc, this.opts);
+		newThis.renderTypeDef(def);
+		return newThis.toString();
+	}
 	renderTypeDef(def) {
 		if (!def) {
 			this.write("unknown");
@@ -280,33 +285,33 @@ var TypeRenderer = class extends BaseRenderer {
 	renderStructure(struct, asClass) {
 		this.blockln("{}");
 		const patterns = [];
-		let hasProp = false;
+		const propsDefs = new Set();
 		for (const prop of Array.from(struct.props.values())) {
 			if (prop.token("identifier")?.pattern) {
 				patterns.push(prop);
 				continue;
 			}
-			hasProp = true;
 			const optional = !!prop.token("optional");
 			this.write(wrapProp(prop.id), optional ? "?" : "", ": ");
-			this.renderTypeDef(prop.getDefinition());
-			this.writeln();
+			const renderedDef = this.renderTypeDefString(prop.getDefinition());
+			propsDefs.add(renderedDef);
+			renderedDef.split("\n").forEach((l) => this.writeln(l));
 		}
 		if (patterns.length) {
 			this.write(`[key: string]: `);
-			if (hasProp) this.writeln("any");
-else if (patterns.length === 1) {
-				this.renderTypeDef(patterns[0].getDefinition());
-				this.writeln();
-			} else {
-				this.indent();
-				for (const prop of patterns) {
+			if (patterns.length > 0) {
+				for (const prop of patterns) propsDefs.add(this.renderTypeDefString(prop.getDefinition()));
+				const defs = Array.from(propsDefs);
+				if (defs.length > 1) {
+					this.indent();
+					for (const def of defs) {
+						this.writeln();
+						this.write("| ");
+						def.split("\n").forEach((l) => this.write(l.trim()));
+					}
+					this.unindent();
 					this.writeln();
-					this.write("| ");
-					this.renderTypeDef(prop.getDefinition());
-				}
-				this.unindent();
-				this.writeln();
+				} else defs[0].split("\n").forEach((l) => this.writeln(l));
 			}
 		}
 		if (asClass) {
@@ -357,7 +362,7 @@ else if ((0, __atscript_core.isPrimitive)(realDef)) typeDef = "TAtscriptTypeFina
 		this.writeln(`const type: ${typeDef}`);
 		this.writeln(`const metadata: TMetadataMap<AtscriptMetadata>`);
 		this.writeln(`const validator: <TT extends TAtscriptAnnotatedTypeConstructor = ${node.id}>(opts?: Partial<TValidatorOptions>) => Validator<TT>`);
-		if (this.opts?.jsonSchema) this.writeln("const toJsonSchema: () => any");
+		this.writeln("const toJsonSchema: () => any");
 		this.popln();
 	}
 	renderJsDoc(node) {

package/dist/index.mjs

@@ -127,7 +127,7 @@ var BaseRenderer = class extends CodePrinter {
 	renderInterface(node) {}
 	renderType(node) {}
 	transformFromPath(path$1) {
-		return path$1 + ".as";
+		return `${path$1}.as`;
 	}
 	renderImport(node) {
 		const def = node.getDefinition();
@@ -192,7 +192,7 @@ function _define_property$2(obj, key, value) {
 else obj[key] = value;
 	return obj;
 }
-var TypeRenderer = class extends BaseRenderer {
+var TypeRenderer = class TypeRenderer extends BaseRenderer {
 	pre() {
 		this.writeln("// prettier-ignore-start");
 		this.writeln("/* eslint-disable */");
@@ -207,6 +207,11 @@ var TypeRenderer = class extends BaseRenderer {
 	post() {
 		this.writeln("// prettier-ignore-end");
 	}
+	renderTypeDefString(def) {
+		const newThis = new TypeRenderer(this.doc, this.opts);
+		newThis.renderTypeDef(def);
+		return newThis.toString();
+	}
 	renderTypeDef(def) {
 		if (!def) {
 			this.write("unknown");
@@ -255,33 +260,33 @@ var TypeRenderer = class extends BaseRenderer {
 	renderStructure(struct, asClass) {
 		this.blockln("{}");
 		const patterns = [];
-		let hasProp = false;
+		const propsDefs = new Set();
 		for (const prop of Array.from(struct.props.values())) {
 			if (prop.token("identifier")?.pattern) {
 				patterns.push(prop);
 				continue;
 			}
-			hasProp = true;
 			const optional = !!prop.token("optional");
 			this.write(wrapProp(prop.id), optional ? "?" : "", ": ");
-			this.renderTypeDef(prop.getDefinition());
-			this.writeln();
+			const renderedDef = this.renderTypeDefString(prop.getDefinition());
+			propsDefs.add(renderedDef);
+			renderedDef.split("\n").forEach((l) => this.writeln(l));
 		}
 		if (patterns.length) {
 			this.write(`[key: string]: `);
-			if (hasProp) this.writeln("any");
-else if (patterns.length === 1) {
-				this.renderTypeDef(patterns[0].getDefinition());
-				this.writeln();
-			} else {
-				this.indent();
-				for (const prop of patterns) {
+			if (patterns.length > 0) {
+				for (const prop of patterns) propsDefs.add(this.renderTypeDefString(prop.getDefinition()));
+				const defs = Array.from(propsDefs);
+				if (defs.length > 1) {
+					this.indent();
+					for (const def of defs) {
+						this.writeln();
+						this.write("| ");
+						def.split("\n").forEach((l) => this.write(l.trim()));
+					}
+					this.unindent();
 					this.writeln();
-					this.write("| ");
-					this.renderTypeDef(prop.getDefinition());
-				}
-				this.unindent();
-				this.writeln();
+				} else defs[0].split("\n").forEach((l) => this.writeln(l));
 			}
 		}
 		if (asClass) {
@@ -332,7 +337,7 @@ else if (isPrimitive(realDef)) typeDef = "TAtscriptTypeFinal";
 		this.writeln(`const type: ${typeDef}`);
 		this.writeln(`const metadata: TMetadataMap<AtscriptMetadata>`);
 		this.writeln(`const validator: <TT extends TAtscriptAnnotatedTypeConstructor = ${node.id}>(opts?: Partial<TValidatorOptions>) => Validator<TT>`);
-		if (this.opts?.jsonSchema) this.writeln("const toJsonSchema: () => any");
+		this.writeln("const toJsonSchema: () => any");
 		this.popln();
 	}
 	renderJsDoc(node) {

package/package.json

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