@atscript/typescript 0.1.4 → 0.1.6

package/dist/cli.cjs

@@ -298,8 +298,9 @@ var TypeRenderer = class TypeRenderer extends BaseRenderer {
 				patterns.push(prop);
 				continue;
 			}
-			if (this.isPhantomProp(prop.getDefinition())) {
-				this.writeln(`// ${prop.id}: phantom`);
+			const phantomType = this.phantomPropType(prop.getDefinition());
+			if (phantomType) {
+				this.writeln(`// ${prop.id}: ${phantomType}`);
 				continue;
 			}
 			const optional = !!prop.token("optional");
@@ -345,12 +346,6 @@ var TypeRenderer = class TypeRenderer extends BaseRenderer {
 		if (struct?.entity === "structure") this.renderStructure(struct, node.id);
 else this.writeln("{}");
 		this.writeln();
-		const nsPrefix = exported ? "export declare" : "declare";
-		this.write(`${nsPrefix} namespace ${node.id} `);
-		this.blockln("{}");
-		this.writeln(`type DataType = ${node.id}`);
-		this.popln();
-		this.writeln();
 	}
 	renderType(node) {
 		this.writeln();
@@ -377,12 +372,6 @@ else this.writeln("{}");
 		} else {
 			this.write(exported ? "export declare " : "declare ");
 			this.writeln(`class ${node.id} extends ${targetName} {}`);
-			const nsPrefix = exported ? "export declare" : "declare";
-			this.write(`${nsPrefix} namespace ${node.id} `);
-			this.blockln("{}");
-			this.writeln(`type DataType = ${node.id}`);
-			this.popln();
-			this.writeln();
 		}
 	}
 	renderTypeNamespace(node) {
@@ -401,23 +390,23 @@ else if ((0, __atscript_core.isGroup)(realDef)) typeDef = `TAtscriptTypeComplex<
 else if ((0, __atscript_core.isArray)(realDef)) typeDef = `TAtscriptTypeArray<${name}>`;
 else if ((0, __atscript_core.isPrimitive)(realDef)) typeDef = `TAtscriptTypeFinal<${name}>`;
 		}
-		this.writeln(`type DataType = ${name}`);
 		this.writeln(`const __is_atscript_annotated_type: true`);
 		this.writeln(`const type: ${typeDef}`);
 		this.writeln(`const metadata: TMetadataMap<AtscriptMetadata>`);
-		this.writeln(`const validator: (opts?: Partial<TValidatorOptions>) => Validator<typeof ${name}, ${name}>`);
+		this.writeln(`const validator: (opts?: Partial<TValidatorOptions>) => Validator<typeof ${name}>`);
 		if (resolveJsonSchemaMode(this.opts) === false) this.writeln("/** @deprecated JSON Schema support is disabled. Calling this method will throw a runtime error. To enable, set `jsonSchema: 'lazy'` or `jsonSchema: 'bundle'` in tsPlugin options, or add `@emit.jsonSchema` annotation to individual interfaces. */");
 		this.writeln("const toJsonSchema: () => any");
 		this.popln();
 	}
-	isPhantomProp(def) {
-		if (!def) return false;
-		if ((0, __atscript_core.isPrimitive)(def) && def.id === "phantom") return true;
+	phantomPropType(def) {
+		if (!def) return undefined;
+		if ((0, __atscript_core.isPrimitive)(def) && def.config.type === "phantom") return def.id;
 		if ((0, __atscript_core.isRef)(def)) {
-			const unwound = this.doc.unwindType(def.id, def.chain)?.def;
-			return (0, __atscript_core.isPrimitive)(unwound) && unwound.id === "phantom";
+			const ref = def;
+			const unwound = this.doc.unwindType(ref.id, ref.chain)?.def;
+			if ((0, __atscript_core.isPrimitive)(unwound) && unwound.config.type === "phantom") return ref.hasChain ? `${ref.id}.${ref.chain.map((c) => c.text).join(".")}` : ref.id;
 		}
-		return false;
+		return undefined;
 	}
 	isTypeTarget(name, doc) {
 		const d = doc || this.doc;
@@ -1172,7 +1161,7 @@ else {
 			case "primitive": {
 				const prim = node;
 				const handle = defineAnnotatedType();
-				handle.designType(prim.id === "never" ? "never" : prim.id === "phantom" ? "phantom" : prim.config.type);
+				handle.designType(prim.id === "never" ? "never" : prim.config.type);
 				if (!skipAnnotations) this.applyExpectAnnotations(handle, this.doc.evalAnnotationsForNode(node));
 				return handle;
 			}
@@ -1299,7 +1288,7 @@ else handle.prop(prop.id, propHandle.$type);
 		return this;
 	}
 	definePrimitive(node, name) {
-		this.renderPrimitiveDef(node.id === "never" ? "never" : node.id === "phantom" ? "phantom" : node.config.type, name);
+		this.renderPrimitiveDef(node.id === "never" ? "never" : node.config.type, name);
 		this.writeln(`  .tags(${Array.from(node.tags).map((f) => `"${escapeQuotes(f)}"`).join(", ")})`);
 		return this;
 	}

package/dist/index.cjs

@@ -295,8 +295,9 @@ var TypeRenderer = class TypeRenderer extends BaseRenderer {
 				patterns.push(prop);
 				continue;
 			}
-			if (this.isPhantomProp(prop.getDefinition())) {
-				this.writeln(`// ${prop.id}: phantom`);
+			const phantomType = this.phantomPropType(prop.getDefinition());
+			if (phantomType) {
+				this.writeln(`// ${prop.id}: ${phantomType}`);
 				continue;
 			}
 			const optional = !!prop.token("optional");
@@ -342,12 +343,6 @@ var TypeRenderer = class TypeRenderer extends BaseRenderer {
 		if (struct?.entity === "structure") this.renderStructure(struct, node.id);
 else this.writeln("{}");
 		this.writeln();
-		const nsPrefix = exported ? "export declare" : "declare";
-		this.write(`${nsPrefix} namespace ${node.id} `);
-		this.blockln("{}");
-		this.writeln(`type DataType = ${node.id}`);
-		this.popln();
-		this.writeln();
 	}
 	renderType(node) {
 		this.writeln();
@@ -374,12 +369,6 @@ else this.writeln("{}");
 		} else {
 			this.write(exported ? "export declare " : "declare ");
 			this.writeln(`class ${node.id} extends ${targetName} {}`);
-			const nsPrefix = exported ? "export declare" : "declare";
-			this.write(`${nsPrefix} namespace ${node.id} `);
-			this.blockln("{}");
-			this.writeln(`type DataType = ${node.id}`);
-			this.popln();
-			this.writeln();
 		}
 	}
 	renderTypeNamespace(node) {
@@ -398,23 +387,23 @@ else if ((0, __atscript_core.isGroup)(realDef)) typeDef = `TAtscriptTypeComplex<
 else if ((0, __atscript_core.isArray)(realDef)) typeDef = `TAtscriptTypeArray<${name}>`;
 else if ((0, __atscript_core.isPrimitive)(realDef)) typeDef = `TAtscriptTypeFinal<${name}>`;
 		}
-		this.writeln(`type DataType = ${name}`);
 		this.writeln(`const __is_atscript_annotated_type: true`);
 		this.writeln(`const type: ${typeDef}`);
 		this.writeln(`const metadata: TMetadataMap<AtscriptMetadata>`);
-		this.writeln(`const validator: (opts?: Partial<TValidatorOptions>) => Validator<typeof ${name}, ${name}>`);
+		this.writeln(`const validator: (opts?: Partial<TValidatorOptions>) => Validator<typeof ${name}>`);
 		if (resolveJsonSchemaMode(this.opts) === false) this.writeln("/** @deprecated JSON Schema support is disabled. Calling this method will throw a runtime error. To enable, set `jsonSchema: 'lazy'` or `jsonSchema: 'bundle'` in tsPlugin options, or add `@emit.jsonSchema` annotation to individual interfaces. */");
 		this.writeln("const toJsonSchema: () => any");
 		this.popln();
 	}
-	isPhantomProp(def) {
-		if (!def) return false;
-		if ((0, __atscript_core.isPrimitive)(def) && def.id === "phantom") return true;
+	phantomPropType(def) {
+		if (!def) return undefined;
+		if ((0, __atscript_core.isPrimitive)(def) && def.config.type === "phantom") return def.id;
 		if ((0, __atscript_core.isRef)(def)) {
-			const unwound = this.doc.unwindType(def.id, def.chain)?.def;
-			return (0, __atscript_core.isPrimitive)(unwound) && unwound.id === "phantom";
+			const ref = def;
+			const unwound = this.doc.unwindType(ref.id, ref.chain)?.def;
+			if ((0, __atscript_core.isPrimitive)(unwound) && unwound.config.type === "phantom") return ref.hasChain ? `${ref.id}.${ref.chain.map((c) => c.text).join(".")}` : ref.id;
 		}
-		return false;
+		return undefined;
 	}
 	isTypeTarget(name, doc) {
 		const d = doc || this.doc;
@@ -1169,7 +1158,7 @@ else {
 			case "primitive": {
 				const prim = node;
 				const handle = defineAnnotatedType();
-				handle.designType(prim.id === "never" ? "never" : prim.id === "phantom" ? "phantom" : prim.config.type);
+				handle.designType(prim.id === "never" ? "never" : prim.config.type);
 				if (!skipAnnotations) this.applyExpectAnnotations(handle, this.doc.evalAnnotationsForNode(node));
 				return handle;
 			}
@@ -1296,7 +1285,7 @@ else handle.prop(prop.id, propHandle.$type);
 		return this;
 	}
 	definePrimitive(node, name) {
-		this.renderPrimitiveDef(node.id === "never" ? "never" : node.id === "phantom" ? "phantom" : node.config.type, name);
+		this.renderPrimitiveDef(node.id === "never" ? "never" : node.config.type, name);
 		this.writeln(`  .tags(${Array.from(node.tags).map((f) => `"${escapeQuotes(f)}"`).join(", ")})`);
 		return this;
 	}

package/dist/index.mjs

@@ -271,8 +271,9 @@ var TypeRenderer = class TypeRenderer extends BaseRenderer {
 				patterns.push(prop);
 				continue;
 			}
-			if (this.isPhantomProp(prop.getDefinition())) {
-				this.writeln(`// ${prop.id}: phantom`);
+			const phantomType = this.phantomPropType(prop.getDefinition());
+			if (phantomType) {
+				this.writeln(`// ${prop.id}: ${phantomType}`);
 				continue;
 			}
 			const optional = !!prop.token("optional");
@@ -318,12 +319,6 @@ var TypeRenderer = class TypeRenderer extends BaseRenderer {
 		if (struct?.entity === "structure") this.renderStructure(struct, node.id);
 else this.writeln("{}");
 		this.writeln();
-		const nsPrefix = exported ? "export declare" : "declare";
-		this.write(`${nsPrefix} namespace ${node.id} `);
-		this.blockln("{}");
-		this.writeln(`type DataType = ${node.id}`);
-		this.popln();
-		this.writeln();
 	}
 	renderType(node) {
 		this.writeln();
@@ -350,12 +345,6 @@ else this.writeln("{}");
 		} else {
 			this.write(exported ? "export declare " : "declare ");
 			this.writeln(`class ${node.id} extends ${targetName} {}`);
-			const nsPrefix = exported ? "export declare" : "declare";
-			this.write(`${nsPrefix} namespace ${node.id} `);
-			this.blockln("{}");
-			this.writeln(`type DataType = ${node.id}`);
-			this.popln();
-			this.writeln();
 		}
 	}
 	renderTypeNamespace(node) {
@@ -374,23 +363,23 @@ else if (isGroup(realDef)) typeDef = `TAtscriptTypeComplex<${name}>`;
 else if (isArray(realDef)) typeDef = `TAtscriptTypeArray<${name}>`;
 else if (isPrimitive(realDef)) typeDef = `TAtscriptTypeFinal<${name}>`;
 		}
-		this.writeln(`type DataType = ${name}`);
 		this.writeln(`const __is_atscript_annotated_type: true`);
 		this.writeln(`const type: ${typeDef}`);
 		this.writeln(`const metadata: TMetadataMap<AtscriptMetadata>`);
-		this.writeln(`const validator: (opts?: Partial<TValidatorOptions>) => Validator<typeof ${name}, ${name}>`);
+		this.writeln(`const validator: (opts?: Partial<TValidatorOptions>) => Validator<typeof ${name}>`);
 		if (resolveJsonSchemaMode(this.opts) === false) this.writeln("/** @deprecated JSON Schema support is disabled. Calling this method will throw a runtime error. To enable, set `jsonSchema: 'lazy'` or `jsonSchema: 'bundle'` in tsPlugin options, or add `@emit.jsonSchema` annotation to individual interfaces. */");
 		this.writeln("const toJsonSchema: () => any");
 		this.popln();
 	}
-	isPhantomProp(def) {
-		if (!def) return false;
-		if (isPrimitive(def) && def.id === "phantom") return true;
+	phantomPropType(def) {
+		if (!def) return undefined;
+		if (isPrimitive(def) && def.config.type === "phantom") return def.id;
 		if (isRef(def)) {
-			const unwound = this.doc.unwindType(def.id, def.chain)?.def;
-			return isPrimitive(unwound) && unwound.id === "phantom";
+			const ref = def;
+			const unwound = this.doc.unwindType(ref.id, ref.chain)?.def;
+			if (isPrimitive(unwound) && unwound.config.type === "phantom") return ref.hasChain ? `${ref.id}.${ref.chain.map((c) => c.text).join(".")}` : ref.id;
 		}
-		return false;
+		return undefined;
 	}
 	isTypeTarget(name, doc) {
 		const d = doc || this.doc;
@@ -1145,7 +1134,7 @@ else {
 			case "primitive": {
 				const prim = node;
 				const handle = defineAnnotatedType();
-				handle.designType(prim.id === "never" ? "never" : prim.id === "phantom" ? "phantom" : prim.config.type);
+				handle.designType(prim.id === "never" ? "never" : prim.config.type);
 				if (!skipAnnotations) this.applyExpectAnnotations(handle, this.doc.evalAnnotationsForNode(node));
 				return handle;
 			}
@@ -1272,7 +1261,7 @@ else handle.prop(prop.id, propHandle.$type);
 		return this;
 	}
 	definePrimitive(node, name) {
-		this.renderPrimitiveDef(node.id === "never" ? "never" : node.id === "phantom" ? "phantom" : node.config.type, name);
+		this.renderPrimitiveDef(node.id === "never" ? "never" : node.config.type, name);
 		this.writeln(`  .tags(${Array.from(node.tags).map((f) => `"${escapeQuotes(f)}"`).join(", ")})`);
 		return this;
 	}

package/package.json

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