arkormx 2.4.6 → 2.4.7

package/dist/{relationship-Cku0y1Mt.cjs → relationship-CuPNAoHm.cjs}

@@ -1046,18 +1046,21 @@ var TableBuilder = class {
 		this.dropColumnNames = [];
 		this.indexes = [];
 		this.foreignKeys = [];
+		this.compositeUniqueConstraints = [];
 	}
-	/**
-	* Defines a primary key column in the table.
-	* 
-	* @param columnNameOrOptions 
-	* @param options 
-	* @returns 
-	*/
 	primary(columnNameOrOptions, options) {
+		if (Array.isArray(columnNameOrOptions)) {
+			const columns = this.normalizeCompositeColumns(columnNameOrOptions, "primary key");
+			if (this.compositePrimaryKey) throw new Error("A composite primary key has already been defined for this table.");
+			this.compositePrimaryKey = {
+				columns,
+				...typeof options === "string" && options.trim() ? { name: options.trim() } : {}
+			};
+			return this;
+		}
 		const config = typeof columnNameOrOptions === "string" ? {
 			columnName: columnNameOrOptions,
-			...options ?? {}
+			...typeof options === "object" ? options : {}
 		} : columnNameOrOptions ?? {};
 		const column = this.resolveColumn(config.columnName);
 		column.primary = true;
@@ -1157,15 +1160,19 @@ var TableBuilder = class {
 	float(name, options = {}) {
 		return this.column(name, "float", options);
 	}
-	/**
-	* Marks a column as unique in the table.
-	* 
-	* @param name Optional explicit column name. 
-	* When omitted, applies to the latest defined column.
-	* @returns The current TableBuilder instance for chaining.
-	*/
-	unique(name) {
-		const column = this.resolveColumn(name);
+	unique(columnsOrName, name) {
+		if (Array.isArray(columnsOrName)) {
+			const columns = this.normalizeCompositeColumns(columnsOrName, "unique constraint");
+			const normalizedName = name?.trim();
+			if (this.compositeUniqueConstraints.find((constraint) => constraint.columns.length === columns.length && constraint.columns.every((column, index) => column === columns[index]))) throw new Error(`A unique constraint for columns [${columns.join(", ")}] has already been defined for this table.`);
+			if (normalizedName && this.compositeUniqueConstraints.some((constraint) => constraint.name === normalizedName)) throw new Error(`A unique constraint named [${normalizedName}] has already been defined for this table.`);
+			this.compositeUniqueConstraints.push({
+				columns,
+				...normalizedName ? { name: normalizedName } : {}
+			});
+			return this;
+		}
+		const column = this.resolveColumn(columnsOrName);
 		column.unique = true;
 		return this;
 	}
@@ -1407,6 +1414,24 @@ var TableBuilder = class {
 		return this.foreignKeys.map((foreignKey) => ({ ...foreignKey }));
 	}
 	/**
+	* Returns a copy of the table-level composite primary key.
+	*/
+	getPrimaryKey() {
+		return this.compositePrimaryKey ? {
+			...this.compositePrimaryKey,
+			columns: [...this.compositePrimaryKey.columns]
+		} : void 0;
+	}
+	/**
+	* Returns copies of table-level composite unique constraints.
+	*/
+	getUniqueConstraints() {
+		return this.compositeUniqueConstraints.map((constraint) => ({
+			...constraint,
+			columns: [...constraint.columns]
+		}));
+	}
+	/**
 	* Defines a column in the table with the given name.
 	* 
 	* @param name      The name of the column.
@@ -1448,6 +1473,13 @@ var TableBuilder = class {
 		if (!column) throw new Error(`Column [${targetName}] was not found in the table definition.`);
 		return column;
 	}
+	normalizeCompositeColumns(columns, label) {
+		const normalized = columns.map((column) => column.trim());
+		if (normalized.length < 2) throw new Error(`A composite ${label} must contain at least two columns.`);
+		if (normalized.some((column) => !column)) throw new Error(`Composite ${label} columns must be non-empty strings.`);
+		if (new Set(normalized).size !== normalized.length) throw new Error(`Composite ${label} columns must be unique.`);
+		return normalized;
+	}
 };
 
 //#endregion
@@ -1473,12 +1505,17 @@ var SchemaBuilder = class {
 	createTable(table, callback) {
 		const builder = new TableBuilder();
 		callback(builder);
+		const primaryKey = builder.getPrimaryKey();
+		this.validateCompositePrimaryKey(table, primaryKey, builder.getColumns(), true);
+		this.validateCompositeUniqueConstraints(table, builder.getUniqueConstraints(), builder.getColumns(), true);
 		this.operations.push({
 			type: "createTable",
 			table,
 			columns: builder.getColumns(),
 			indexes: builder.getIndexes(),
-			foreignKeys: builder.getForeignKeys()
+			foreignKeys: builder.getForeignKeys(),
+			primaryKey,
+			uniqueConstraints: builder.getUniqueConstraints()
 		});
 		return this;
 	}
@@ -1492,13 +1529,18 @@ var SchemaBuilder = class {
 	alterTable(table, callback) {
 		const builder = new TableBuilder();
 		callback(builder);
+		const primaryKey = builder.getPrimaryKey();
+		this.validateCompositePrimaryKey(table, primaryKey, builder.getColumns(), false);
+		this.validateCompositeUniqueConstraints(table, builder.getUniqueConstraints(), builder.getColumns(), false);
 		this.operations.push({
 			type: "alterTable",
 			table,
 			addColumns: builder.getColumns(),
 			dropColumns: builder.getDropColumns(),
 			addIndexes: builder.getIndexes(),
-			addForeignKeys: builder.getForeignKeys()
+			addForeignKeys: builder.getForeignKeys(),
+			addPrimaryKey: primaryKey,
+			addUniqueConstraints: builder.getUniqueConstraints()
 		});
 		return this;
 	}
@@ -1532,7 +1574,15 @@ var SchemaBuilder = class {
 					...index,
 					columns: [...index.columns]
 				})),
-				foreignKeys: operation.foreignKeys.map((foreignKey) => ({ ...foreignKey }))
+				foreignKeys: operation.foreignKeys.map((foreignKey) => ({ ...foreignKey })),
+				primaryKey: operation.primaryKey ? {
+					...operation.primaryKey,
+					columns: [...operation.primaryKey.columns]
+				} : void 0,
+				uniqueConstraints: operation.uniqueConstraints?.map((constraint) => ({
+					...constraint,
+					columns: [...constraint.columns]
+				}))
 			};
 			if (operation.type === "alterTable") return {
 				...operation,
@@ -1545,11 +1595,37 @@ var SchemaBuilder = class {
 					...index,
 					columns: [...index.columns]
 				})),
-				addForeignKeys: operation.addForeignKeys.map((foreignKey) => ({ ...foreignKey }))
+				addForeignKeys: operation.addForeignKeys.map((foreignKey) => ({ ...foreignKey })),
+				addPrimaryKey: operation.addPrimaryKey ? {
+					...operation.addPrimaryKey,
+					columns: [...operation.addPrimaryKey.columns]
+				} : void 0,
+				addUniqueConstraints: operation.addUniqueConstraints?.map((constraint) => ({
+					...constraint,
+					columns: [...constraint.columns]
+				}))
 			};
 			return { ...operation };
 		});
 	}
+	validateCompositePrimaryKey(table, primaryKey, columns, requireColumns) {
+		if (!primaryKey) return;
+		if (columns.some((column) => column.primary)) throw new Error(`Table [${table}] cannot combine column primary keys with a composite primary key.`);
+		if (!requireColumns) return;
+		primaryKey.columns.forEach((columnName) => {
+			const column = columns.find((candidate) => candidate.name === columnName);
+			if (!column) throw new Error(`Composite primary key column [${columnName}] was not found on table [${table}].`);
+			if (column.nullable) throw new Error(`Composite primary key column [${columnName}] on table [${table}] cannot be nullable.`);
+		});
+	}
+	validateCompositeUniqueConstraints(table, constraints, columns, requireColumns) {
+		if (!requireColumns) return;
+		constraints.forEach((constraint) => {
+			constraint.columns.forEach((columnName) => {
+				if (!columns.some((column) => column.name === columnName)) throw new Error(`Composite unique constraint column [${columnName}] was not found on table [${table}].`);
+			});
+		});
+	}
 };
 
 //#endregion
@@ -1773,6 +1849,24 @@ const buildIndexLine = (index) => {
 	return `  @@index([${index.columns.join(", ")}]${typeof index.name === "string" && index.name.trim().length > 0 ? `, name: "${index.name.replace(/"/g, "\\\"")}"` : ""})`;
 };
 /**
+* Build a Prisma model-level composite primary key definition.
+*
+* @param primaryKey
+* @returns
+*/
+const buildPrimaryKeyLine = (primaryKey) => {
+	return `  @@id([${primaryKey.columns.join(", ")}]${typeof primaryKey.name === "string" && primaryKey.name.trim().length > 0 ? `, name: "${primaryKey.name.replace(/"/g, "\\\"")}"` : ""})`;
+};
+/**
+* Build a Prisma model-level composite unique constraint definition.
+*
+* @param constraint
+* @returns
+*/
+const buildUniqueConstraintLine = (constraint) => {
+	return `  @@unique([${constraint.columns.join(", ")}]${typeof constraint.name === "string" && constraint.name.trim().length > 0 ? `, name: "${constraint.name.replace(/"/g, "\\\"")}"` : ""})`;
+};
+/**
 * Derive a relation field name from a foreign key column name by applying 
 * common conventions, such as removing "Id" suffixes and converting to camelCase.
 * 
@@ -1921,7 +2015,14 @@ const buildModelBlock = (operation) => {
 	const mapped = operation.table !== modelName.toLowerCase();
 	const fields = operation.columns.map(buildFieldLine);
 	const relations = (operation.foreignKeys ?? []).map((foreignKey) => buildRelationLine(modelName, foreignKey, operation.columns));
-	const metadata = [...(operation.indexes ?? []).map(buildIndexLine), ...mapped ? [`  @@map("${(0, _h3ravel_support.str)(operation.table).snake()}")`] : []];
+	const indexes = (operation.indexes ?? []).map(buildIndexLine);
+	const uniqueConstraints = (operation.uniqueConstraints ?? []).map(buildUniqueConstraintLine);
+	const metadata = [
+		...operation.primaryKey ? [buildPrimaryKeyLine(operation.primaryKey)] : [],
+		...uniqueConstraints,
+		...indexes,
+		...mapped ? [`  @@map("${(0, _h3ravel_support.str)(operation.table).snake()}")`] : []
+	];
 	return `model ${modelName} {\n${(metadata.length > 0 ? [
 		...fields,
 		...relations,
@@ -2018,6 +2119,18 @@ const applyAlterTableOperation = (schema, operation) => {
 		const insertIndex = Math.max(1, bodyLines.length - 1);
 		bodyLines.splice(insertIndex, 0, indexLine);
 	});
+	if (operation.addPrimaryKey) {
+		const primaryKeyLine = buildPrimaryKeyLine(operation.addPrimaryKey);
+		if (bodyLines.some((line) => line.includes(" @id") || line.trim().startsWith("@@id("))) throw new ArkormException(`Prisma model for table [${operation.table}] already defines a primary key.`);
+		const insertIndex = Math.max(1, bodyLines.length - 1);
+		bodyLines.splice(insertIndex, 0, primaryKeyLine);
+	}
+	for (const constraint of operation.addUniqueConstraints ?? []) {
+		const constraintLine = buildUniqueConstraintLine(constraint);
+		if (bodyLines.some((line) => line.trim() === constraintLine.trim())) continue;
+		const insertIndex = Math.max(1, bodyLines.length - 1);
+		bodyLines.splice(insertIndex, 0, constraintLine);
+	}
 	for (const foreignKey of operation.addForeignKeys ?? []) {
 		const relationLine = buildRelationLine(model.modelName, foreignKey, operation.addColumns);
 		const relationRegex = new RegExp(`^\\s*${escapeRegex(foreignKey.fieldAlias?.trim() || deriveRelationFieldName(foreignKey.column))}\\s+`);
@@ -5182,12 +5295,24 @@ Object.defineProperty(exports, 'buildModelBlock', {
     return buildModelBlock;
   }
 });
+Object.defineProperty(exports, 'buildPrimaryKeyLine', {
+  enumerable: true,
+  get: function () {
+    return buildPrimaryKeyLine;
+  }
+});
 Object.defineProperty(exports, 'buildRelationLine', {
   enumerable: true,
   get: function () {
     return buildRelationLine;
   }
 });
+Object.defineProperty(exports, 'buildUniqueConstraintLine', {
+  enumerable: true,
+  get: function () {
+    return buildUniqueConstraintLine;
+  }
+});
 Object.defineProperty(exports, 'computeMigrationChecksum', {
   enumerable: true,
   get: function () {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "arkormx",
-  "version": "2.4.6",
+  "version": "2.4.7",
   "description": "Modern TypeScript-first ORM for Node.js.",
   "keywords": [
     "orm",