@atscript/typescript 0.1.24 → 0.1.25

package/dist/cli.cjs

@@ -991,6 +991,46 @@ function isPhantomType(def) {
 
 //#endregion
 //#region packages/typescript/src/json-schema.ts
+/**
+* Detects a discriminator property across union items.
+*
+* Scans all items for object-typed members that share a common property
+* with distinct const/literal values. If exactly one such property exists,
+* it is returned as the discriminator.
+*/ function detectDiscriminator(items) {
+	if (items.length < 2) return null;
+	for (const item of items) if (item.type.kind !== "object") return null;
+	const firstObj = items[0].type;
+	const candidates = [];
+	for (const [propName, propType] of firstObj.props.entries()) if (propType.type.kind === "" && propType.type.value !== undefined) candidates.push(propName);
+	const validCandidates = [];
+	for (const candidate of candidates) {
+		const values = new Set();
+		const mapping = {};
+		let valid = true;
+		for (let i = 0; i < items.length; i++) {
+			const obj = items[i].type;
+			const prop = obj.props.get(candidate);
+			if (!prop || prop.type.kind !== "" || prop.type.value === undefined) {
+				valid = false;
+				break;
+			}
+			const val = prop.type.value;
+			if (values.has(val)) {
+				valid = false;
+				break;
+			}
+			values.add(val);
+			mapping[String(val)] = `#/oneOf/${i}`;
+		}
+		if (valid) validCandidates.push({
+			propertyName: candidate,
+			mapping
+		});
+	}
+	if (validCandidates.length === 1) return validCandidates[0];
+	return null;
+}
 function buildJsonSchema(type) {
 	const build$1 = (def) => {
 		const meta = def.metadata;
@@ -1025,6 +1065,14 @@ function buildJsonSchema(type) {
 				return schema;
 			},
 			union(d) {
+				const disc = detectDiscriminator(d.type.items);
+				if (disc) return {
+					oneOf: d.type.items.map(build$1),
+					discriminator: {
+						propertyName: disc.propertyName,
+						mapping: disc.mapping
+					}
+				};
 				return { anyOf: d.type.items.map(build$1) };
 			},
 			intersection(d) {

package/dist/index.cjs

@@ -988,6 +988,46 @@ function isPhantomType(def) {
 
 //#endregion
 //#region packages/typescript/src/json-schema.ts
+/**
+* Detects a discriminator property across union items.
+*
+* Scans all items for object-typed members that share a common property
+* with distinct const/literal values. If exactly one such property exists,
+* it is returned as the discriminator.
+*/ function detectDiscriminator(items) {
+	if (items.length < 2) return null;
+	for (const item of items) if (item.type.kind !== "object") return null;
+	const firstObj = items[0].type;
+	const candidates = [];
+	for (const [propName, propType] of firstObj.props.entries()) if (propType.type.kind === "" && propType.type.value !== undefined) candidates.push(propName);
+	const validCandidates = [];
+	for (const candidate of candidates) {
+		const values = new Set();
+		const mapping = {};
+		let valid = true;
+		for (let i = 0; i < items.length; i++) {
+			const obj = items[i].type;
+			const prop = obj.props.get(candidate);
+			if (!prop || prop.type.kind !== "" || prop.type.value === undefined) {
+				valid = false;
+				break;
+			}
+			const val = prop.type.value;
+			if (values.has(val)) {
+				valid = false;
+				break;
+			}
+			values.add(val);
+			mapping[String(val)] = `#/oneOf/${i}`;
+		}
+		if (valid) validCandidates.push({
+			propertyName: candidate,
+			mapping
+		});
+	}
+	if (validCandidates.length === 1) return validCandidates[0];
+	return null;
+}
 function buildJsonSchema(type) {
 	const build = (def) => {
 		const meta = def.metadata;
@@ -1022,6 +1062,14 @@ function buildJsonSchema(type) {
 				return schema;
 			},
 			union(d) {
+				const disc = detectDiscriminator(d.type.items);
+				if (disc) return {
+					oneOf: d.type.items.map(build),
+					discriminator: {
+						propertyName: disc.propertyName,
+						mapping: disc.mapping
+					}
+				};
 				return { anyOf: d.type.items.map(build) };
 			},
 			intersection(d) {

package/dist/index.mjs

@@ -964,6 +964,46 @@ function isPhantomType(def) {
 
 //#endregion
 //#region packages/typescript/src/json-schema.ts
+/**
+* Detects a discriminator property across union items.
+*
+* Scans all items for object-typed members that share a common property
+* with distinct const/literal values. If exactly one such property exists,
+* it is returned as the discriminator.
+*/ function detectDiscriminator(items) {
+	if (items.length < 2) return null;
+	for (const item of items) if (item.type.kind !== "object") return null;
+	const firstObj = items[0].type;
+	const candidates = [];
+	for (const [propName, propType] of firstObj.props.entries()) if (propType.type.kind === "" && propType.type.value !== undefined) candidates.push(propName);
+	const validCandidates = [];
+	for (const candidate of candidates) {
+		const values = new Set();
+		const mapping = {};
+		let valid = true;
+		for (let i = 0; i < items.length; i++) {
+			const obj = items[i].type;
+			const prop = obj.props.get(candidate);
+			if (!prop || prop.type.kind !== "" || prop.type.value === undefined) {
+				valid = false;
+				break;
+			}
+			const val = prop.type.value;
+			if (values.has(val)) {
+				valid = false;
+				break;
+			}
+			values.add(val);
+			mapping[String(val)] = `#/oneOf/${i}`;
+		}
+		if (valid) validCandidates.push({
+			propertyName: candidate,
+			mapping
+		});
+	}
+	if (validCandidates.length === 1) return validCandidates[0];
+	return null;
+}
 function buildJsonSchema(type) {
 	const build = (def) => {
 		const meta = def.metadata;
@@ -998,6 +1038,14 @@ function buildJsonSchema(type) {
 				return schema;
 			},
 			union(d) {
+				const disc = detectDiscriminator(d.type.items);
+				if (disc) return {
+					oneOf: d.type.items.map(build),
+					discriminator: {
+						propertyName: disc.propertyName,
+						mapping: disc.mapping
+					}
+				};
 				return { anyOf: d.type.items.map(build) };
 			},
 			intersection(d) {

package/dist/utils.cjs

@@ -552,6 +552,46 @@ function isAnnotatedTypeOfPrimitive(t) {
 
 //#endregion
 //#region packages/typescript/src/json-schema.ts
+/**
+* Detects a discriminator property across union items.
+*
+* Scans all items for object-typed members that share a common property
+* with distinct const/literal values. If exactly one such property exists,
+* it is returned as the discriminator.
+*/ function detectDiscriminator(items) {
+	if (items.length < 2) return null;
+	for (const item of items) if (item.type.kind !== "object") return null;
+	const firstObj = items[0].type;
+	const candidates = [];
+	for (const [propName, propType] of firstObj.props.entries()) if (propType.type.kind === "" && propType.type.value !== undefined) candidates.push(propName);
+	const validCandidates = [];
+	for (const candidate of candidates) {
+		const values = new Set();
+		const mapping = {};
+		let valid = true;
+		for (let i = 0; i < items.length; i++) {
+			const obj = items[i].type;
+			const prop = obj.props.get(candidate);
+			if (!prop || prop.type.kind !== "" || prop.type.value === undefined) {
+				valid = false;
+				break;
+			}
+			const val = prop.type.value;
+			if (values.has(val)) {
+				valid = false;
+				break;
+			}
+			values.add(val);
+			mapping[String(val)] = `#/oneOf/${i}`;
+		}
+		if (valid) validCandidates.push({
+			propertyName: candidate,
+			mapping
+		});
+	}
+	if (validCandidates.length === 1) return validCandidates[0];
+	return null;
+}
 function buildJsonSchema(type) {
 	const build$1 = (def) => {
 		const meta = def.metadata;
@@ -586,6 +626,14 @@ function buildJsonSchema(type) {
 				return schema;
 			},
 			union(d) {
+				const disc = detectDiscriminator(d.type.items);
+				if (disc) return {
+					oneOf: d.type.items.map(build$1),
+					discriminator: {
+						propertyName: disc.propertyName,
+						mapping: disc.mapping
+					}
+				};
 				return { anyOf: d.type.items.map(build$1) };
 			},
 			intersection(d) {

package/dist/utils.mjs

@@ -551,6 +551,46 @@ function isAnnotatedTypeOfPrimitive(t) {
 
 //#endregion
 //#region packages/typescript/src/json-schema.ts
+/**
+* Detects a discriminator property across union items.
+*
+* Scans all items for object-typed members that share a common property
+* with distinct const/literal values. If exactly one such property exists,
+* it is returned as the discriminator.
+*/ function detectDiscriminator(items) {
+	if (items.length < 2) return null;
+	for (const item of items) if (item.type.kind !== "object") return null;
+	const firstObj = items[0].type;
+	const candidates = [];
+	for (const [propName, propType] of firstObj.props.entries()) if (propType.type.kind === "" && propType.type.value !== undefined) candidates.push(propName);
+	const validCandidates = [];
+	for (const candidate of candidates) {
+		const values = new Set();
+		const mapping = {};
+		let valid = true;
+		for (let i = 0; i < items.length; i++) {
+			const obj = items[i].type;
+			const prop = obj.props.get(candidate);
+			if (!prop || prop.type.kind !== "" || prop.type.value === undefined) {
+				valid = false;
+				break;
+			}
+			const val = prop.type.value;
+			if (values.has(val)) {
+				valid = false;
+				break;
+			}
+			values.add(val);
+			mapping[String(val)] = `#/oneOf/${i}`;
+		}
+		if (valid) validCandidates.push({
+			propertyName: candidate,
+			mapping
+		});
+	}
+	if (validCandidates.length === 1) return validCandidates[0];
+	return null;
+}
 function buildJsonSchema(type) {
 	const build$1 = (def) => {
 		const meta = def.metadata;
@@ -585,6 +625,14 @@ function buildJsonSchema(type) {
 				return schema;
 			},
 			union(d) {
+				const disc = detectDiscriminator(d.type.items);
+				if (disc) return {
+					oneOf: d.type.items.map(build$1),
+					discriminator: {
+						propertyName: disc.propertyName,
+						mapping: disc.mapping
+					}
+				};
 				return { anyOf: d.type.items.map(build$1) };
 			},
 			intersection(d) {

package/package.json

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

package/skills/atscript-typescript/utilities.md

@@ -88,11 +88,15 @@ const schema = buildJsonSchema(User)
 | `@expect.pattern` (multiple) | `allOf: [{ pattern }, ...]` |
 | `@meta.required` on string | `minLength: 1` |
 | optional property | not in `required` array |
-| union | `anyOf` |
+| union | `anyOf` (or `oneOf` + `discriminator` for discriminated unions) |
 | intersection | `allOf` |
 | tuple | `items` as array |
 | phantom | empty object `{}` (excluded) |
 
+### Discriminated Unions
+
+When all union items are objects sharing exactly one property with distinct const/literal values, `buildJsonSchema` auto-detects it and emits `oneOf` with a `discriminator` object (including `propertyName` and `mapping`) instead of `anyOf`. No annotations needed — detection is automatic.
+
 ## `fromJsonSchema(schema)` — JSON Schema → Annotated Type
 
 The inverse of `buildJsonSchema`. Creates a fully functional annotated type from a JSON Schema: