@atscript/typescript 0.1.32 → 0.1.33

package/dist/cli.cjs

@@ -482,28 +482,72 @@ else {
 	*
 	* - **Single PK** (one `@meta.id`) → `static __pk: <scalar type>`
 	* - **Compound PK** (multiple `@meta.id`) → `static __pk: { field1: Type1; field2: Type2 }`
-	* - **No PK** → no `__pk` emitted
+	* - **No PK** → no `__pk` emitted (unless unique indexes exist)
+	* - **Unique indexes** (`@db.index.unique`) → appended as union members
+	* - **Mongo collection** → always includes `string` (ObjectId) in the union;
+	*   if no `@meta.id` fields, `__pk` is just `string`
 	*/ renderPk(node) {
+		const isMongoCollection = !!node.annotations?.some((a) => a.name === "db.mongo.collection");
 		let struct;
 		if (node.hasExtends) struct = this.doc.resolveInterfaceExtends(node);
 		if (!struct) struct = node.getDefinition();
 		if (!struct || !(0, __atscript_core.isStructure)(struct)) return;
+		const structNode = struct;
 		const pkProps = [];
-		for (const [name, prop] of struct.props) {
+		const uniqueByIndex = new Map();
+		for (const [name, prop] of structNode.props) {
 			if (prop.token("identifier")?.pattern) continue;
+			if (isMongoCollection && name === "_id") continue;
 			if (prop.countAnnotations("meta.id") > 0) pkProps.push({
 				name,
 				prop
 			});
+			if (prop.annotations) {
+				for (const ann of prop.annotations) if (ann.name === "db.index.unique") {
+					const indexName = ann.args[0]?.text ?? name;
+					let group = uniqueByIndex.get(indexName);
+					if (!group) {
+						group = [];
+						uniqueByIndex.set(indexName, group);
+					}
+					group.push({
+						name,
+						prop
+					});
+				}
+			}
+		}
+		const uniqueProps = [];
+		const pkNames = new Set(pkProps.map((p) => p.name));
+		for (const fields of uniqueByIndex.values()) if (fields.length === 1 && !pkNames.has(fields[0].name)) uniqueProps.push(fields[0]);
+		if (pkProps.length === 0 && uniqueProps.length === 0 && !isMongoCollection) return;
+		let mongoIdType;
+		if (isMongoCollection) {
+			const idProp = structNode.props.get("_id");
+			if (idProp) mongoIdType = this.renderTypeDefString(idProp.getDefinition()).trim();
+			mongoIdType ?? (mongoIdType = "string");
+		}
+		const uniqueTypes = [];
+		const seenTypes = new Set();
+		for (const { prop } of uniqueProps) {
+			const rendered = this.renderTypeDefString(prop.getDefinition()).trim();
+			if (!seenTypes.has(rendered)) {
+				seenTypes.add(rendered);
+				uniqueTypes.push(rendered);
+			}
 		}
-		if (pkProps.length === 0) return;
 		this.writeln();
-		if (pkProps.length === 1) {
+		const uniqueSuffix = uniqueTypes.length > 0 ? ` | ${uniqueTypes.join(" | ")}` : "";
+		if (pkProps.length === 0 && !isMongoCollection) this.writeln(`static __pk: ${uniqueTypes.join(" | ")}`);
+else if (pkProps.length === 0) this.writeln(`static __pk: ${mongoIdType}${uniqueSuffix}`);
+else if (pkProps.length === 1) {
 			this.write("static __pk: ");
-			const renderedDef = this.renderTypeDefString(pkProps[0].prop.getDefinition());
-			renderedDef.split("\n").forEach((l) => this.writeln(l));
+			if (isMongoCollection) this.write(`${mongoIdType} | `);
+			const renderedDef = this.renderTypeDefString(pkProps[0].prop.getDefinition()).trim();
+			this.writeln(`${renderedDef}${uniqueSuffix}`);
 		} else {
 			this.write("static __pk: ");
+			if (isMongoCollection) this.write(`${mongoIdType} | `);
 			this.blockln("{}");
 			for (const { name, prop } of pkProps) {
 				this.write(wrapProp(name), ": ");
@@ -511,6 +555,7 @@ else {
 				renderedDef.split("\n").forEach((l) => this.writeln(l));
 			}
 			this.pop();
+			this.writeln(uniqueSuffix);
 		}
 	}
 	phantomPropType(def) {
@@ -998,6 +1043,24 @@ var ValidatorError = class extends Error {
 
 //#endregion
 //#region packages/typescript/src/annotated-type.ts
+const COMPLEX_KINDS = new Set([
+	"union",
+	"intersection",
+	"tuple"
+]);
+/** Shared validator method reused by all annotated type nodes. */ function validatorMethod(opts) {
+	return new Validator(this, opts);
+}
+function createAnnotatedTypeNode(type, metadata, opts) {
+	return {
+		__is_atscript_annotated_type: true,
+		type,
+		metadata,
+		validator: validatorMethod,
+		id: opts?.id,
+		optional: opts?.optional
+	};
+}
 function isAnnotatedType(type) {
 	return type && type.__is_atscript_annotated_type;
 }
@@ -1014,38 +1077,24 @@ function defineAnnotatedType(_kind, base) {
 	const kind = _kind || "";
 	const type = base?.type || {};
 	type.kind = kind;
-	if ([
-		"union",
-		"intersection",
-		"tuple"
-	].includes(kind)) type.items = [];
+	if (COMPLEX_KINDS.has(kind)) type.items = [];
 	if (kind === "object") {
 		type.props = new Map();
 		type.propsPatterns = [];
 	}
 	type.tags = new Set();
 	const metadata = base?.metadata || new Map();
-	if (base) Object.assign(base, {
+	const payload = {
 		__is_atscript_annotated_type: true,
 		metadata,
 		type,
-		validator(opts) {
-			return new Validator(this, opts);
-		}
-	});
-else base = {
-		__is_atscript_annotated_type: true,
-		metadata,
-		type,
-		validator(opts) {
-			return new Validator(this, opts);
-		}
+		validator: validatorMethod
 	};
+	base = base ? Object.assign(base, payload) : payload;
 	const handle = {
 		$type: base,
 		$def: type,
 		$metadata: metadata,
-		_existingObject: undefined,
 		tags(...tags) {
 			for (const tag of tags) this.$def.tags.add(tag);
 			return this;
@@ -1086,27 +1135,18 @@ else base = {
 			return this;
 		},
 		refTo(type$1, chain) {
+			if (!isAnnotatedType(type$1)) throw new Error(`${type$1} is not annotated type`);
 			let newBase = type$1;
 			const typeName = type$1.name || "Unknown";
-			if (isAnnotatedType(newBase)) {
-				let keys = "";
-				for (const c of chain || []) {
-					keys += `["${c}"]`;
-					if (newBase.type.kind === "object" && newBase.type.props.has(c)) newBase = newBase.type.props.get(c);
-else throw new Error(`Can't find prop ${typeName}${keys}`);
+			if (chain) for (let i = 0; i < chain.length; i++) {
+				const c = chain[i];
+				if (newBase.type.kind === "object" && newBase.type.props.has(c)) newBase = newBase.type.props.get(c);
+else {
+					const keys = chain.slice(0, i + 1).map((k) => `["${k}"]`).join("");
+					throw new Error(`Can't find prop ${typeName}${keys}`);
 				}
-				if (!newBase && keys) throw new Error(`Can't find prop ${typeName}${keys}`);
-else if (!newBase) throw new Error(`"${typeName}" is not annotated type`);
-				this.$type = {
-					__is_atscript_annotated_type: true,
-					type: newBase.type,
-					metadata,
-					id: newBase.id,
-					validator(opts) {
-						return new Validator(this, opts);
-					}
-				};
-			} else throw new Error(`${type$1} is not annotated type`);
+			}
+			this.$type = createAnnotatedTypeNode(newBase.type, metadata, { id: newBase.id });
 			return this;
 		},
 		annotate(key, value, asArray) {
@@ -1156,10 +1196,10 @@ function forAnnotatedType(def, handlers) {
 	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 = [];
+	let result = null;
 	for (const candidate of candidates) {
 		const values = new Set();
-		const mapping = {};
+		const indexMapping = {};
 		let valid = true;
 		for (let i = 0; i < items.length; i++) {
 			const obj = items[i].type;
@@ -1174,19 +1214,21 @@ function forAnnotatedType(def, handlers) {
 				break;
 			}
 			values.add(val);
-			mapping[String(val)] = `#/oneOf/${i}`;
+			indexMapping[String(val)] = i;
+		}
+		if (valid) {
+			if (result) return null;
+			result = {
+				propertyName: candidate,
+				indexMapping
+			};
 		}
-		if (valid) validCandidates.push({
-			propertyName: candidate,
-			mapping
-		});
 	}
-	if (validCandidates.length === 1) return validCandidates[0];
-	return null;
+	return result;
 }
 function buildJsonSchema(type) {
 	const defs = {};
-	let isRoot = true;
+	let hasDefs = false;
 	const buildObject = (d) => {
 		const properties = {};
 		const required = [];
@@ -1203,15 +1245,15 @@ function buildJsonSchema(type) {
 		return schema$1;
 	};
 	const build$1 = (def) => {
-		if (def.id && def.type.kind === "object" && !isRoot) {
+		if (def.id && def.type.kind === "object" && def !== type) {
 			const name = def.id;
 			if (!defs[name]) {
+				hasDefs = true;
 				defs[name] = {};
 				defs[name] = buildObject(def);
 			}
 			return { $ref: `#/$defs/${name}` };
 		}
-		isRoot = false;
 		const meta = def.metadata;
 		return forAnnotatedType(def, {
 			phantom() {
@@ -1236,11 +1278,9 @@ function buildJsonSchema(type) {
 				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(), 10);
+					for (const [val, idx] of Object.entries(disc.indexMapping)) {
 						const item = d.type.items[idx];
-						if (item.id && defs[item.id]) mapping[val] = `#/$defs/${item.id}`;
-else mapping[val] = origPath;
+						mapping[val] = item.id && defs[item.id] ? `#/$defs/${item.id}` : `#/oneOf/${idx}`;
 					}
 					return {
 						oneOf,
@@ -1290,7 +1330,7 @@ else schema$1.allOf = (schema$1.allOf || []).concat(patterns.map((p) => ({ patte
 		});
 	};
 	const schema = build$1(type);
-	if (Object.keys(defs).length > 0) return {
+	if (hasDefs) return {
 		...schema,
 		$defs: defs
 	};

package/dist/index.cjs

@@ -480,28 +480,72 @@ else {
 	*
 	* - **Single PK** (one `@meta.id`) → `static __pk: <scalar type>`
 	* - **Compound PK** (multiple `@meta.id`) → `static __pk: { field1: Type1; field2: Type2 }`
-	* - **No PK** → no `__pk` emitted
+	* - **No PK** → no `__pk` emitted (unless unique indexes exist)
+	* - **Unique indexes** (`@db.index.unique`) → appended as union members
+	* - **Mongo collection** → always includes `string` (ObjectId) in the union;
+	*   if no `@meta.id` fields, `__pk` is just `string`
 	*/ renderPk(node) {
+		const isMongoCollection = !!node.annotations?.some((a) => a.name === "db.mongo.collection");
 		let struct;
 		if (node.hasExtends) struct = this.doc.resolveInterfaceExtends(node);
 		if (!struct) struct = node.getDefinition();
 		if (!struct || !(0, __atscript_core.isStructure)(struct)) return;
+		const structNode = struct;
 		const pkProps = [];
-		for (const [name, prop] of struct.props) {
+		const uniqueByIndex = new Map();
+		for (const [name, prop] of structNode.props) {
 			if (prop.token("identifier")?.pattern) continue;
+			if (isMongoCollection && name === "_id") continue;
 			if (prop.countAnnotations("meta.id") > 0) pkProps.push({
 				name,
 				prop
 			});
+			if (prop.annotations) {
+				for (const ann of prop.annotations) if (ann.name === "db.index.unique") {
+					const indexName = ann.args[0]?.text ?? name;
+					let group = uniqueByIndex.get(indexName);
+					if (!group) {
+						group = [];
+						uniqueByIndex.set(indexName, group);
+					}
+					group.push({
+						name,
+						prop
+					});
+				}
+			}
+		}
+		const uniqueProps = [];
+		const pkNames = new Set(pkProps.map((p) => p.name));
+		for (const fields of uniqueByIndex.values()) if (fields.length === 1 && !pkNames.has(fields[0].name)) uniqueProps.push(fields[0]);
+		if (pkProps.length === 0 && uniqueProps.length === 0 && !isMongoCollection) return;
+		let mongoIdType;
+		if (isMongoCollection) {
+			const idProp = structNode.props.get("_id");
+			if (idProp) mongoIdType = this.renderTypeDefString(idProp.getDefinition()).trim();
+			mongoIdType ?? (mongoIdType = "string");
+		}
+		const uniqueTypes = [];
+		const seenTypes = new Set();
+		for (const { prop } of uniqueProps) {
+			const rendered = this.renderTypeDefString(prop.getDefinition()).trim();
+			if (!seenTypes.has(rendered)) {
+				seenTypes.add(rendered);
+				uniqueTypes.push(rendered);
+			}
 		}
-		if (pkProps.length === 0) return;
 		this.writeln();
-		if (pkProps.length === 1) {
+		const uniqueSuffix = uniqueTypes.length > 0 ? ` | ${uniqueTypes.join(" | ")}` : "";
+		if (pkProps.length === 0 && !isMongoCollection) this.writeln(`static __pk: ${uniqueTypes.join(" | ")}`);
+else if (pkProps.length === 0) this.writeln(`static __pk: ${mongoIdType}${uniqueSuffix}`);
+else if (pkProps.length === 1) {
 			this.write("static __pk: ");
-			const renderedDef = this.renderTypeDefString(pkProps[0].prop.getDefinition());
-			renderedDef.split("\n").forEach((l) => this.writeln(l));
+			if (isMongoCollection) this.write(`${mongoIdType} | `);
+			const renderedDef = this.renderTypeDefString(pkProps[0].prop.getDefinition()).trim();
+			this.writeln(`${renderedDef}${uniqueSuffix}`);
 		} else {
 			this.write("static __pk: ");
+			if (isMongoCollection) this.write(`${mongoIdType} | `);
 			this.blockln("{}");
 			for (const { name, prop } of pkProps) {
 				this.write(wrapProp(name), ": ");
@@ -509,6 +553,7 @@ else {
 				renderedDef.split("\n").forEach((l) => this.writeln(l));
 			}
 			this.pop();
+			this.writeln(uniqueSuffix);
 		}
 	}
 	phantomPropType(def) {
@@ -996,6 +1041,24 @@ var ValidatorError = class extends Error {
 
 //#endregion
 //#region packages/typescript/src/annotated-type.ts
+const COMPLEX_KINDS = new Set([
+	"union",
+	"intersection",
+	"tuple"
+]);
+/** Shared validator method reused by all annotated type nodes. */ function validatorMethod(opts) {
+	return new Validator(this, opts);
+}
+function createAnnotatedTypeNode(type, metadata, opts) {
+	return {
+		__is_atscript_annotated_type: true,
+		type,
+		metadata,
+		validator: validatorMethod,
+		id: opts?.id,
+		optional: opts?.optional
+	};
+}
 function isAnnotatedType(type) {
 	return type && type.__is_atscript_annotated_type;
 }
@@ -1012,38 +1075,24 @@ function defineAnnotatedType(_kind, base) {
 	const kind = _kind || "";
 	const type = base?.type || {};
 	type.kind = kind;
-	if ([
-		"union",
-		"intersection",
-		"tuple"
-	].includes(kind)) type.items = [];
+	if (COMPLEX_KINDS.has(kind)) type.items = [];
 	if (kind === "object") {
 		type.props = new Map();
 		type.propsPatterns = [];
 	}
 	type.tags = new Set();
 	const metadata = base?.metadata || new Map();
-	if (base) Object.assign(base, {
+	const payload = {
 		__is_atscript_annotated_type: true,
 		metadata,
 		type,
-		validator(opts) {
-			return new Validator(this, opts);
-		}
-	});
-else base = {
-		__is_atscript_annotated_type: true,
-		metadata,
-		type,
-		validator(opts) {
-			return new Validator(this, opts);
-		}
+		validator: validatorMethod
 	};
+	base = base ? Object.assign(base, payload) : payload;
 	const handle = {
 		$type: base,
 		$def: type,
 		$metadata: metadata,
-		_existingObject: undefined,
 		tags(...tags) {
 			for (const tag of tags) this.$def.tags.add(tag);
 			return this;
@@ -1084,27 +1133,18 @@ else base = {
 			return this;
 		},
 		refTo(type$1, chain) {
+			if (!isAnnotatedType(type$1)) throw new Error(`${type$1} is not annotated type`);
 			let newBase = type$1;
 			const typeName = type$1.name || "Unknown";
-			if (isAnnotatedType(newBase)) {
-				let keys = "";
-				for (const c of chain || []) {
-					keys += `["${c}"]`;
-					if (newBase.type.kind === "object" && newBase.type.props.has(c)) newBase = newBase.type.props.get(c);
-else throw new Error(`Can't find prop ${typeName}${keys}`);
+			if (chain) for (let i = 0; i < chain.length; i++) {
+				const c = chain[i];
+				if (newBase.type.kind === "object" && newBase.type.props.has(c)) newBase = newBase.type.props.get(c);
+else {
+					const keys = chain.slice(0, i + 1).map((k) => `["${k}"]`).join("");
+					throw new Error(`Can't find prop ${typeName}${keys}`);
 				}
-				if (!newBase && keys) throw new Error(`Can't find prop ${typeName}${keys}`);
-else if (!newBase) throw new Error(`"${typeName}" is not annotated type`);
-				this.$type = {
-					__is_atscript_annotated_type: true,
-					type: newBase.type,
-					metadata,
-					id: newBase.id,
-					validator(opts) {
-						return new Validator(this, opts);
-					}
-				};
-			} else throw new Error(`${type$1} is not annotated type`);
+			}
+			this.$type = createAnnotatedTypeNode(newBase.type, metadata, { id: newBase.id });
 			return this;
 		},
 		annotate(key, value, asArray) {
@@ -1154,10 +1194,10 @@ function forAnnotatedType(def, handlers) {
 	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 = [];
+	let result = null;
 	for (const candidate of candidates) {
 		const values = new Set();
-		const mapping = {};
+		const indexMapping = {};
 		let valid = true;
 		for (let i = 0; i < items.length; i++) {
 			const obj = items[i].type;
@@ -1172,19 +1212,21 @@ function forAnnotatedType(def, handlers) {
 				break;
 			}
 			values.add(val);
-			mapping[String(val)] = `#/oneOf/${i}`;
+			indexMapping[String(val)] = i;
+		}
+		if (valid) {
+			if (result) return null;
+			result = {
+				propertyName: candidate,
+				indexMapping
+			};
 		}
-		if (valid) validCandidates.push({
-			propertyName: candidate,
-			mapping
-		});
 	}
-	if (validCandidates.length === 1) return validCandidates[0];
-	return null;
+	return result;
 }
 function buildJsonSchema(type) {
 	const defs = {};
-	let isRoot = true;
+	let hasDefs = false;
 	const buildObject = (d) => {
 		const properties = {};
 		const required = [];
@@ -1201,15 +1243,15 @@ function buildJsonSchema(type) {
 		return schema$1;
 	};
 	const build = (def) => {
-		if (def.id && def.type.kind === "object" && !isRoot) {
+		if (def.id && def.type.kind === "object" && def !== type) {
 			const name = def.id;
 			if (!defs[name]) {
+				hasDefs = true;
 				defs[name] = {};
 				defs[name] = buildObject(def);
 			}
 			return { $ref: `#/$defs/${name}` };
 		}
-		isRoot = false;
 		const meta = def.metadata;
 		return forAnnotatedType(def, {
 			phantom() {
@@ -1234,11 +1276,9 @@ function buildJsonSchema(type) {
 				if (disc) {
 					const oneOf = d.type.items.map(build);
 					const mapping = {};
-					for (const [val, origPath] of Object.entries(disc.mapping)) {
-						const idx = Number.parseInt(origPath.split("/").pop(), 10);
+					for (const [val, idx] of Object.entries(disc.indexMapping)) {
 						const item = d.type.items[idx];
-						if (item.id && defs[item.id]) mapping[val] = `#/$defs/${item.id}`;
-else mapping[val] = origPath;
+						mapping[val] = item.id && defs[item.id] ? `#/$defs/${item.id}` : `#/oneOf/${idx}`;
 					}
 					return {
 						oneOf,
@@ -1288,7 +1328,7 @@ else schema$1.allOf = (schema$1.allOf || []).concat(patterns.map((p) => ({ patte
 		});
 	};
 	const schema = build(type);
-	if (Object.keys(defs).length > 0) return {
+	if (hasDefs) return {
 		...schema,
 		$defs: defs
 	};