@atscript/typescript 0.1.25 → 0.1.26

package/dist/utils.mjs

@@ -427,6 +427,63 @@ else metadata.set(key, [a, value]);
 	} else metadata.set(key, [value]);
 else metadata.set(key, value);
 }
+function cloneRefProp(parentType, propName) {
+	if (parentType.kind !== "object") return;
+	const objType = parentType;
+	const existing = objType.props.get(propName);
+	if (!existing) return;
+	const clonedType = cloneTypeDef(existing.type);
+	objType.props.set(propName, {
+		__is_atscript_annotated_type: true,
+		type: clonedType,
+		metadata: new Map(existing.metadata),
+		id: existing.id,
+		optional: existing.optional,
+		validator(opts) {
+			return new Validator(this, opts);
+		}
+	});
+}
+function cloneTypeDef(type) {
+	if (type.kind === "object") {
+		const obj = type;
+		return {
+			kind: "object",
+			props: new Map(Array.from(obj.props.entries()).map(([k, v]) => [k, {
+				__is_atscript_annotated_type: true,
+				type: v.type,
+				metadata: new Map(v.metadata),
+				id: v.id,
+				optional: v.optional,
+				validator(opts) {
+					return new Validator(this, opts);
+				}
+			}])),
+			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 type = base?.type || {};
@@ -518,6 +575,7 @@ else if (!newBase) throw new Error(`"${typeName}" is not annotated type`);
 					__is_atscript_annotated_type: true,
 					type: newBase.type,
 					metadata,
+					id: newBase.id,
 					validator(opts) {
 						return new Validator(this, opts);
 					}
@@ -528,6 +586,10 @@ else if (!newBase) throw new Error(`"${typeName}" is not annotated type`);
 		annotate(key, value, asArray) {
 			annotate(this.$metadata, key, value, asArray);
 			return this;
+		},
+		id(value) {
+			this.$type.id = value;
+			return this;
 		}
 	};
 	return handle;
@@ -592,47 +654,71 @@ function isAnnotatedTypeOfPrimitive(t) {
 	return null;
 }
 function buildJsonSchema(type) {
+	const defs = {};
+	let isRoot = true;
+	const buildObject = (d) => {
+		const properties = {};
+		const required = [];
+		for (const [key, val] of d.type.props.entries()) {
+			if (isPhantomType(val)) continue;
+			properties[key] = build$1(val);
+			if (!val.optional) required.push(key);
+		}
+		const schema$1 = {
+			type: "object",
+			properties
+		};
+		if (required.length > 0) schema$1.required = required;
+		return schema$1;
+	};
 	const build$1 = (def) => {
+		if (def.id && def.type.kind === "object" && !isRoot) {
+			const name = def.id;
+			if (!defs[name]) {
+				defs[name] = {};
+				defs[name] = buildObject(def);
+			}
+			return { $ref: `#/$defs/${name}` };
+		}
+		isRoot = false;
 		const meta = def.metadata;
 		return forAnnotatedType(def, {
 			phantom() {
 				return {};
 			},
 			object(d) {
-				const properties = {};
-				const required = [];
-				for (const [key, val] of d.type.props.entries()) {
-					if (isPhantomType(val)) continue;
-					properties[key] = build$1(val);
-					if (!val.optional) required.push(key);
-				}
-				const schema = {
-					type: "object",
-					properties
-				};
-				if (required.length > 0) schema.required = required;
-				return schema;
+				return buildObject(d);
 			},
 			array(d) {
-				const schema = {
+				const schema$1 = {
 					type: "array",
 					items: build$1(d.type.of)
 				};
 				const minLength = meta.get("expect.minLength");
-				if (minLength) schema.minItems = typeof minLength === "number" ? minLength : minLength.length;
+				if (minLength) schema$1.minItems = typeof minLength === "number" ? minLength : minLength.length;
 				const maxLength = meta.get("expect.maxLength");
-				if (maxLength) schema.maxItems = typeof maxLength === "number" ? maxLength : maxLength.length;
-				return schema;
+				if (maxLength) schema$1.maxItems = typeof maxLength === "number" ? maxLength : maxLength.length;
+				return schema$1;
 			},
 			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
+				if (disc) {
+					const oneOf = d.type.items.map(build$1);
+					const mapping = {};
+					for (const [val, origPath] of Object.entries(disc.mapping)) {
+						const idx = Number.parseInt(origPath.split("/").pop());
+						const item = d.type.items[idx];
+						if (item.id && defs[item.id]) mapping[val] = `#/$defs/${item.id}`;
+else mapping[val] = origPath;
 					}
-				};
+					return {
+						oneOf,
+						discriminator: {
+							propertyName: disc.propertyName,
+							mapping
+						}
+					};
+				}
 				return { anyOf: d.type.items.map(build$1) };
 			},
 			intersection(d) {
@@ -646,38 +732,54 @@ function buildJsonSchema(type) {
 				};
 			},
 			final(d) {
-				const schema = {};
-				if (d.type.value !== undefined) schema.const = d.type.value;
+				const schema$1 = {};
+				if (d.type.value !== undefined) schema$1.const = d.type.value;
 				if (d.type.designType && d.type.designType !== "any") {
-					schema.type = d.type.designType === "undefined" ? "null" : d.type.designType;
-					if (schema.type === "number" && meta.get("expect.int")) schema.type = "integer";
+					schema$1.type = d.type.designType === "undefined" ? "null" : d.type.designType;
+					if (schema$1.type === "number" && meta.get("expect.int")) schema$1.type = "integer";
 				}
-				if (schema.type === "string") {
-					if (meta.get("meta.required")) schema.minLength = 1;
+				if (schema$1.type === "string") {
+					if (meta.get("meta.required")) schema$1.minLength = 1;
 					const minLength = meta.get("expect.minLength");
-					if (minLength) schema.minLength = typeof minLength === "number" ? minLength : minLength.length;
+					if (minLength) schema$1.minLength = typeof minLength === "number" ? minLength : minLength.length;
 					const maxLength = meta.get("expect.maxLength");
-					if (maxLength) schema.maxLength = typeof maxLength === "number" ? maxLength : maxLength.length;
+					if (maxLength) schema$1.maxLength = typeof maxLength === "number" ? maxLength : maxLength.length;
 					const patterns = meta.get("expect.pattern");
-					if (patterns?.length) if (patterns.length === 1) schema.pattern = patterns[0].pattern;
-else schema.allOf = (schema.allOf || []).concat(patterns.map((p) => ({ pattern: p.pattern })));
+					if (patterns?.length) if (patterns.length === 1) schema$1.pattern = patterns[0].pattern;
+else schema$1.allOf = (schema$1.allOf || []).concat(patterns.map((p) => ({ pattern: p.pattern })));
 				}
-				if (schema.type === "number" || schema.type === "integer") {
+				if (schema$1.type === "number" || schema$1.type === "integer") {
 					const min = meta.get("expect.min");
-					if (min) schema.minimum = typeof min === "number" ? min : min.minValue;
+					if (min) schema$1.minimum = typeof min === "number" ? min : min.minValue;
 					const max = meta.get("expect.max");
-					if (max) schema.maximum = typeof max === "number" ? max : max.maxValue;
+					if (max) schema$1.maximum = typeof max === "number" ? max : max.maxValue;
 				}
-				return schema;
+				return schema$1;
 			}
 		});
 	};
-	return build$1(type);
+	const schema = build$1(type);
+	if (Object.keys(defs).length > 0) return {
+		...schema,
+		$defs: defs
+	};
+	return schema;
 }
 function fromJsonSchema(schema) {
+	const defsSource = schema.$defs || schema.definitions || {};
+	const resolved = new Map();
 	const convert = (s) => {
 		if (!s || Object.keys(s).length === 0) return defineAnnotatedType().designType("any").$type;
-		if (s.$ref) throw new Error("$ref is not supported by fromJsonSchema. Dereference the schema first.");
+		if (s.$ref) {
+			const refName = s.$ref.replace(/^#\/(\$defs|definitions)\//, "");
+			if (resolved.has(refName)) return resolved.get(refName);
+			if (defsSource[refName]) {
+				const type = convert(defsSource[refName]);
+				resolved.set(refName, type);
+				return type;
+			}
+			throw new Error(`Unresolvable $ref: ${s.$ref}`);
+		}
 		if ("const" in s) {
 			const val = s.const;
 			const dt = val === null ? "null" : typeof val;
@@ -765,6 +867,24 @@ function fromJsonSchema(schema) {
 	};
 	return convert(schema);
 }
+function mergeJsonSchemas(types) {
+	const mergedDefs = {};
+	const schemas = {};
+	for (const type of types) {
+		const name = type.id;
+		if (!name) throw new Error("mergeJsonSchemas: all types must have an id");
+		const schema = buildJsonSchema(type);
+		if (schema.$defs) {
+			for (const [defName, defSchema] of Object.entries(schema.$defs)) if (!mergedDefs[defName]) mergedDefs[defName] = defSchema;
+			const { $defs: _,...rest } = schema;
+			schemas[name] = rest;
+		} else schemas[name] = schema;
+	}
+	return {
+		schemas,
+		$defs: mergedDefs
+	};
+}
 
 //#endregion
 //#region packages/typescript/src/default-value.ts
@@ -958,6 +1078,7 @@ function serializeNode(def, path, options) {
 		metadata: serializeMetadata(def.metadata, path, def.type.kind, options)
 	};
 	if (def.optional) result.optional = true;
+	if (def.id) result.id = def.id;
 	return result;
 }
 function serializeTypeDef(def, path, options) {
@@ -1061,6 +1182,7 @@ function deserializeNode(data) {
 		}
 	};
 	if (data.optional) result.optional = true;
+	if (data.id) result.id = data.id;
 	return result;
 }
 function deserializeTypeDef(t) {
@@ -1106,4 +1228,4 @@ function deserializeTypeDef(t) {
 }
 
 //#endregion
-export { SERIALIZE_VERSION, Validator, ValidatorError, annotate, buildJsonSchema, createDataFromAnnotatedType, defineAnnotatedType, deserializeAnnotatedType, flattenAnnotatedType, forAnnotatedType, fromJsonSchema, isAnnotatedType, isAnnotatedTypeOfPrimitive, isPhantomType, serializeAnnotatedType, throwFeatureDisabled };
+export { SERIALIZE_VERSION, Validator, ValidatorError, annotate, buildJsonSchema, cloneRefProp, createDataFromAnnotatedType, defineAnnotatedType, deserializeAnnotatedType, flattenAnnotatedType, forAnnotatedType, fromJsonSchema, isAnnotatedType, isAnnotatedTypeOfPrimitive, isPhantomType, mergeJsonSchemas, serializeAnnotatedType, throwFeatureDisabled };

package/package.json

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

package/skills/atscript-typescript/SKILL.md

@@ -31,7 +31,7 @@ import tsPlugin from '@atscript/typescript'
 import {
   defineAnnotatedType, isAnnotatedType, annotate,
   Validator, ValidatorError,
-  buildJsonSchema, fromJsonSchema,
+  buildJsonSchema, fromJsonSchema, mergeJsonSchemas,
   serializeAnnotatedType, deserializeAnnotatedType,
   flattenAnnotatedType, createDataFromAnnotatedType,
   forAnnotatedType, throwFeatureDisabled,

package/skills/atscript-typescript/codegen.md

@@ -70,6 +70,7 @@ Key points:
 The JS module creates actual classes with runtime type definitions and metadata:
 
 - Uses `defineAnnotatedType` (aliased as `$`) to build the type tree
+- Each class gets a `static id` field with the stable type name (collision-safe via `__N` suffix)
 - Populates metadata maps with all annotation values
 - Wires up `validator()` and `toJsonSchema()` methods
 - When `exampleData: true`, adds `toExampleData()` that calls `createDataFromAnnotatedType(this, { mode: 'example' })` (aliased as `$e`)

package/skills/atscript-typescript/runtime.md

@@ -12,6 +12,7 @@ interface TAtscriptAnnotatedType<T extends TAtscriptTypeDef = TAtscriptTypeDef>
   type: T                                // the type definition (shape)
   metadata: TMetadataMap<AtscriptMetadata>  // annotation metadata
   optional?: boolean                     // whether this type is optional
+  id?: string                            // stable type name (set by codegen or .id() builder)
   validator(opts?): Validator            // create a validator instance
 }
 ```
@@ -272,5 +273,6 @@ const labeledType = defineAnnotatedType().designType('string')
 | `.optional(flag?)` | Mark as optional |
 | `.annotate(key, value, asArray?)` | Set metadata annotation |
 | `.copyMetadata(from, ignore?)` | Copy metadata from another type |
-| `.refTo(type, chain?)` | Reference another annotated type's definition |
+| `.id(name)` | Set a stable type name (used by `buildJsonSchema` for `$defs`/`$ref`) |
+| `.refTo(type, chain?)` | Reference another annotated type's definition (carries `id`) |
 | `.$type` | Get the final `TAtscriptAnnotatedType` |

package/skills/atscript-typescript/utilities.md

@@ -17,7 +17,7 @@ import {
   // Validation
   Validator, ValidatorError,
   // JSON Schema
-  buildJsonSchema, fromJsonSchema,
+  buildJsonSchema, fromJsonSchema, mergeJsonSchemas,
   // Serialization
   serializeAnnotatedType, deserializeAnnotatedType, SERIALIZE_VERSION,
   // Flattening
@@ -55,7 +55,7 @@ All handlers except `phantom` are required. Each handler receives the type with
 
 ## `buildJsonSchema(type)` — Annotated Type → JSON Schema
 
-Converts an annotated type into a standard JSON Schema object, translating validation metadata:
+Converts an annotated type into a standard JSON Schema object, translating validation metadata. Named object types (those with an `id`) are automatically extracted into `$defs` and referenced via `$ref`:
 
 ```ts
 import { buildJsonSchema } from '@atscript/typescript/utils'
@@ -73,6 +73,27 @@ const schema = buildJsonSchema(User)
 // }
 ```
 
+### `$defs` and `$ref`
+
+Types compiled from `.as` files carry a stable `id` (the type name). When `buildJsonSchema` encounters named object types nested inside other types (unions, properties), it extracts them into `$defs` and references via `$ref`:
+
+```ts
+import { CatOrDog } from './pets.as'
+const schema = buildJsonSchema(CatOrDog)
+// {
+//   $defs: { Cat: { type: 'object', ... }, Dog: { type: 'object', ... } },
+//   oneOf: [{ $ref: '#/$defs/Cat' }, { $ref: '#/$defs/Dog' }],
+//   discriminator: { propertyName: 'petType', mapping: { cat: '#/$defs/Cat', dog: '#/$defs/Dog' } }
+// }
+```
+
+Key behaviors:
+- Only **named object types** (with `id`) are extracted to `$defs`. Primitives, unions, arrays stay inline.
+- The **root type** is never extracted — it IS the schema.
+- Same `id` referenced multiple times → one `$defs` entry, all occurrences become `$ref`.
+- Types without `id` (inline/anonymous) produce inline schemas.
+- For programmatic types, use `.id('Name')` on the builder to enable `$defs` extraction.
+
 ### Metadata → JSON Schema Mapping
 
 | Annotation | JSON Schema |
@@ -95,7 +116,7 @@ const schema = buildJsonSchema(User)
 
 ### 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.
+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`. When items have `id`, the mapping uses `$ref` paths into `$defs`. No annotations needed — detection is automatic.
 
 ## `fromJsonSchema(schema)` — JSON Schema → Annotated Type
 
@@ -117,9 +138,26 @@ const type = fromJsonSchema({
 type.validator().validate({ name: 'Alice', age: 30 })  // passes
 ```
 
-Supports: `type`, `properties`, `required`, `items`, `anyOf`, `oneOf`, `allOf`, `enum`, `const`, `minLength`, `maxLength`, `minimum`, `maximum`, `pattern`, `minItems`, `maxItems`.
+Supports: `type`, `properties`, `required`, `items`, `anyOf`, `oneOf`, `allOf`, `enum`, `const`, `minLength`, `maxLength`, `minimum`, `maximum`, `pattern`, `minItems`, `maxItems`, `$ref`/`$defs`.
+
+`$ref` paths are automatically resolved from `$defs` or `definitions` in the schema. Unresolvable `$ref` throws an error.
+
+## `mergeJsonSchemas(types)` — Combine Schemas for OpenAPI
+
+Combines multiple annotated types into a single schema map with shared `$defs` — useful for building OpenAPI `components/schemas`:
+
+```ts
+import { mergeJsonSchemas } from '@atscript/typescript/utils'
+import { CatOrDog } from './pets.as'
+import { Order } from './orders.as'
+
+const merged = mergeJsonSchemas([CatOrDog, Order])
+// merged.schemas.CatOrDog — the CatOrDog schema (oneOf with $ref)
+// merged.schemas.Order    — the Order schema
+// merged.$defs: { Cat, Dog, ... } — shared definitions, deduplicated
+```
 
-Does **not** support `$ref` — dereference schemas first.
+All types must have an `id` (all types compiled from `.as` files do). The function calls `buildJsonSchema` on each, hoists `$defs` into a shared pool, and returns individual schemas alongside merged definitions.
 
 ## `serializeAnnotatedType(type, options?)` — Serialize to JSON
 
@@ -171,7 +209,7 @@ type.validator().validate(someData)
 type.metadata.get('meta.label')
 ```
 
-Throws if the serialized version doesn't match `SERIALIZE_VERSION`.
+Throws if the serialized version doesn't match `SERIALIZE_VERSION`. The `id` field is preserved through serialization/deserialization.
 
 ### `SERIALIZE_VERSION`