@atscript/typescript 0.1.29 → 0.1.30

package/dist/cli.cjs

@@ -344,12 +344,62 @@ var TypeRenderer = class TypeRenderer extends BaseRenderer {
 		const exported = node.token("export")?.text === "export";
 		this.renderJsDoc(node);
 		this.write(exported ? "export declare " : "declare ");
-		this.write(`class ${node.id} `);
-		const struct = node.getDefinition();
-		if (struct?.entity === "structure") this.renderStructure(struct, node.id);
+		if (node.hasExtends) {
+			const firstParent = node.extendsTokens[0].text;
+			this.write(`class ${node.id} extends ${firstParent} `);
+			const resolved = this.doc.resolveInterfaceExtends(node);
+			if (resolved?.entity === "structure") {
+				const firstParentUnwound = this.doc.unwindType(firstParent);
+				let firstParentProps;
+				if (firstParentUnwound?.def) {
+					let fpDef = firstParentUnwound.def;
+					if ((0, __atscript_core.isInterface)(fpDef)) {
+						if (fpDef.hasExtends) {
+							const fpResolved = firstParentUnwound.doc.resolveInterfaceExtends(fpDef);
+							if (fpResolved && (0, __atscript_core.isStructure)(fpResolved)) firstParentProps = fpResolved.props;
+						}
+						if (!firstParentProps) fpDef = fpDef.getDefinition() || fpDef;
+					}
+					if (!firstParentProps && (0, __atscript_core.isStructure)(fpDef)) firstParentProps = fpDef.props;
+				}
+				this.renderStructureFiltered(resolved, node.id, firstParentProps);
+			} else this.writeln("{}");
+		} else {
+			this.write(`class ${node.id} `);
+			const struct = node.getDefinition();
+			if (struct?.entity === "structure") this.renderStructure(struct, node.id);
 else this.writeln("{}");
+		}
 		this.writeln();
 	}
+	/**
+	* Renders a structure block, optionally filtering out props that exist in a parent.
+	*/ renderStructureFiltered(struct, asClass, filterProps) {
+		if (!filterProps) return this.renderStructure(struct, asClass);
+		this.blockln("{}");
+		for (const prop of Array.from(struct.props.values())) {
+			if (filterProps.has(prop.id)) continue;
+			if (prop.token("identifier")?.pattern) continue;
+			const phantomType = this.phantomPropType(prop.getDefinition());
+			if (phantomType) {
+				this.writeln(`// ${prop.id}: ${phantomType}`);
+				continue;
+			}
+			const optional = !!prop.token("optional");
+			this.write(wrapProp(prop.id), optional ? "?" : "", ": ");
+			const renderedDef = this.renderTypeDefString(prop.getDefinition());
+			renderedDef.split("\n").forEach((l) => this.writeln(l));
+		}
+		this.writeln("static __is_atscript_annotated_type: true");
+		this.writeln(`static type: TAtscriptTypeObject<keyof ${asClass}, ${asClass}>`);
+		this.writeln(`static metadata: TMetadataMap<AtscriptMetadata>`);
+		this.writeln(`static validator: (opts?: Partial<TValidatorOptions>) => Validator<typeof ${asClass}>`);
+		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("static toJsonSchema: () => any");
+		if (!this.opts?.exampleData) this.writeln("/** @deprecated Example Data support is disabled. To enable, set `exampleData: true` in tsPlugin options. */");
+		this.writeln("static toExampleData?: () => any");
+		this.pop();
+	}
 	renderType(node) {
 		this.writeln();
 		const exported = node.token("export")?.text === "export";
@@ -1214,7 +1264,11 @@ else {
 				const unwound = this.doc.unwindType(annotateNode.targetName);
 				if (unwound?.def) {
 					let def = this.doc.mergeIntersection(unwound.def);
-					if ((0, __atscript_core.isInterface)(def)) def = def.getDefinition() || def;
+					if ((0, __atscript_core.isInterface)(def)) if (def.hasExtends) {
+						const resolved = unwound.doc.resolveInterfaceExtends(def);
+						if (resolved) def = resolved;
+else def = def.getDefinition() || def;
+					} else def = def.getDefinition() || def;
 					this._adHocAnnotations = this.buildAdHocMap([annotateNode]);
 					this.annotateType(def, node.id);
 					this._adHocAnnotations = null;
@@ -1225,7 +1279,12 @@ else {
 				}
 			}
 		} else {
-			this.annotateType(node.getDefinition(), node.id);
+			let def = node.getDefinition();
+			if ((0, __atscript_core.isInterface)(node) && node.hasExtends) {
+				const resolved = this.doc.resolveInterfaceExtends(node);
+				if (resolved) def = resolved;
+			}
+			this.annotateType(def, node.id);
 			this.indent().defineMetadata(node).unindent();
 			this.writeln();
 		}
@@ -1314,7 +1373,11 @@ else {
 		switch (node.entity) {
 			case "interface":
 			case "type": {
-				const def = node.getDefinition();
+				let def = node.getDefinition();
+				if ((0, __atscript_core.isInterface)(node) && node.hasExtends) {
+					const resolved = this.doc.resolveInterfaceExtends(node);
+					if (resolved) def = resolved;
+				}
 				const handle = this.toAnnotatedHandle(def, true);
 				const typeId = this.typeIds.get(node) ?? (node.__typeId !== null && node.__typeId !== undefined ? node.id : undefined);
 				if (typeId) handle.id(typeId);

package/dist/index.cjs

@@ -342,12 +342,62 @@ var TypeRenderer = class TypeRenderer extends BaseRenderer {
 		const exported = node.token("export")?.text === "export";
 		this.renderJsDoc(node);
 		this.write(exported ? "export declare " : "declare ");
-		this.write(`class ${node.id} `);
-		const struct = node.getDefinition();
-		if (struct?.entity === "structure") this.renderStructure(struct, node.id);
+		if (node.hasExtends) {
+			const firstParent = node.extendsTokens[0].text;
+			this.write(`class ${node.id} extends ${firstParent} `);
+			const resolved = this.doc.resolveInterfaceExtends(node);
+			if (resolved?.entity === "structure") {
+				const firstParentUnwound = this.doc.unwindType(firstParent);
+				let firstParentProps;
+				if (firstParentUnwound?.def) {
+					let fpDef = firstParentUnwound.def;
+					if ((0, __atscript_core.isInterface)(fpDef)) {
+						if (fpDef.hasExtends) {
+							const fpResolved = firstParentUnwound.doc.resolveInterfaceExtends(fpDef);
+							if (fpResolved && (0, __atscript_core.isStructure)(fpResolved)) firstParentProps = fpResolved.props;
+						}
+						if (!firstParentProps) fpDef = fpDef.getDefinition() || fpDef;
+					}
+					if (!firstParentProps && (0, __atscript_core.isStructure)(fpDef)) firstParentProps = fpDef.props;
+				}
+				this.renderStructureFiltered(resolved, node.id, firstParentProps);
+			} else this.writeln("{}");
+		} else {
+			this.write(`class ${node.id} `);
+			const struct = node.getDefinition();
+			if (struct?.entity === "structure") this.renderStructure(struct, node.id);
 else this.writeln("{}");
+		}
 		this.writeln();
 	}
+	/**
+	* Renders a structure block, optionally filtering out props that exist in a parent.
+	*/ renderStructureFiltered(struct, asClass, filterProps) {
+		if (!filterProps) return this.renderStructure(struct, asClass);
+		this.blockln("{}");
+		for (const prop of Array.from(struct.props.values())) {
+			if (filterProps.has(prop.id)) continue;
+			if (prop.token("identifier")?.pattern) continue;
+			const phantomType = this.phantomPropType(prop.getDefinition());
+			if (phantomType) {
+				this.writeln(`// ${prop.id}: ${phantomType}`);
+				continue;
+			}
+			const optional = !!prop.token("optional");
+			this.write(wrapProp(prop.id), optional ? "?" : "", ": ");
+			const renderedDef = this.renderTypeDefString(prop.getDefinition());
+			renderedDef.split("\n").forEach((l) => this.writeln(l));
+		}
+		this.writeln("static __is_atscript_annotated_type: true");
+		this.writeln(`static type: TAtscriptTypeObject<keyof ${asClass}, ${asClass}>`);
+		this.writeln(`static metadata: TMetadataMap<AtscriptMetadata>`);
+		this.writeln(`static validator: (opts?: Partial<TValidatorOptions>) => Validator<typeof ${asClass}>`);
+		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("static toJsonSchema: () => any");
+		if (!this.opts?.exampleData) this.writeln("/** @deprecated Example Data support is disabled. To enable, set `exampleData: true` in tsPlugin options. */");
+		this.writeln("static toExampleData?: () => any");
+		this.pop();
+	}
 	renderType(node) {
 		this.writeln();
 		const exported = node.token("export")?.text === "export";
@@ -1212,7 +1262,11 @@ else {
 				const unwound = this.doc.unwindType(annotateNode.targetName);
 				if (unwound?.def) {
 					let def = this.doc.mergeIntersection(unwound.def);
-					if ((0, __atscript_core.isInterface)(def)) def = def.getDefinition() || def;
+					if ((0, __atscript_core.isInterface)(def)) if (def.hasExtends) {
+						const resolved = unwound.doc.resolveInterfaceExtends(def);
+						if (resolved) def = resolved;
+else def = def.getDefinition() || def;
+					} else def = def.getDefinition() || def;
 					this._adHocAnnotations = this.buildAdHocMap([annotateNode]);
 					this.annotateType(def, node.id);
 					this._adHocAnnotations = null;
@@ -1223,7 +1277,12 @@ else {
 				}
 			}
 		} else {
-			this.annotateType(node.getDefinition(), node.id);
+			let def = node.getDefinition();
+			if ((0, __atscript_core.isInterface)(node) && node.hasExtends) {
+				const resolved = this.doc.resolveInterfaceExtends(node);
+				if (resolved) def = resolved;
+			}
+			this.annotateType(def, node.id);
 			this.indent().defineMetadata(node).unindent();
 			this.writeln();
 		}
@@ -1312,7 +1371,11 @@ else {
 		switch (node.entity) {
 			case "interface":
 			case "type": {
-				const def = node.getDefinition();
+				let def = node.getDefinition();
+				if ((0, __atscript_core.isInterface)(node) && node.hasExtends) {
+					const resolved = this.doc.resolveInterfaceExtends(node);
+					if (resolved) def = resolved;
+				}
 				const handle = this.toAnnotatedHandle(def, true);
 				const typeId = this.typeIds.get(node) ?? (node.__typeId !== null && node.__typeId !== undefined ? node.id : undefined);
 				if (typeId) handle.id(typeId);

package/dist/index.mjs

@@ -317,12 +317,62 @@ var TypeRenderer = class TypeRenderer extends BaseRenderer {
 		const exported = node.token("export")?.text === "export";
 		this.renderJsDoc(node);
 		this.write(exported ? "export declare " : "declare ");
-		this.write(`class ${node.id} `);
-		const struct = node.getDefinition();
-		if (struct?.entity === "structure") this.renderStructure(struct, node.id);
+		if (node.hasExtends) {
+			const firstParent = node.extendsTokens[0].text;
+			this.write(`class ${node.id} extends ${firstParent} `);
+			const resolved = this.doc.resolveInterfaceExtends(node);
+			if (resolved?.entity === "structure") {
+				const firstParentUnwound = this.doc.unwindType(firstParent);
+				let firstParentProps;
+				if (firstParentUnwound?.def) {
+					let fpDef = firstParentUnwound.def;
+					if (isInterface(fpDef)) {
+						if (fpDef.hasExtends) {
+							const fpResolved = firstParentUnwound.doc.resolveInterfaceExtends(fpDef);
+							if (fpResolved && isStructure(fpResolved)) firstParentProps = fpResolved.props;
+						}
+						if (!firstParentProps) fpDef = fpDef.getDefinition() || fpDef;
+					}
+					if (!firstParentProps && isStructure(fpDef)) firstParentProps = fpDef.props;
+				}
+				this.renderStructureFiltered(resolved, node.id, firstParentProps);
+			} else this.writeln("{}");
+		} else {
+			this.write(`class ${node.id} `);
+			const struct = node.getDefinition();
+			if (struct?.entity === "structure") this.renderStructure(struct, node.id);
 else this.writeln("{}");
+		}
 		this.writeln();
 	}
+	/**
+	* Renders a structure block, optionally filtering out props that exist in a parent.
+	*/ renderStructureFiltered(struct, asClass, filterProps) {
+		if (!filterProps) return this.renderStructure(struct, asClass);
+		this.blockln("{}");
+		for (const prop of Array.from(struct.props.values())) {
+			if (filterProps.has(prop.id)) continue;
+			if (prop.token("identifier")?.pattern) continue;
+			const phantomType = this.phantomPropType(prop.getDefinition());
+			if (phantomType) {
+				this.writeln(`// ${prop.id}: ${phantomType}`);
+				continue;
+			}
+			const optional = !!prop.token("optional");
+			this.write(wrapProp(prop.id), optional ? "?" : "", ": ");
+			const renderedDef = this.renderTypeDefString(prop.getDefinition());
+			renderedDef.split("\n").forEach((l) => this.writeln(l));
+		}
+		this.writeln("static __is_atscript_annotated_type: true");
+		this.writeln(`static type: TAtscriptTypeObject<keyof ${asClass}, ${asClass}>`);
+		this.writeln(`static metadata: TMetadataMap<AtscriptMetadata>`);
+		this.writeln(`static validator: (opts?: Partial<TValidatorOptions>) => Validator<typeof ${asClass}>`);
+		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("static toJsonSchema: () => any");
+		if (!this.opts?.exampleData) this.writeln("/** @deprecated Example Data support is disabled. To enable, set `exampleData: true` in tsPlugin options. */");
+		this.writeln("static toExampleData?: () => any");
+		this.pop();
+	}
 	renderType(node) {
 		this.writeln();
 		const exported = node.token("export")?.text === "export";
@@ -1187,7 +1237,11 @@ else {
 				const unwound = this.doc.unwindType(annotateNode.targetName);
 				if (unwound?.def) {
 					let def = this.doc.mergeIntersection(unwound.def);
-					if (isInterface(def)) def = def.getDefinition() || def;
+					if (isInterface(def)) if (def.hasExtends) {
+						const resolved = unwound.doc.resolveInterfaceExtends(def);
+						if (resolved) def = resolved;
+else def = def.getDefinition() || def;
+					} else def = def.getDefinition() || def;
 					this._adHocAnnotations = this.buildAdHocMap([annotateNode]);
 					this.annotateType(def, node.id);
 					this._adHocAnnotations = null;
@@ -1198,7 +1252,12 @@ else {
 				}
 			}
 		} else {
-			this.annotateType(node.getDefinition(), node.id);
+			let def = node.getDefinition();
+			if (isInterface(node) && node.hasExtends) {
+				const resolved = this.doc.resolveInterfaceExtends(node);
+				if (resolved) def = resolved;
+			}
+			this.annotateType(def, node.id);
 			this.indent().defineMetadata(node).unindent();
 			this.writeln();
 		}
@@ -1287,7 +1346,11 @@ else {
 		switch (node.entity) {
 			case "interface":
 			case "type": {
-				const def = node.getDefinition();
+				let def = node.getDefinition();
+				if (isInterface(node) && node.hasExtends) {
+					const resolved = this.doc.resolveInterfaceExtends(node);
+					if (resolved) def = resolved;
+				}
 				const handle = this.toAnnotatedHandle(def, true);
 				const typeId = this.typeIds.get(node) ?? (node.__typeId !== null && node.__typeId !== undefined ? node.id : undefined);
 				if (typeId) handle.id(typeId);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atscript/typescript",
-  "version": "0.1.29",
+  "version": "0.1.30",
   "description": "Atscript: typescript-gen support.",
   "keywords": [
     "annotations",
@@ -64,7 +64,7 @@
     "vitest": "3.2.4"
   },
   "peerDependencies": {
-    "@atscript/core": "^0.1.29"
+    "@atscript/core": "^0.1.30"
   },
   "build": [
     {},