arkormx 2.0.0-next.4 → 2.0.0-next.6

package/dist/cli.mjs

@@ -1,9 +1,9 @@
 #!/usr/bin/env node
 import { existsSync, mkdirSync, readFileSync, readdirSync, rmSync, writeFileSync } from "node:fs";
+import { createHash, randomUUID } from "node:crypto";
 import { dirname, extname, join, resolve } from "node:path";
 import { spawnSync } from "node:child_process";
 import { str } from "@h3ravel/support";
-import { createHash } from "node:crypto";
 import path, { dirname as dirname$1, extname as extname$1, join as join$1, relative } from "path";
 import { copyFileSync, existsSync as existsSync$1, mkdirSync as mkdirSync$1, readFileSync as readFileSync$1, readdirSync as readdirSync$1, rmSync as rmSync$1, writeFileSync as writeFileSync$1 } from "fs";
 import { AsyncLocalStorage } from "async_hooks";
@@ -55,6 +55,23 @@ var ArkormException = class extends Error {
 	}
 };
 
+//#endregion
+//#region src/helpers/PrimaryKeyGenerationPlanner.ts
+var PrimaryKeyGenerationPlanner = class {
+	static plan(column) {
+		if (!column.primary || column.default !== void 0) return void 0;
+		if (column.type === "uuid" || column.type === "string") return {
+			strategy: "uuid",
+			prismaDefault: "@default(uuid())",
+			databaseDefault: column.type === "uuid" ? "gen_random_uuid()" : "gen_random_uuid()::text",
+			runtimeFactory: "uuid"
+		};
+	}
+	static generate(generation) {
+		if (generation?.runtimeFactory === "uuid") return randomUUID();
+	}
+};
+
 //#endregion
 //#region src/database/ForeignKeyBuilder.ts
 /**
@@ -248,6 +265,7 @@ var TableBuilder = class {
 		column.primary = true;
 		if (typeof config.autoIncrement === "boolean") column.autoIncrement = config.autoIncrement;
 		if (Object.prototype.hasOwnProperty.call(config, "default")) column.default = config.default;
+		column.primaryKeyGeneration = PrimaryKeyGenerationPlanner.plan(column);
 		return this;
 	}
 	/**
@@ -611,8 +629,11 @@ var TableBuilder = class {
 			autoIncrement: options.autoIncrement,
 			after: options.after,
 			default: options.default,
-			updatedAt: options.updatedAt
+			updatedAt: options.updatedAt,
+			primaryKeyGeneration: options.primaryKeyGeneration
 		});
+		const column = this.columns[this.columns.length - 1];
+		column.primaryKeyGeneration = PrimaryKeyGenerationPlanner.plan(column);
 		this.latestColumnName = name;
 		return this;
 	}
@@ -867,7 +888,7 @@ const buildFieldLine = (column) => {
 	const primary = column.primary ? " @id" : "";
 	const mapped = typeof column.map === "string" && column.map.trim().length > 0 ? ` @map("${column.map.replace(/"/g, "\\\"")}")` : "";
 	const updatedAt = column.updatedAt ? " @updatedAt" : "";
-	const defaultValue = column.type === "enum" ? formatEnumDefaultValue(column.default) : formatDefaultValue(column.default) ?? (column.type === "uuid" && column.primary ? "@default(uuid())" : void 0);
+	const defaultValue = column.type === "enum" ? formatEnumDefaultValue(column.default) : column.primaryKeyGeneration?.prismaDefault ?? formatDefaultValue(column.default);
 	const defaultSuffix = defaultValue ? ` ${defaultValue}` : "";
 	return `  ${column.name} ${scalar}${nullable}${primary}${unique}${defaultSuffix}${updatedAt}${mapped}`;
 };
@@ -1603,7 +1624,20 @@ const normalizePersistedTableMetadata = (table) => {
 			const normalizedValues = normalizePersistedEnumValues(values);
 			if (normalizedValues.length > 0) all[columnName] = normalizedValues;
 			return all;
-		}, {})
+		}, {}),
+		primaryKeyGeneration: normalizePersistedPrimaryKeyGeneration(candidate.primaryKeyGeneration)
+	};
+};
+const normalizePersistedPrimaryKeyGeneration = (value) => {
+	if (!value || typeof value !== "object" || Array.isArray(value)) return void 0;
+	const candidate = value;
+	if (candidate.strategy !== "uuid" || typeof candidate.column !== "string" || candidate.column.trim().length === 0) return void 0;
+	return {
+		column: candidate.column,
+		strategy: "uuid",
+		prismaDefault: typeof candidate.prismaDefault === "string" && candidate.prismaDefault.trim().length > 0 ? candidate.prismaDefault : void 0,
+		databaseDefault: typeof candidate.databaseDefault === "string" && candidate.databaseDefault.trim().length > 0 ? candidate.databaseDefault : void 0,
+		runtimeFactory: candidate.runtimeFactory === "uuid" ? "uuid" : void 0
 	};
 };
 const normalizePersistedColumnMappingsState = (state) => {
@@ -1612,7 +1646,7 @@ const normalizePersistedColumnMappingsState = (state) => {
 		tables: Object.entries(state?.tables ?? {}).reduce((all, [tableName, tableMetadata]) => {
 			if (tableName.trim().length === 0) return all;
 			const normalized = normalizePersistedTableMetadata(tableMetadata);
-			if (Object.keys(normalized.columns).length > 0 || Object.keys(normalized.enums).length > 0) all[tableName] = normalized;
+			if (Object.keys(normalized.columns).length > 0 || Object.keys(normalized.enums).length > 0 || normalized.primaryKeyGeneration) all[tableName] = normalized;
 			return all;
 		}, {})
 	};
@@ -1683,12 +1717,10 @@ const getPersistedTableMetadata = (table, options = {}) => {
 		enums: Object.entries(metadata.enums).reduce((all, [columnName, values]) => {
 			all[columnName] = [...values];
 			return all;
-		}, {})
+		}, {}),
+		primaryKeyGeneration: metadata.primaryKeyGeneration ? { ...metadata.primaryKeyGeneration } : void 0
 	};
 };
-const getPersistedEnumMap = (table, options = {}) => {
-	return getPersistedTableMetadata(table, options).enums;
-};
 const applyMappedColumn = (tableColumns, column, features, table) => {
 	if (typeof column.map === "string" && column.map.trim().length > 0 && column.map !== column.name) {
 		if (!features.persistedColumnMappings) throw buildPersistedFeatureDisabledError("persistedColumnMappings", table);
@@ -1712,6 +1744,17 @@ const removePersistedColumnMetadata = (tableMetadata, columnName) => {
 	Object.entries(tableMetadata.columns).forEach(([attribute, mappedColumn]) => {
 		if (mappedColumn === columnName) delete tableMetadata.columns[attribute];
 	});
+	if (tableMetadata.primaryKeyGeneration?.column === columnName) delete tableMetadata.primaryKeyGeneration;
+};
+const applyPrimaryKeyGeneration = (tableMetadata, column) => {
+	if (!column.primary || !column.primaryKeyGeneration) {
+		if (tableMetadata.primaryKeyGeneration?.column === column.name) delete tableMetadata.primaryKeyGeneration;
+		return;
+	}
+	tableMetadata.primaryKeyGeneration = {
+		column: column.name,
+		...column.primaryKeyGeneration
+	};
 };
 const applyOperationsToPersistedColumnMappingsState = (state, operations, features = resolvePersistedMetadataFeatures()) => {
 	const nextTables = Object.entries(state.tables).reduce((all, [table, metadata]) => {
@@ -1720,7 +1763,8 @@ const applyOperationsToPersistedColumnMappingsState = (state, operations, featur
 			enums: Object.entries(metadata.enums).reduce((nextEnums, [columnName, values]) => {
 				nextEnums[columnName] = [...values];
 				return nextEnums;
-			}, {})
+			}, {}),
+			primaryKeyGeneration: metadata.primaryKeyGeneration ? { ...metadata.primaryKeyGeneration } : void 0
 		};
 		return all;
 	}, {});
@@ -1733,8 +1777,9 @@ const applyOperationsToPersistedColumnMappingsState = (state, operations, featur
 			operation.columns.forEach((column) => {
 				applyMappedColumn(tableMetadata.columns, column, features, operation.table);
 				applyEnumColumn(tableMetadata.enums, column, features, operation.table);
+				applyPrimaryKeyGeneration(tableMetadata, column);
 			});
-			if (Object.keys(tableMetadata.columns).length > 0 || Object.keys(tableMetadata.enums).length > 0) nextTables[operation.table] = tableMetadata;
+			if (Object.keys(tableMetadata.columns).length > 0 || Object.keys(tableMetadata.enums).length > 0 || tableMetadata.primaryKeyGeneration) nextTables[operation.table] = tableMetadata;
 			else delete nextTables[operation.table];
 			return;
 		}
@@ -1746,11 +1791,12 @@ const applyOperationsToPersistedColumnMappingsState = (state, operations, featur
 			operation.addColumns.forEach((column) => {
 				applyMappedColumn(tableMetadata.columns, column, features, operation.table);
 				applyEnumColumn(tableMetadata.enums, column, features, operation.table);
+				applyPrimaryKeyGeneration(tableMetadata, column);
 			});
 			operation.dropColumns.forEach((columnName) => {
 				removePersistedColumnMetadata(tableMetadata, columnName);
 			});
-			if (Object.keys(tableMetadata.columns).length > 0 || Object.keys(tableMetadata.enums).length > 0) nextTables[operation.table] = tableMetadata;
+			if (Object.keys(tableMetadata.columns).length > 0 || Object.keys(tableMetadata.enums).length > 0 || tableMetadata.primaryKeyGeneration) nextTables[operation.table] = tableMetadata;
 			else delete nextTables[operation.table];
 			return;
 		}
@@ -2544,21 +2590,30 @@ var CliApp = class {
 			skipped
 		};
 	}
-	applyPersistedEnumMetadata(structure) {
-		const persistedEnums = getPersistedEnumMap(structure.table, {
+	applyPersistedFieldMetadata(structure) {
+		const persistedMetadata = getPersistedTableMetadata(structure.table, {
 			features: resolvePersistedMetadataFeatures(this.getConfig("features")),
 			strict: true
 		});
-		if (Object.keys(persistedEnums).length === 0) return structure;
+		if (Object.keys(persistedMetadata.columns).length === 0 && Object.keys(persistedMetadata.enums).length === 0) return structure;
+		const attributesByColumn = Object.entries(persistedMetadata.columns).reduce((all, [attribute, column]) => {
+			all[column] = attribute;
+			return all;
+		}, {});
 		return {
 			...structure,
 			fields: structure.fields.map((field) => {
-				const enumValues = persistedEnums[field.name];
-				if (!enumValues || enumValues.length === 0) return field;
+				const logicalName = attributesByColumn[field.name] ?? field.name;
+				const enumValues = persistedMetadata.enums[logicalName] ?? persistedMetadata.enums[field.name];
+				if (!enumValues || enumValues.length === 0) return {
+					...field,
+					name: logicalName
+				};
 				const enumType = getPersistedEnumTsType(enumValues);
 				const isArray = /^Array<.+>$/.test(field.type);
 				return {
 					...field,
+					name: logicalName,
 					type: isArray ? `Array<${enumType}>` : enumType
 				};
 			})
@@ -2723,7 +2778,7 @@ var CliApp = class {
 			}, /* @__PURE__ */ new Map());
 			const discovered = await adapter.introspectModels({ tables: [...new Set([...sources.values()].map((source) => source.table))] });
 			const structuresByTable = new Map(discovered.map((model) => {
-				const enriched = this.applyPersistedEnumMetadata(model);
+				const enriched = this.applyPersistedFieldMetadata(model);
 				return [enriched.table, enriched];
 			}));
 			const result = this.syncModelFiles(modelFiles, (filePath) => {

package/dist/index.cjs

@@ -164,6 +164,7 @@ var KyselyDatabaseAdapter = class KyselyDatabaseAdapter {
 		return "timestamptz";
 	}
 	resolveSchemaColumnDefault(column) {
+		if (column.primaryKeyGeneration?.databaseDefault) return column.primaryKeyGeneration.databaseDefault;
 		const value = column.default ?? (column.updatedAt ? "now()" : void 0);
 		if (value === void 0) return null;
 		if (value === "now()") return "now()";
@@ -1147,6 +1148,23 @@ const getLatestAppliedMigrations = (state, steps) => {
 	}).slice(0, Math.max(0, steps)).map((entry) => entry.migration);
 };
 
+//#endregion
+//#region src/helpers/PrimaryKeyGenerationPlanner.ts
+var PrimaryKeyGenerationPlanner = class {
+	static plan(column) {
+		if (!column.primary || column.default !== void 0) return void 0;
+		if (column.type === "uuid" || column.type === "string") return {
+			strategy: "uuid",
+			prismaDefault: "@default(uuid())",
+			databaseDefault: column.type === "uuid" ? "gen_random_uuid()" : "gen_random_uuid()::text",
+			runtimeFactory: "uuid"
+		};
+	}
+	static generate(generation) {
+		if (generation?.runtimeFactory === "uuid") return (0, node_crypto.randomUUID)();
+	}
+};
+
 //#endregion
 //#region src/database/ForeignKeyBuilder.ts
 /**
@@ -1340,6 +1358,7 @@ var TableBuilder = class {
 		column.primary = true;
 		if (typeof config.autoIncrement === "boolean") column.autoIncrement = config.autoIncrement;
 		if (Object.prototype.hasOwnProperty.call(config, "default")) column.default = config.default;
+		column.primaryKeyGeneration = PrimaryKeyGenerationPlanner.plan(column);
 		return this;
 	}
 	/**
@@ -1703,8 +1722,11 @@ var TableBuilder = class {
 			autoIncrement: options.autoIncrement,
 			after: options.after,
 			default: options.default,
-			updatedAt: options.updatedAt
+			updatedAt: options.updatedAt,
+			primaryKeyGeneration: options.primaryKeyGeneration
 		});
+		const column = this.columns[this.columns.length - 1];
+		column.primaryKeyGeneration = PrimaryKeyGenerationPlanner.plan(column);
 		this.latestColumnName = name;
 		return this;
 	}
@@ -1959,7 +1981,7 @@ const buildFieldLine = (column) => {
 	const primary = column.primary ? " @id" : "";
 	const mapped = typeof column.map === "string" && column.map.trim().length > 0 ? ` @map("${column.map.replace(/"/g, "\\\"")}")` : "";
 	const updatedAt = column.updatedAt ? " @updatedAt" : "";
-	const defaultValue = column.type === "enum" ? formatEnumDefaultValue(column.default) : formatDefaultValue(column.default) ?? (column.type === "uuid" && column.primary ? "@default(uuid())" : void 0);
+	const defaultValue = column.type === "enum" ? formatEnumDefaultValue(column.default) : column.primaryKeyGeneration?.prismaDefault ?? formatDefaultValue(column.default);
 	const defaultSuffix = defaultValue ? ` ${defaultValue}` : "";
 	return `  ${column.name} ${scalar}${nullable}${primary}${unique}${defaultSuffix}${updatedAt}${mapped}`;
 };
@@ -2607,7 +2629,20 @@ const normalizePersistedTableMetadata = (table) => {
 			const normalizedValues = normalizePersistedEnumValues(values);
 			if (normalizedValues.length > 0) all[columnName] = normalizedValues;
 			return all;
-		}, {})
+		}, {}),
+		primaryKeyGeneration: normalizePersistedPrimaryKeyGeneration(candidate.primaryKeyGeneration)
+	};
+};
+const normalizePersistedPrimaryKeyGeneration = (value) => {
+	if (!value || typeof value !== "object" || Array.isArray(value)) return void 0;
+	const candidate = value;
+	if (candidate.strategy !== "uuid" || typeof candidate.column !== "string" || candidate.column.trim().length === 0) return void 0;
+	return {
+		column: candidate.column,
+		strategy: "uuid",
+		prismaDefault: typeof candidate.prismaDefault === "string" && candidate.prismaDefault.trim().length > 0 ? candidate.prismaDefault : void 0,
+		databaseDefault: typeof candidate.databaseDefault === "string" && candidate.databaseDefault.trim().length > 0 ? candidate.databaseDefault : void 0,
+		runtimeFactory: candidate.runtimeFactory === "uuid" ? "uuid" : void 0
 	};
 };
 const normalizePersistedColumnMappingsState = (state) => {
@@ -2616,7 +2651,7 @@ const normalizePersistedColumnMappingsState = (state) => {
 		tables: Object.entries(state?.tables ?? {}).reduce((all, [tableName, tableMetadata]) => {
 			if (tableName.trim().length === 0) return all;
 			const normalized = normalizePersistedTableMetadata(tableMetadata);
-			if (Object.keys(normalized.columns).length > 0 || Object.keys(normalized.enums).length > 0) all[tableName] = normalized;
+			if (Object.keys(normalized.columns).length > 0 || Object.keys(normalized.enums).length > 0 || normalized.primaryKeyGeneration) all[tableName] = normalized;
 			return all;
 		}, {})
 	};
@@ -2687,7 +2722,8 @@ const getPersistedTableMetadata = (table, options = {}) => {
 		enums: Object.entries(metadata.enums).reduce((all, [columnName, values]) => {
 			all[columnName] = [...values];
 			return all;
-		}, {})
+		}, {}),
+		primaryKeyGeneration: metadata.primaryKeyGeneration ? { ...metadata.primaryKeyGeneration } : void 0
 	};
 };
 const getPersistedColumnMap = (table, options = {}) => {
@@ -2696,6 +2732,9 @@ const getPersistedColumnMap = (table, options = {}) => {
 const getPersistedEnumMap = (table, options = {}) => {
 	return getPersistedTableMetadata(table, options).enums;
 };
+const getPersistedPrimaryKeyGeneration = (table, options = {}) => {
+	return getPersistedTableMetadata(table, options).primaryKeyGeneration;
+};
 const applyMappedColumn = (tableColumns, column, features, table) => {
 	if (typeof column.map === "string" && column.map.trim().length > 0 && column.map !== column.name) {
 		if (!features.persistedColumnMappings) throw buildPersistedFeatureDisabledError("persistedColumnMappings", table);
@@ -2719,6 +2758,17 @@ const removePersistedColumnMetadata = (tableMetadata, columnName) => {
 	Object.entries(tableMetadata.columns).forEach(([attribute, mappedColumn]) => {
 		if (mappedColumn === columnName) delete tableMetadata.columns[attribute];
 	});
+	if (tableMetadata.primaryKeyGeneration?.column === columnName) delete tableMetadata.primaryKeyGeneration;
+};
+const applyPrimaryKeyGeneration = (tableMetadata, column) => {
+	if (!column.primary || !column.primaryKeyGeneration) {
+		if (tableMetadata.primaryKeyGeneration?.column === column.name) delete tableMetadata.primaryKeyGeneration;
+		return;
+	}
+	tableMetadata.primaryKeyGeneration = {
+		column: column.name,
+		...column.primaryKeyGeneration
+	};
 };
 const applyOperationsToPersistedColumnMappingsState = (state, operations, features = resolvePersistedMetadataFeatures()) => {
 	const nextTables = Object.entries(state.tables).reduce((all, [table, metadata]) => {
@@ -2727,7 +2777,8 @@ const applyOperationsToPersistedColumnMappingsState = (state, operations, featur
 			enums: Object.entries(metadata.enums).reduce((nextEnums, [columnName, values]) => {
 				nextEnums[columnName] = [...values];
 				return nextEnums;
-			}, {})
+			}, {}),
+			primaryKeyGeneration: metadata.primaryKeyGeneration ? { ...metadata.primaryKeyGeneration } : void 0
 		};
 		return all;
 	}, {});
@@ -2740,8 +2791,9 @@ const applyOperationsToPersistedColumnMappingsState = (state, operations, featur
 			operation.columns.forEach((column) => {
 				applyMappedColumn(tableMetadata.columns, column, features, operation.table);
 				applyEnumColumn(tableMetadata.enums, column, features, operation.table);
+				applyPrimaryKeyGeneration(tableMetadata, column);
 			});
-			if (Object.keys(tableMetadata.columns).length > 0 || Object.keys(tableMetadata.enums).length > 0) nextTables[operation.table] = tableMetadata;
+			if (Object.keys(tableMetadata.columns).length > 0 || Object.keys(tableMetadata.enums).length > 0 || tableMetadata.primaryKeyGeneration) nextTables[operation.table] = tableMetadata;
 			else delete nextTables[operation.table];
 			return;
 		}
@@ -2753,11 +2805,12 @@ const applyOperationsToPersistedColumnMappingsState = (state, operations, featur
 			operation.addColumns.forEach((column) => {
 				applyMappedColumn(tableMetadata.columns, column, features, operation.table);
 				applyEnumColumn(tableMetadata.enums, column, features, operation.table);
+				applyPrimaryKeyGeneration(tableMetadata, column);
 			});
 			operation.dropColumns.forEach((columnName) => {
 				removePersistedColumnMetadata(tableMetadata, columnName);
 			});
-			if (Object.keys(tableMetadata.columns).length > 0 || Object.keys(tableMetadata.enums).length > 0) nextTables[operation.table] = tableMetadata;
+			if (Object.keys(tableMetadata.columns).length > 0 || Object.keys(tableMetadata.enums).length > 0 || tableMetadata.primaryKeyGeneration) nextTables[operation.table] = tableMetadata;
 			else delete nextTables[operation.table];
 			return;
 		}
@@ -4193,21 +4246,30 @@ var CliApp = class {
 			skipped
 		};
 	}
-	applyPersistedEnumMetadata(structure) {
-		const persistedEnums = getPersistedEnumMap(structure.table, {
+	applyPersistedFieldMetadata(structure) {
+		const persistedMetadata = getPersistedTableMetadata(structure.table, {
 			features: resolvePersistedMetadataFeatures(this.getConfig("features")),
 			strict: true
 		});
-		if (Object.keys(persistedEnums).length === 0) return structure;
+		if (Object.keys(persistedMetadata.columns).length === 0 && Object.keys(persistedMetadata.enums).length === 0) return structure;
+		const attributesByColumn = Object.entries(persistedMetadata.columns).reduce((all, [attribute, column]) => {
+			all[column] = attribute;
+			return all;
+		}, {});
 		return {
 			...structure,
 			fields: structure.fields.map((field) => {
-				const enumValues = persistedEnums[field.name];
-				if (!enumValues || enumValues.length === 0) return field;
+				const logicalName = attributesByColumn[field.name] ?? field.name;
+				const enumValues = persistedMetadata.enums[logicalName] ?? persistedMetadata.enums[field.name];
+				if (!enumValues || enumValues.length === 0) return {
+					...field,
+					name: logicalName
+				};
 				const enumType = getPersistedEnumTsType(enumValues);
 				const isArray = /^Array<.+>$/.test(field.type);
 				return {
 					...field,
+					name: logicalName,
 					type: isArray ? `Array<${enumType}>` : enumType
 				};
 			})
@@ -4372,7 +4434,7 @@ var CliApp = class {
 			}, /* @__PURE__ */ new Map());
 			const discovered = await adapter.introspectModels({ tables: [...new Set([...sources.values()].map((source) => source.table))] });
 			const structuresByTable = new Map(discovered.map((model) => {
-				const enriched = this.applyPersistedEnumMetadata(model);
+				const enriched = this.applyPersistedFieldMetadata(model);
 				return [enriched.table, enriched];
 			}));
 			const result = this.syncModelFiles(modelFiles, (filePath) => {
@@ -7657,7 +7719,8 @@ var QueryBuilder = class QueryBuilder {
 	* @returns 
 	*/
 	async create(data) {
-		const created = await this.executeInsertRow(data);
+		const [payload] = this.normalizeInsertPayloads(data);
+		const created = await this.executeInsertRow(payload);
 		return this.model.hydrate(created);
 	}
 	/**
@@ -7668,7 +7731,8 @@ var QueryBuilder = class QueryBuilder {
 	*/
 	async createMany(values) {
 		if (values.length === 0) return [];
-		return await Promise.all(values.map(async (value) => await this.create(value)));
+		const payloads = this.normalizeInsertPayloads(values);
+		return await Promise.all(payloads.map(async (value) => await this.create(value)));
 	}
 	/**
 	* Insert one or more records.
@@ -7932,8 +7996,17 @@ var QueryBuilder = class QueryBuilder {
 		return !await this.exists();
 	}
 	normalizeInsertPayloads(values) {
-		if (Array.isArray(values)) return values;
-		return [values];
+		const payloads = Array.isArray(values) ? values : [values];
+		const metadata = this.model.getModelMetadata();
+		return payloads.map((payload) => {
+			const nextPayload = { ...payload };
+			const primaryKeyValue = nextPayload[metadata.primaryKey];
+			if (primaryKeyValue !== void 0 && primaryKeyValue !== null) return nextPayload;
+			const generated = PrimaryKeyGenerationPlanner.generate(metadata.primaryKeyGeneration);
+			if (generated === void 0) return nextPayload;
+			nextPayload[metadata.primaryKey] = generated;
+			return nextPayload;
+		});
 	}
 	resolveAffectedCount(result, fallback) {
 		if (typeof result === "number") return result;
@@ -8176,6 +8249,7 @@ var QueryBuilder = class QueryBuilder {
 			modelName: this.model.name,
 			table: metadata.table,
 			primaryKey: metadata.primaryKey,
+			primaryKeyGeneration: metadata.primaryKeyGeneration,
 			columns: metadata.columns,
 			softDelete: metadata.softDelete
 		};
@@ -8988,10 +9062,10 @@ var Model = class Model {
 		const adapter = this.getAdapter();
 		const shouldStrictlyValidatePersistedMappings = Boolean(adapter) && !(adapter instanceof PrismaDatabaseAdapter);
 		return {
-			...getPersistedColumnMap(this.getTable(), {
+			...getPersistedTableMetadata(this.getTable(), {
 				features: resolvePersistedMetadataFeatures(getUserConfig("features")),
 				strict: shouldStrictlyValidatePersistedMappings
-			}),
+			}).columns,
 			...this.columns
 		};
 	}
@@ -8999,11 +9073,26 @@ var Model = class Model {
 		return this.getColumnMap()[attribute] ?? attribute;
 	}
 	static getModelMetadata() {
+		const adapter = this.getAdapter();
+		const shouldStrictlyValidatePersistedMappings = Boolean(adapter) && !(adapter instanceof PrismaDatabaseAdapter);
+		const persistedMetadata = getPersistedTableMetadata(this.getTable(), {
+			features: resolvePersistedMetadataFeatures(getUserConfig("features")),
+			strict: shouldStrictlyValidatePersistedMappings
+		});
 		return {
 			table: this.getTable(),
 			primaryKey: this.getPrimaryKey(),
-			columns: this.getColumnMap(),
-			softDelete: this.getSoftDeleteConfig()
+			columns: {
+				...persistedMetadata.columns,
+				...this.columns
+			},
+			softDelete: this.getSoftDeleteConfig(),
+			primaryKeyGeneration: persistedMetadata.primaryKeyGeneration?.column === this.getPrimaryKey() ? {
+				strategy: persistedMetadata.primaryKeyGeneration.strategy,
+				prismaDefault: persistedMetadata.primaryKeyGeneration.prismaDefault,
+				databaseDefault: persistedMetadata.primaryKeyGeneration.databaseDefault,
+				runtimeFactory: persistedMetadata.primaryKeyGeneration.runtimeFactory
+			} : void 0
 		};
 	}
 	static getRelationMetadata(name) {
@@ -10034,6 +10123,7 @@ exports.PRISMA_ENUM_MEMBER_REGEX = PRISMA_ENUM_MEMBER_REGEX;
 exports.PRISMA_ENUM_REGEX = PRISMA_ENUM_REGEX;
 exports.PRISMA_MODEL_REGEX = PRISMA_MODEL_REGEX;
 exports.Paginator = Paginator;
+exports.PrimaryKeyGenerationPlanner = PrimaryKeyGenerationPlanner;
 exports.PrismaDatabaseAdapter = PrismaDatabaseAdapter;
 exports.QueryBuilder = QueryBuilder;
 exports.QueryConstraintException = QueryConstraintException;
@@ -10103,6 +10193,7 @@ exports.getMigrationPlan = getMigrationPlan;
 exports.getPersistedColumnMap = getPersistedColumnMap;
 exports.getPersistedEnumMap = getPersistedEnumMap;
 exports.getPersistedEnumTsType = getPersistedEnumTsType;
+exports.getPersistedPrimaryKeyGeneration = getPersistedPrimaryKeyGeneration;
 exports.getPersistedTableMetadata = getPersistedTableMetadata;
 exports.getRuntimeAdapter = getRuntimeAdapter;
 exports.getRuntimePaginationCurrentPageResolver = getRuntimePaginationCurrentPageResolver;

package/dist/index.d.cts

@@ -5,6 +5,12 @@ import { Command } from "@h3ravel/musket";
 
 //#region src/types/migrations.d.ts
 type SchemaColumnType = 'id' | 'uuid' | 'enum' | 'string' | 'text' | 'integer' | 'bigInteger' | 'float' | 'boolean' | 'json' | 'date' | 'timestamp';
+interface PrimaryKeyGeneration {
+  strategy: 'uuid';
+  prismaDefault?: string;
+  databaseDefault?: string;
+  runtimeFactory?: 'uuid';
+}
 interface SchemaColumn {
   name: string;
   type: SchemaColumnType;
@@ -18,6 +24,7 @@ interface SchemaColumn {
   after?: string;
   default?: unknown;
   updatedAt?: boolean;
+  primaryKeyGeneration?: PrimaryKeyGeneration;
 }
 interface SchemaIndex {
   columns: string[];
@@ -325,6 +332,7 @@ interface ModelMetadata {
   primaryKey: string;
   columns: ColumnMap;
   softDelete: SoftDeleteConfig;
+  primaryKeyGeneration?: PrimaryKeyGeneration;
 }
 type RelationMetadataType = 'hasOne' | 'hasMany' | 'belongsTo' | 'belongsToMany' | 'hasOneThrough' | 'hasManyThrough' | 'morphOne' | 'morphMany' | 'morphToMany';
 interface BaseRelationMetadata {
@@ -2628,6 +2636,7 @@ interface QueryTarget<TModel = unknown> {
   modelName?: string;
   table?: string;
   primaryKey?: string;
+  primaryKeyGeneration?: PrimaryKeyGeneration;
   columns?: Record<string, string>;
   softDelete?: SoftDeleteConfig;
   alias?: string;
@@ -3324,13 +3333,13 @@ declare class CliApp {
   private syncPrismaEnumImports;
   private parseModelSyncSource;
   private syncModelFiles;
-  private applyPersistedEnumMetadata;
+  private applyPersistedFieldMetadata;
   /**
    * Parse Prisma enum definitions from a schema and return their member names.
    *
    * @param schema The Prisma schema source.
    * @returns      A map of enum names to their declared member names.
-   */
+      */
   private parsePrismaEnums;
   /**
    * Resolve the generated TypeScript declaration type for a Prisma field.
@@ -4175,6 +4184,10 @@ interface PersistedMetadataFeatures {
 interface PersistedTableMetadata {
   columns: Record<string, string>;
   enums: Record<string, string[]>;
+  primaryKeyGeneration?: PersistedPrimaryKeyGeneration;
+}
+interface PersistedPrimaryKeyGeneration extends PrimaryKeyGeneration {
+  column: string;
 }
 interface PersistedColumnMappingsState {
   version: 1;
@@ -4205,6 +4218,12 @@ declare const getPersistedEnumMap: (table: string, options?: {
   features?: PersistedMetadataFeatures;
   strict?: boolean;
 }) => Record<string, string[]>;
+declare const getPersistedPrimaryKeyGeneration: (table: string, options?: {
+  cwd?: string;
+  configuredPath?: string;
+  features?: PersistedMetadataFeatures;
+  strict?: boolean;
+}) => PersistedPrimaryKeyGeneration | undefined;
 declare const applyOperationsToPersistedColumnMappingsState: (state: PersistedColumnMappingsState, operations: SchemaOperation[], features?: PersistedMetadataFeatures) => PersistedColumnMappingsState;
 declare const rebuildPersistedColumnMappingsState: (state: AppliedMigrationsState, availableMigrations: [MigrationClass, string][], features?: PersistedMetadataFeatures) => Promise<PersistedColumnMappingsState>;
 declare const syncPersistedColumnMappingsFromState: (cwd: string, state: AppliedMigrationsState, availableMigrations: [MigrationClass, string][], features?: PersistedMetadataFeatures) => Promise<void>;
@@ -4525,6 +4544,12 @@ declare const runMigrationWithPrisma: (migration: Migration | (new () => Migrati
   operations: SchemaOperation[];
 }>;
 //#endregion
+//#region src/helpers/PrimaryKeyGenerationPlanner.d.ts
+declare class PrimaryKeyGenerationPlanner {
+  static plan(column: Pick<SchemaColumn, 'type' | 'primary' | 'default'>): PrimaryKeyGeneration | undefined;
+  static generate(generation: PrimaryKeyGeneration | undefined): unknown;
+}
+//#endregion
 //#region src/helpers/runtime-config.d.ts
 /**
  * Define the ArkORM runtime configuration. This function can be used to provide.
@@ -4656,4 +4681,4 @@ declare class URLDriver {
   url(page: number): string;
 }
 //#endregion
-export { AdapterBindableModel, AdapterCapabilities, AdapterCapability, AdapterModelFieldStructure, AdapterModelIntrospectionOptions, AdapterModelStructure, AdapterTransactionContext, AggregateOperation, AggregateSelection, AggregateSpec, AppliedMigrationEntry, AppliedMigrationRun, AppliedMigrationsState, ArkormBootContext, ArkormCollection, ArkormConfig, ArkormErrorContext, ArkormException, Attribute, AttributeCreateInput, AttributeOptions, AttributeOrderBy, AttributeSchemaDelegate, AttributeSelect, AttributeUpdateInput, AttributeWhereInput, BelongsToManyRelationMetadata, BelongsToRelationMetadata, CastDefinition, CastHandler, CastMap, CastType, CliApp, ClientResolver, ColumnMap, DatabaseAdapter, DatabasePrimitive, DatabaseRow, DatabaseRows, DatabaseValue, DelegateCreateData, DelegateFindManyArgs, DelegateForModelSchema, DelegateInclude, DelegateOrderBy, DelegateRow, DelegateRows, DelegateSelect, DelegateUniqueWhere, DelegateUpdateArgs, DelegateUpdateData, DelegateWhere, DeleteManySpec, DeleteSpec, EagerLoadConstraint, EagerLoadMap, EnumBuilder, FactoryAttributes, FactoryDefinition, FactoryModelConstructor, FactoryState, ForeignKeyBuilder, GenerateMigrationOptions, GeneratedMigrationFile, GetUserConfig, GlobalScope, HasManyRelationMetadata, HasManyThroughRelationMetadata, HasOneRelationMetadata, HasOneThroughRelationMetadata, InitCommand, InlineFactory, InsertManySpec, InsertSpec, KyselyDatabaseAdapter, LengthAwarePaginator, MIGRATION_BRAND, MakeFactoryCommand, MakeMigrationCommand, MakeModelCommand, MakeSeederCommand, MigrateCommand, MigrateFreshCommand, MigrateRollbackCommand, Migration, MigrationClass, MigrationHistoryCommand, MigrationInstanceLike, MissingDelegateException, Model, ModelAttributes, ModelAttributesOf, ModelCreateData, ModelEventDispatcher, ModelEventHandler, ModelEventHandlerConstructor, ModelEventListener, ModelEventName, ModelFactory, ModelLifecycleState, ModelMetadata, ModelNotFoundException, ModelStatic, ModelUpdateData, ModelsSyncCommand, MorphManyRelationMetadata, MorphOneRelationMetadata, MorphToManyRelationMetadata, PRISMA_ENUM_MEMBER_REGEX, PRISMA_ENUM_REGEX, PRISMA_MODEL_REGEX, PaginationCurrentPageResolver, PaginationMeta, PaginationOptions, PaginationURLDriver, PaginationURLDriverFactory, Paginator, PersistedColumnMappingsState, PersistedMetadataFeatures, PersistedTableMetadata, PrismaClientLike, PrismaDatabaseAdapter, PrismaDelegateLike, PrismaDelegateMap, PrismaDelegateNameMapping, PrismaFindManyArgsLike, PrismaLikeInclude, PrismaLikeOrderBy, PrismaLikeScalarFilter, PrismaLikeSelect, PrismaLikeSortOrder, PrismaLikeWhereInput, PrismaMigrationWorkflowOptions, PrismaSchemaSyncOptions, PrismaTransactionCallback, PrismaTransactionCapableClient, PrismaTransactionOptions, QueryBuilder, QueryComparisonCondition, QueryComparisonOperator, QueryCondition, QueryConstraintException, QueryGroupCondition, QueryLogicalOperator, QueryNotCondition, QueryOrderBy, QueryRawCondition, QuerySelectColumn, QueryTarget, RelatedModelClass, RelationAggregateSpec, RelationColumnLookupSpec, RelationConstraint, RelationDefaultResolver, RelationDefaultValue, RelationFilterSpec, RelationLoadPlan, RelationLoadSpec, RelationMetadata, RelationMetadataProvider, RelationMetadataType, RelationResolutionException, RelationTableLookupSpec, RelationshipModelStatic, RuntimeModuleLoader, SEEDER_BRAND, SchemaBuilder, SchemaColumn, SchemaColumnType, SchemaForeignKey, SchemaForeignKeyAction, SchemaIndex, SchemaOperation, SchemaTableAlterOperation, SchemaTableCreateOperation, SchemaTableDropOperation, ScopeNotDefinedException, SeedCommand, Seeder, SeederCallArgument, SeederConstructor, SeederInput, SelectSpec, Serializable, SimplePaginationMeta, SoftDeleteConfig, SoftDeleteQueryMode, SortDirection, TableBuilder, URLDriver, UniqueConstraintResolutionException, UnsupportedAdapterFeatureException, UpdateManySpec, UpdateSpec, UpsertSpec, applyAlterTableOperation, applyCreateTableOperation, applyDropTableOperation, applyMigrationRollbackToDatabase, applyMigrationRollbackToPrismaSchema, applyMigrationToDatabase, applyMigrationToPrismaSchema, applyOperationsToPersistedColumnMappingsState, applyOperationsToPrismaSchema, bindAdapterToModels, buildEnumBlock, buildFieldLine, buildIndexLine, buildInverseRelationLine, buildMigrationIdentity, buildMigrationRunId, buildMigrationSource, buildModelBlock, buildRelationLine, computeMigrationChecksum, configureArkormRuntime, createEmptyAppliedMigrationsState, createEmptyPersistedColumnMappingsState, createKyselyAdapter, createMigrationTimestamp, createPrismaAdapter, createPrismaCompatibilityAdapter, createPrismaDatabaseAdapter, createPrismaDelegateMap, defineConfig, defineFactory, deleteAppliedMigrationsStateFromStore, deletePersistedColumnMappingsState, deriveCollectionFieldName, deriveInverseRelationAlias, deriveRelationAlias, deriveRelationFieldName, deriveSingularFieldName, ensureArkormConfigLoading, escapeRegex, findAppliedMigration, findEnumBlock, findModelBlock, formatDefaultValue, formatEnumDefaultValue, formatRelationAction, generateMigrationFile, getActiveTransactionClient, getDefaultStubsPath, getLastMigrationRun, getLatestAppliedMigrations, getMigrationPlan, getPersistedColumnMap, getPersistedEnumMap, getPersistedEnumTsType, getPersistedTableMetadata, getRuntimeAdapter, getRuntimePaginationCurrentPageResolver, getRuntimePaginationURLDriverFactory, getRuntimePrismaClient, getUserConfig, inferDelegateName, isDelegateLike, isMigrationApplied, isTransactionCapableClient, loadArkormConfig, markMigrationApplied, markMigrationRun, pad, readAppliedMigrationsState, readAppliedMigrationsStateFromStore, readPersistedColumnMappingsState, rebuildPersistedColumnMappingsState, removeAppliedMigration, resetArkormRuntimeForTests, resetPersistedColumnMappingsCache, resolveCast, resolveColumnMappingsFilePath, resolveEnumName, resolveMigrationClassName, resolveMigrationStateFilePath, resolvePersistedMetadataFeatures, resolvePrismaType, runArkormTransaction, runMigrationWithPrisma, runPrismaCommand, stripPrismaSchemaModelsAndEnums, supportsDatabaseMigrationExecution, supportsDatabaseMigrationState, supportsDatabaseReset, syncPersistedColumnMappingsFromState, toMigrationFileSlug, toModelName, validatePersistedMetadataFeaturesForMigrations, writeAppliedMigrationsState, writeAppliedMigrationsStateToStore, writePersistedColumnMappingsState };
+export { AdapterBindableModel, AdapterCapabilities, AdapterCapability, AdapterModelFieldStructure, AdapterModelIntrospectionOptions, AdapterModelStructure, AdapterTransactionContext, AggregateOperation, AggregateSelection, AggregateSpec, AppliedMigrationEntry, AppliedMigrationRun, AppliedMigrationsState, ArkormBootContext, ArkormCollection, ArkormConfig, ArkormErrorContext, ArkormException, Attribute, AttributeCreateInput, AttributeOptions, AttributeOrderBy, AttributeSchemaDelegate, AttributeSelect, AttributeUpdateInput, AttributeWhereInput, BelongsToManyRelationMetadata, BelongsToRelationMetadata, CastDefinition, CastHandler, CastMap, CastType, CliApp, ClientResolver, ColumnMap, DatabaseAdapter, DatabasePrimitive, DatabaseRow, DatabaseRows, DatabaseValue, DelegateCreateData, DelegateFindManyArgs, DelegateForModelSchema, DelegateInclude, DelegateOrderBy, DelegateRow, DelegateRows, DelegateSelect, DelegateUniqueWhere, DelegateUpdateArgs, DelegateUpdateData, DelegateWhere, DeleteManySpec, DeleteSpec, EagerLoadConstraint, EagerLoadMap, EnumBuilder, FactoryAttributes, FactoryDefinition, FactoryModelConstructor, FactoryState, ForeignKeyBuilder, GenerateMigrationOptions, GeneratedMigrationFile, GetUserConfig, GlobalScope, HasManyRelationMetadata, HasManyThroughRelationMetadata, HasOneRelationMetadata, HasOneThroughRelationMetadata, InitCommand, InlineFactory, InsertManySpec, InsertSpec, KyselyDatabaseAdapter, LengthAwarePaginator, MIGRATION_BRAND, MakeFactoryCommand, MakeMigrationCommand, MakeModelCommand, MakeSeederCommand, MigrateCommand, MigrateFreshCommand, MigrateRollbackCommand, Migration, MigrationClass, MigrationHistoryCommand, MigrationInstanceLike, MissingDelegateException, Model, ModelAttributes, ModelAttributesOf, ModelCreateData, ModelEventDispatcher, ModelEventHandler, ModelEventHandlerConstructor, ModelEventListener, ModelEventName, ModelFactory, ModelLifecycleState, ModelMetadata, ModelNotFoundException, ModelStatic, ModelUpdateData, ModelsSyncCommand, MorphManyRelationMetadata, MorphOneRelationMetadata, MorphToManyRelationMetadata, PRISMA_ENUM_MEMBER_REGEX, PRISMA_ENUM_REGEX, PRISMA_MODEL_REGEX, PaginationCurrentPageResolver, PaginationMeta, PaginationOptions, PaginationURLDriver, PaginationURLDriverFactory, Paginator, PersistedColumnMappingsState, PersistedMetadataFeatures, PersistedPrimaryKeyGeneration, PersistedTableMetadata, PrimaryKeyGeneration, PrimaryKeyGenerationPlanner, PrismaClientLike, PrismaDatabaseAdapter, PrismaDelegateLike, PrismaDelegateMap, PrismaDelegateNameMapping, PrismaFindManyArgsLike, PrismaLikeInclude, PrismaLikeOrderBy, PrismaLikeScalarFilter, PrismaLikeSelect, PrismaLikeSortOrder, PrismaLikeWhereInput, PrismaMigrationWorkflowOptions, PrismaSchemaSyncOptions, PrismaTransactionCallback, PrismaTransactionCapableClient, PrismaTransactionOptions, QueryBuilder, QueryComparisonCondition, QueryComparisonOperator, QueryCondition, QueryConstraintException, QueryGroupCondition, QueryLogicalOperator, QueryNotCondition, QueryOrderBy, QueryRawCondition, QuerySelectColumn, QueryTarget, RelatedModelClass, RelationAggregateSpec, RelationColumnLookupSpec, RelationConstraint, RelationDefaultResolver, RelationDefaultValue, RelationFilterSpec, RelationLoadPlan, RelationLoadSpec, RelationMetadata, RelationMetadataProvider, RelationMetadataType, RelationResolutionException, RelationTableLookupSpec, RelationshipModelStatic, RuntimeModuleLoader, SEEDER_BRAND, SchemaBuilder, SchemaColumn, SchemaColumnType, SchemaForeignKey, SchemaForeignKeyAction, SchemaIndex, SchemaOperation, SchemaTableAlterOperation, SchemaTableCreateOperation, SchemaTableDropOperation, ScopeNotDefinedException, SeedCommand, Seeder, SeederCallArgument, SeederConstructor, SeederInput, SelectSpec, Serializable, SimplePaginationMeta, SoftDeleteConfig, SoftDeleteQueryMode, SortDirection, TableBuilder, URLDriver, UniqueConstraintResolutionException, UnsupportedAdapterFeatureException, UpdateManySpec, UpdateSpec, UpsertSpec, applyAlterTableOperation, applyCreateTableOperation, applyDropTableOperation, applyMigrationRollbackToDatabase, applyMigrationRollbackToPrismaSchema, applyMigrationToDatabase, applyMigrationToPrismaSchema, applyOperationsToPersistedColumnMappingsState, applyOperationsToPrismaSchema, bindAdapterToModels, buildEnumBlock, buildFieldLine, buildIndexLine, buildInverseRelationLine, buildMigrationIdentity, buildMigrationRunId, buildMigrationSource, buildModelBlock, buildRelationLine, computeMigrationChecksum, configureArkormRuntime, createEmptyAppliedMigrationsState, createEmptyPersistedColumnMappingsState, createKyselyAdapter, createMigrationTimestamp, createPrismaAdapter, createPrismaCompatibilityAdapter, createPrismaDatabaseAdapter, createPrismaDelegateMap, defineConfig, defineFactory, deleteAppliedMigrationsStateFromStore, deletePersistedColumnMappingsState, deriveCollectionFieldName, deriveInverseRelationAlias, deriveRelationAlias, deriveRelationFieldName, deriveSingularFieldName, ensureArkormConfigLoading, escapeRegex, findAppliedMigration, findEnumBlock, findModelBlock, formatDefaultValue, formatEnumDefaultValue, formatRelationAction, generateMigrationFile, getActiveTransactionClient, getDefaultStubsPath, getLastMigrationRun, getLatestAppliedMigrations, getMigrationPlan, getPersistedColumnMap, getPersistedEnumMap, getPersistedEnumTsType, getPersistedPrimaryKeyGeneration, getPersistedTableMetadata, getRuntimeAdapter, getRuntimePaginationCurrentPageResolver, getRuntimePaginationURLDriverFactory, getRuntimePrismaClient, getUserConfig, inferDelegateName, isDelegateLike, isMigrationApplied, isTransactionCapableClient, loadArkormConfig, markMigrationApplied, markMigrationRun, pad, readAppliedMigrationsState, readAppliedMigrationsStateFromStore, readPersistedColumnMappingsState, rebuildPersistedColumnMappingsState, removeAppliedMigration, resetArkormRuntimeForTests, resetPersistedColumnMappingsCache, resolveCast, resolveColumnMappingsFilePath, resolveEnumName, resolveMigrationClassName, resolveMigrationStateFilePath, resolvePersistedMetadataFeatures, resolvePrismaType, runArkormTransaction, runMigrationWithPrisma, runPrismaCommand, stripPrismaSchemaModelsAndEnums, supportsDatabaseMigrationExecution, supportsDatabaseMigrationState, supportsDatabaseReset, syncPersistedColumnMappingsFromState, toMigrationFileSlug, toModelName, validatePersistedMetadataFeaturesForMigrations, writeAppliedMigrationsState, writeAppliedMigrationsStateToStore, writePersistedColumnMappingsState };

package/dist/index.d.mts

@@ -5,6 +5,12 @@ import { PrismaClient } from "@prisma/client";
 
 //#region src/types/migrations.d.ts
 type SchemaColumnType = 'id' | 'uuid' | 'enum' | 'string' | 'text' | 'integer' | 'bigInteger' | 'float' | 'boolean' | 'json' | 'date' | 'timestamp';
+interface PrimaryKeyGeneration {
+  strategy: 'uuid';
+  prismaDefault?: string;
+  databaseDefault?: string;
+  runtimeFactory?: 'uuid';
+}
 interface SchemaColumn {
   name: string;
   type: SchemaColumnType;
@@ -18,6 +24,7 @@ interface SchemaColumn {
   after?: string;
   default?: unknown;
   updatedAt?: boolean;
+  primaryKeyGeneration?: PrimaryKeyGeneration;
 }
 interface SchemaIndex {
   columns: string[];
@@ -325,6 +332,7 @@ interface ModelMetadata {
   primaryKey: string;
   columns: ColumnMap;
   softDelete: SoftDeleteConfig;
+  primaryKeyGeneration?: PrimaryKeyGeneration;
 }
 type RelationMetadataType = 'hasOne' | 'hasMany' | 'belongsTo' | 'belongsToMany' | 'hasOneThrough' | 'hasManyThrough' | 'morphOne' | 'morphMany' | 'morphToMany';
 interface BaseRelationMetadata {
@@ -2628,6 +2636,7 @@ interface QueryTarget<TModel = unknown> {
   modelName?: string;
   table?: string;
   primaryKey?: string;
+  primaryKeyGeneration?: PrimaryKeyGeneration;
   columns?: Record<string, string>;
   softDelete?: SoftDeleteConfig;
   alias?: string;
@@ -3324,13 +3333,13 @@ declare class CliApp {
   private syncPrismaEnumImports;
   private parseModelSyncSource;
   private syncModelFiles;
-  private applyPersistedEnumMetadata;
+  private applyPersistedFieldMetadata;
   /**
    * Parse Prisma enum definitions from a schema and return their member names.
    *
    * @param schema The Prisma schema source.
    * @returns      A map of enum names to their declared member names.
-   */
+      */
   private parsePrismaEnums;
   /**
    * Resolve the generated TypeScript declaration type for a Prisma field.
@@ -4175,6 +4184,10 @@ interface PersistedMetadataFeatures {
 interface PersistedTableMetadata {
   columns: Record<string, string>;
   enums: Record<string, string[]>;
+  primaryKeyGeneration?: PersistedPrimaryKeyGeneration;
+}
+interface PersistedPrimaryKeyGeneration extends PrimaryKeyGeneration {
+  column: string;
 }
 interface PersistedColumnMappingsState {
   version: 1;
@@ -4205,6 +4218,12 @@ declare const getPersistedEnumMap: (table: string, options?: {
   features?: PersistedMetadataFeatures;
   strict?: boolean;
 }) => Record<string, string[]>;
+declare const getPersistedPrimaryKeyGeneration: (table: string, options?: {
+  cwd?: string;
+  configuredPath?: string;
+  features?: PersistedMetadataFeatures;
+  strict?: boolean;
+}) => PersistedPrimaryKeyGeneration | undefined;
 declare const applyOperationsToPersistedColumnMappingsState: (state: PersistedColumnMappingsState, operations: SchemaOperation[], features?: PersistedMetadataFeatures) => PersistedColumnMappingsState;
 declare const rebuildPersistedColumnMappingsState: (state: AppliedMigrationsState, availableMigrations: [MigrationClass, string][], features?: PersistedMetadataFeatures) => Promise<PersistedColumnMappingsState>;
 declare const syncPersistedColumnMappingsFromState: (cwd: string, state: AppliedMigrationsState, availableMigrations: [MigrationClass, string][], features?: PersistedMetadataFeatures) => Promise<void>;
@@ -4525,6 +4544,12 @@ declare const runMigrationWithPrisma: (migration: Migration | (new () => Migrati
   operations: SchemaOperation[];
 }>;
 //#endregion
+//#region src/helpers/PrimaryKeyGenerationPlanner.d.ts
+declare class PrimaryKeyGenerationPlanner {
+  static plan(column: Pick<SchemaColumn, 'type' | 'primary' | 'default'>): PrimaryKeyGeneration | undefined;
+  static generate(generation: PrimaryKeyGeneration | undefined): unknown;
+}
+//#endregion
 //#region src/helpers/runtime-config.d.ts
 /**
  * Define the ArkORM runtime configuration. This function can be used to provide.
@@ -4656,4 +4681,4 @@ declare class URLDriver {
   url(page: number): string;
 }
 //#endregion
-export { AdapterBindableModel, AdapterCapabilities, AdapterCapability, AdapterModelFieldStructure, AdapterModelIntrospectionOptions, AdapterModelStructure, AdapterTransactionContext, AggregateOperation, AggregateSelection, AggregateSpec, AppliedMigrationEntry, AppliedMigrationRun, AppliedMigrationsState, ArkormBootContext, ArkormCollection, ArkormConfig, ArkormErrorContext, ArkormException, Attribute, AttributeCreateInput, AttributeOptions, AttributeOrderBy, AttributeSchemaDelegate, AttributeSelect, AttributeUpdateInput, AttributeWhereInput, BelongsToManyRelationMetadata, BelongsToRelationMetadata, CastDefinition, CastHandler, CastMap, CastType, CliApp, ClientResolver, ColumnMap, DatabaseAdapter, DatabasePrimitive, DatabaseRow, DatabaseRows, DatabaseValue, DelegateCreateData, DelegateFindManyArgs, DelegateForModelSchema, DelegateInclude, DelegateOrderBy, DelegateRow, DelegateRows, DelegateSelect, DelegateUniqueWhere, DelegateUpdateArgs, DelegateUpdateData, DelegateWhere, DeleteManySpec, DeleteSpec, EagerLoadConstraint, EagerLoadMap, EnumBuilder, FactoryAttributes, FactoryDefinition, FactoryModelConstructor, FactoryState, ForeignKeyBuilder, GenerateMigrationOptions, GeneratedMigrationFile, GetUserConfig, GlobalScope, HasManyRelationMetadata, HasManyThroughRelationMetadata, HasOneRelationMetadata, HasOneThroughRelationMetadata, InitCommand, InlineFactory, InsertManySpec, InsertSpec, KyselyDatabaseAdapter, LengthAwarePaginator, MIGRATION_BRAND, MakeFactoryCommand, MakeMigrationCommand, MakeModelCommand, MakeSeederCommand, MigrateCommand, MigrateFreshCommand, MigrateRollbackCommand, Migration, MigrationClass, MigrationHistoryCommand, MigrationInstanceLike, MissingDelegateException, Model, ModelAttributes, ModelAttributesOf, ModelCreateData, ModelEventDispatcher, ModelEventHandler, ModelEventHandlerConstructor, ModelEventListener, ModelEventName, ModelFactory, ModelLifecycleState, ModelMetadata, ModelNotFoundException, ModelStatic, ModelUpdateData, ModelsSyncCommand, MorphManyRelationMetadata, MorphOneRelationMetadata, MorphToManyRelationMetadata, PRISMA_ENUM_MEMBER_REGEX, PRISMA_ENUM_REGEX, PRISMA_MODEL_REGEX, PaginationCurrentPageResolver, PaginationMeta, PaginationOptions, PaginationURLDriver, PaginationURLDriverFactory, Paginator, PersistedColumnMappingsState, PersistedMetadataFeatures, PersistedTableMetadata, PrismaClientLike, PrismaDatabaseAdapter, PrismaDelegateLike, PrismaDelegateMap, PrismaDelegateNameMapping, PrismaFindManyArgsLike, PrismaLikeInclude, PrismaLikeOrderBy, PrismaLikeScalarFilter, PrismaLikeSelect, PrismaLikeSortOrder, PrismaLikeWhereInput, PrismaMigrationWorkflowOptions, PrismaSchemaSyncOptions, PrismaTransactionCallback, PrismaTransactionCapableClient, PrismaTransactionOptions, QueryBuilder, QueryComparisonCondition, QueryComparisonOperator, QueryCondition, QueryConstraintException, QueryGroupCondition, QueryLogicalOperator, QueryNotCondition, QueryOrderBy, QueryRawCondition, QuerySelectColumn, QueryTarget, RelatedModelClass, RelationAggregateSpec, RelationColumnLookupSpec, RelationConstraint, RelationDefaultResolver, RelationDefaultValue, RelationFilterSpec, RelationLoadPlan, RelationLoadSpec, RelationMetadata, RelationMetadataProvider, RelationMetadataType, RelationResolutionException, RelationTableLookupSpec, RelationshipModelStatic, RuntimeModuleLoader, SEEDER_BRAND, SchemaBuilder, SchemaColumn, SchemaColumnType, SchemaForeignKey, SchemaForeignKeyAction, SchemaIndex, SchemaOperation, SchemaTableAlterOperation, SchemaTableCreateOperation, SchemaTableDropOperation, ScopeNotDefinedException, SeedCommand, Seeder, SeederCallArgument, SeederConstructor, SeederInput, SelectSpec, Serializable, SimplePaginationMeta, SoftDeleteConfig, SoftDeleteQueryMode, SortDirection, TableBuilder, URLDriver, UniqueConstraintResolutionException, UnsupportedAdapterFeatureException, UpdateManySpec, UpdateSpec, UpsertSpec, applyAlterTableOperation, applyCreateTableOperation, applyDropTableOperation, applyMigrationRollbackToDatabase, applyMigrationRollbackToPrismaSchema, applyMigrationToDatabase, applyMigrationToPrismaSchema, applyOperationsToPersistedColumnMappingsState, applyOperationsToPrismaSchema, bindAdapterToModels, buildEnumBlock, buildFieldLine, buildIndexLine, buildInverseRelationLine, buildMigrationIdentity, buildMigrationRunId, buildMigrationSource, buildModelBlock, buildRelationLine, computeMigrationChecksum, configureArkormRuntime, createEmptyAppliedMigrationsState, createEmptyPersistedColumnMappingsState, createKyselyAdapter, createMigrationTimestamp, createPrismaAdapter, createPrismaCompatibilityAdapter, createPrismaDatabaseAdapter, createPrismaDelegateMap, defineConfig, defineFactory, deleteAppliedMigrationsStateFromStore, deletePersistedColumnMappingsState, deriveCollectionFieldName, deriveInverseRelationAlias, deriveRelationAlias, deriveRelationFieldName, deriveSingularFieldName, ensureArkormConfigLoading, escapeRegex, findAppliedMigration, findEnumBlock, findModelBlock, formatDefaultValue, formatEnumDefaultValue, formatRelationAction, generateMigrationFile, getActiveTransactionClient, getDefaultStubsPath, getLastMigrationRun, getLatestAppliedMigrations, getMigrationPlan, getPersistedColumnMap, getPersistedEnumMap, getPersistedEnumTsType, getPersistedTableMetadata, getRuntimeAdapter, getRuntimePaginationCurrentPageResolver, getRuntimePaginationURLDriverFactory, getRuntimePrismaClient, getUserConfig, inferDelegateName, isDelegateLike, isMigrationApplied, isTransactionCapableClient, loadArkormConfig, markMigrationApplied, markMigrationRun, pad, readAppliedMigrationsState, readAppliedMigrationsStateFromStore, readPersistedColumnMappingsState, rebuildPersistedColumnMappingsState, removeAppliedMigration, resetArkormRuntimeForTests, resetPersistedColumnMappingsCache, resolveCast, resolveColumnMappingsFilePath, resolveEnumName, resolveMigrationClassName, resolveMigrationStateFilePath, resolvePersistedMetadataFeatures, resolvePrismaType, runArkormTransaction, runMigrationWithPrisma, runPrismaCommand, stripPrismaSchemaModelsAndEnums, supportsDatabaseMigrationExecution, supportsDatabaseMigrationState, supportsDatabaseReset, syncPersistedColumnMappingsFromState, toMigrationFileSlug, toModelName, validatePersistedMetadataFeaturesForMigrations, writeAppliedMigrationsState, writeAppliedMigrationsStateToStore, writePersistedColumnMappingsState };
+export { AdapterBindableModel, AdapterCapabilities, AdapterCapability, AdapterModelFieldStructure, AdapterModelIntrospectionOptions, AdapterModelStructure, AdapterTransactionContext, AggregateOperation, AggregateSelection, AggregateSpec, AppliedMigrationEntry, AppliedMigrationRun, AppliedMigrationsState, ArkormBootContext, ArkormCollection, ArkormConfig, ArkormErrorContext, ArkormException, Attribute, AttributeCreateInput, AttributeOptions, AttributeOrderBy, AttributeSchemaDelegate, AttributeSelect, AttributeUpdateInput, AttributeWhereInput, BelongsToManyRelationMetadata, BelongsToRelationMetadata, CastDefinition, CastHandler, CastMap, CastType, CliApp, ClientResolver, ColumnMap, DatabaseAdapter, DatabasePrimitive, DatabaseRow, DatabaseRows, DatabaseValue, DelegateCreateData, DelegateFindManyArgs, DelegateForModelSchema, DelegateInclude, DelegateOrderBy, DelegateRow, DelegateRows, DelegateSelect, DelegateUniqueWhere, DelegateUpdateArgs, DelegateUpdateData, DelegateWhere, DeleteManySpec, DeleteSpec, EagerLoadConstraint, EagerLoadMap, EnumBuilder, FactoryAttributes, FactoryDefinition, FactoryModelConstructor, FactoryState, ForeignKeyBuilder, GenerateMigrationOptions, GeneratedMigrationFile, GetUserConfig, GlobalScope, HasManyRelationMetadata, HasManyThroughRelationMetadata, HasOneRelationMetadata, HasOneThroughRelationMetadata, InitCommand, InlineFactory, InsertManySpec, InsertSpec, KyselyDatabaseAdapter, LengthAwarePaginator, MIGRATION_BRAND, MakeFactoryCommand, MakeMigrationCommand, MakeModelCommand, MakeSeederCommand, MigrateCommand, MigrateFreshCommand, MigrateRollbackCommand, Migration, MigrationClass, MigrationHistoryCommand, MigrationInstanceLike, MissingDelegateException, Model, ModelAttributes, ModelAttributesOf, ModelCreateData, ModelEventDispatcher, ModelEventHandler, ModelEventHandlerConstructor, ModelEventListener, ModelEventName, ModelFactory, ModelLifecycleState, ModelMetadata, ModelNotFoundException, ModelStatic, ModelUpdateData, ModelsSyncCommand, MorphManyRelationMetadata, MorphOneRelationMetadata, MorphToManyRelationMetadata, PRISMA_ENUM_MEMBER_REGEX, PRISMA_ENUM_REGEX, PRISMA_MODEL_REGEX, PaginationCurrentPageResolver, PaginationMeta, PaginationOptions, PaginationURLDriver, PaginationURLDriverFactory, Paginator, PersistedColumnMappingsState, PersistedMetadataFeatures, PersistedPrimaryKeyGeneration, PersistedTableMetadata, PrimaryKeyGeneration, PrimaryKeyGenerationPlanner, PrismaClientLike, PrismaDatabaseAdapter, PrismaDelegateLike, PrismaDelegateMap, PrismaDelegateNameMapping, PrismaFindManyArgsLike, PrismaLikeInclude, PrismaLikeOrderBy, PrismaLikeScalarFilter, PrismaLikeSelect, PrismaLikeSortOrder, PrismaLikeWhereInput, PrismaMigrationWorkflowOptions, PrismaSchemaSyncOptions, PrismaTransactionCallback, PrismaTransactionCapableClient, PrismaTransactionOptions, QueryBuilder, QueryComparisonCondition, QueryComparisonOperator, QueryCondition, QueryConstraintException, QueryGroupCondition, QueryLogicalOperator, QueryNotCondition, QueryOrderBy, QueryRawCondition, QuerySelectColumn, QueryTarget, RelatedModelClass, RelationAggregateSpec, RelationColumnLookupSpec, RelationConstraint, RelationDefaultResolver, RelationDefaultValue, RelationFilterSpec, RelationLoadPlan, RelationLoadSpec, RelationMetadata, RelationMetadataProvider, RelationMetadataType, RelationResolutionException, RelationTableLookupSpec, RelationshipModelStatic, RuntimeModuleLoader, SEEDER_BRAND, SchemaBuilder, SchemaColumn, SchemaColumnType, SchemaForeignKey, SchemaForeignKeyAction, SchemaIndex, SchemaOperation, SchemaTableAlterOperation, SchemaTableCreateOperation, SchemaTableDropOperation, ScopeNotDefinedException, SeedCommand, Seeder, SeederCallArgument, SeederConstructor, SeederInput, SelectSpec, Serializable, SimplePaginationMeta, SoftDeleteConfig, SoftDeleteQueryMode, SortDirection, TableBuilder, URLDriver, UniqueConstraintResolutionException, UnsupportedAdapterFeatureException, UpdateManySpec, UpdateSpec, UpsertSpec, applyAlterTableOperation, applyCreateTableOperation, applyDropTableOperation, applyMigrationRollbackToDatabase, applyMigrationRollbackToPrismaSchema, applyMigrationToDatabase, applyMigrationToPrismaSchema, applyOperationsToPersistedColumnMappingsState, applyOperationsToPrismaSchema, bindAdapterToModels, buildEnumBlock, buildFieldLine, buildIndexLine, buildInverseRelationLine, buildMigrationIdentity, buildMigrationRunId, buildMigrationSource, buildModelBlock, buildRelationLine, computeMigrationChecksum, configureArkormRuntime, createEmptyAppliedMigrationsState, createEmptyPersistedColumnMappingsState, createKyselyAdapter, createMigrationTimestamp, createPrismaAdapter, createPrismaCompatibilityAdapter, createPrismaDatabaseAdapter, createPrismaDelegateMap, defineConfig, defineFactory, deleteAppliedMigrationsStateFromStore, deletePersistedColumnMappingsState, deriveCollectionFieldName, deriveInverseRelationAlias, deriveRelationAlias, deriveRelationFieldName, deriveSingularFieldName, ensureArkormConfigLoading, escapeRegex, findAppliedMigration, findEnumBlock, findModelBlock, formatDefaultValue, formatEnumDefaultValue, formatRelationAction, generateMigrationFile, getActiveTransactionClient, getDefaultStubsPath, getLastMigrationRun, getLatestAppliedMigrations, getMigrationPlan, getPersistedColumnMap, getPersistedEnumMap, getPersistedEnumTsType, getPersistedPrimaryKeyGeneration, getPersistedTableMetadata, getRuntimeAdapter, getRuntimePaginationCurrentPageResolver, getRuntimePaginationURLDriverFactory, getRuntimePrismaClient, getUserConfig, inferDelegateName, isDelegateLike, isMigrationApplied, isTransactionCapableClient, loadArkormConfig, markMigrationApplied, markMigrationRun, pad, readAppliedMigrationsState, readAppliedMigrationsStateFromStore, readPersistedColumnMappingsState, rebuildPersistedColumnMappingsState, removeAppliedMigration, resetArkormRuntimeForTests, resetPersistedColumnMappingsCache, resolveCast, resolveColumnMappingsFilePath, resolveEnumName, resolveMigrationClassName, resolveMigrationStateFilePath, resolvePersistedMetadataFeatures, resolvePrismaType, runArkormTransaction, runMigrationWithPrisma, runPrismaCommand, stripPrismaSchemaModelsAndEnums, supportsDatabaseMigrationExecution, supportsDatabaseMigrationState, supportsDatabaseReset, syncPersistedColumnMappingsFromState, toMigrationFileSlug, toModelName, validatePersistedMetadataFeaturesForMigrations, writeAppliedMigrationsState, writeAppliedMigrationsStateToStore, writePersistedColumnMappingsState };

package/dist/index.mjs

@@ -3,7 +3,7 @@ import { str } from "@h3ravel/support";
 import { AsyncLocalStorage } from "async_hooks";
 import { dirname, extname, join, resolve } from "node:path";
 import { existsSync, mkdirSync, readFileSync, readdirSync, rmSync, writeFileSync } from "node:fs";
-import { createHash } from "node:crypto";
+import { createHash, randomUUID } from "node:crypto";
 import { spawnSync } from "node:child_process";
 import { createJiti } from "@rexxars/jiti";
 import { pathToFileURL } from "node:url";
@@ -135,6 +135,7 @@ var KyselyDatabaseAdapter = class KyselyDatabaseAdapter {
 		return "timestamptz";
 	}
 	resolveSchemaColumnDefault(column) {
+		if (column.primaryKeyGeneration?.databaseDefault) return column.primaryKeyGeneration.databaseDefault;
 		const value = column.default ?? (column.updatedAt ? "now()" : void 0);
 		if (value === void 0) return null;
 		if (value === "now()") return "now()";
@@ -1118,6 +1119,23 @@ const getLatestAppliedMigrations = (state, steps) => {
 	}).slice(0, Math.max(0, steps)).map((entry) => entry.migration);
 };
 
+//#endregion
+//#region src/helpers/PrimaryKeyGenerationPlanner.ts
+var PrimaryKeyGenerationPlanner = class {
+	static plan(column) {
+		if (!column.primary || column.default !== void 0) return void 0;
+		if (column.type === "uuid" || column.type === "string") return {
+			strategy: "uuid",
+			prismaDefault: "@default(uuid())",
+			databaseDefault: column.type === "uuid" ? "gen_random_uuid()" : "gen_random_uuid()::text",
+			runtimeFactory: "uuid"
+		};
+	}
+	static generate(generation) {
+		if (generation?.runtimeFactory === "uuid") return randomUUID();
+	}
+};
+
 //#endregion
 //#region src/database/ForeignKeyBuilder.ts
 /**
@@ -1311,6 +1329,7 @@ var TableBuilder = class {
 		column.primary = true;
 		if (typeof config.autoIncrement === "boolean") column.autoIncrement = config.autoIncrement;
 		if (Object.prototype.hasOwnProperty.call(config, "default")) column.default = config.default;
+		column.primaryKeyGeneration = PrimaryKeyGenerationPlanner.plan(column);
 		return this;
 	}
 	/**
@@ -1674,8 +1693,11 @@ var TableBuilder = class {
 			autoIncrement: options.autoIncrement,
 			after: options.after,
 			default: options.default,
-			updatedAt: options.updatedAt
+			updatedAt: options.updatedAt,
+			primaryKeyGeneration: options.primaryKeyGeneration
 		});
+		const column = this.columns[this.columns.length - 1];
+		column.primaryKeyGeneration = PrimaryKeyGenerationPlanner.plan(column);
 		this.latestColumnName = name;
 		return this;
 	}
@@ -1930,7 +1952,7 @@ const buildFieldLine = (column) => {
 	const primary = column.primary ? " @id" : "";
 	const mapped = typeof column.map === "string" && column.map.trim().length > 0 ? ` @map("${column.map.replace(/"/g, "\\\"")}")` : "";
 	const updatedAt = column.updatedAt ? " @updatedAt" : "";
-	const defaultValue = column.type === "enum" ? formatEnumDefaultValue(column.default) : formatDefaultValue(column.default) ?? (column.type === "uuid" && column.primary ? "@default(uuid())" : void 0);
+	const defaultValue = column.type === "enum" ? formatEnumDefaultValue(column.default) : column.primaryKeyGeneration?.prismaDefault ?? formatDefaultValue(column.default);
 	const defaultSuffix = defaultValue ? ` ${defaultValue}` : "";
 	return `  ${column.name} ${scalar}${nullable}${primary}${unique}${defaultSuffix}${updatedAt}${mapped}`;
 };
@@ -2578,7 +2600,20 @@ const normalizePersistedTableMetadata = (table) => {
 			const normalizedValues = normalizePersistedEnumValues(values);
 			if (normalizedValues.length > 0) all[columnName] = normalizedValues;
 			return all;
-		}, {})
+		}, {}),
+		primaryKeyGeneration: normalizePersistedPrimaryKeyGeneration(candidate.primaryKeyGeneration)
+	};
+};
+const normalizePersistedPrimaryKeyGeneration = (value) => {
+	if (!value || typeof value !== "object" || Array.isArray(value)) return void 0;
+	const candidate = value;
+	if (candidate.strategy !== "uuid" || typeof candidate.column !== "string" || candidate.column.trim().length === 0) return void 0;
+	return {
+		column: candidate.column,
+		strategy: "uuid",
+		prismaDefault: typeof candidate.prismaDefault === "string" && candidate.prismaDefault.trim().length > 0 ? candidate.prismaDefault : void 0,
+		databaseDefault: typeof candidate.databaseDefault === "string" && candidate.databaseDefault.trim().length > 0 ? candidate.databaseDefault : void 0,
+		runtimeFactory: candidate.runtimeFactory === "uuid" ? "uuid" : void 0
 	};
 };
 const normalizePersistedColumnMappingsState = (state) => {
@@ -2587,7 +2622,7 @@ const normalizePersistedColumnMappingsState = (state) => {
 		tables: Object.entries(state?.tables ?? {}).reduce((all, [tableName, tableMetadata]) => {
 			if (tableName.trim().length === 0) return all;
 			const normalized = normalizePersistedTableMetadata(tableMetadata);
-			if (Object.keys(normalized.columns).length > 0 || Object.keys(normalized.enums).length > 0) all[tableName] = normalized;
+			if (Object.keys(normalized.columns).length > 0 || Object.keys(normalized.enums).length > 0 || normalized.primaryKeyGeneration) all[tableName] = normalized;
 			return all;
 		}, {})
 	};
@@ -2658,7 +2693,8 @@ const getPersistedTableMetadata = (table, options = {}) => {
 		enums: Object.entries(metadata.enums).reduce((all, [columnName, values]) => {
 			all[columnName] = [...values];
 			return all;
-		}, {})
+		}, {}),
+		primaryKeyGeneration: metadata.primaryKeyGeneration ? { ...metadata.primaryKeyGeneration } : void 0
 	};
 };
 const getPersistedColumnMap = (table, options = {}) => {
@@ -2667,6 +2703,9 @@ const getPersistedColumnMap = (table, options = {}) => {
 const getPersistedEnumMap = (table, options = {}) => {
 	return getPersistedTableMetadata(table, options).enums;
 };
+const getPersistedPrimaryKeyGeneration = (table, options = {}) => {
+	return getPersistedTableMetadata(table, options).primaryKeyGeneration;
+};
 const applyMappedColumn = (tableColumns, column, features, table) => {
 	if (typeof column.map === "string" && column.map.trim().length > 0 && column.map !== column.name) {
 		if (!features.persistedColumnMappings) throw buildPersistedFeatureDisabledError("persistedColumnMappings", table);
@@ -2690,6 +2729,17 @@ const removePersistedColumnMetadata = (tableMetadata, columnName) => {
 	Object.entries(tableMetadata.columns).forEach(([attribute, mappedColumn]) => {
 		if (mappedColumn === columnName) delete tableMetadata.columns[attribute];
 	});
+	if (tableMetadata.primaryKeyGeneration?.column === columnName) delete tableMetadata.primaryKeyGeneration;
+};
+const applyPrimaryKeyGeneration = (tableMetadata, column) => {
+	if (!column.primary || !column.primaryKeyGeneration) {
+		if (tableMetadata.primaryKeyGeneration?.column === column.name) delete tableMetadata.primaryKeyGeneration;
+		return;
+	}
+	tableMetadata.primaryKeyGeneration = {
+		column: column.name,
+		...column.primaryKeyGeneration
+	};
 };
 const applyOperationsToPersistedColumnMappingsState = (state, operations, features = resolvePersistedMetadataFeatures()) => {
 	const nextTables = Object.entries(state.tables).reduce((all, [table, metadata]) => {
@@ -2698,7 +2748,8 @@ const applyOperationsToPersistedColumnMappingsState = (state, operations, featur
 			enums: Object.entries(metadata.enums).reduce((nextEnums, [columnName, values]) => {
 				nextEnums[columnName] = [...values];
 				return nextEnums;
-			}, {})
+			}, {}),
+			primaryKeyGeneration: metadata.primaryKeyGeneration ? { ...metadata.primaryKeyGeneration } : void 0
 		};
 		return all;
 	}, {});
@@ -2711,8 +2762,9 @@ const applyOperationsToPersistedColumnMappingsState = (state, operations, featur
 			operation.columns.forEach((column) => {
 				applyMappedColumn(tableMetadata.columns, column, features, operation.table);
 				applyEnumColumn(tableMetadata.enums, column, features, operation.table);
+				applyPrimaryKeyGeneration(tableMetadata, column);
 			});
-			if (Object.keys(tableMetadata.columns).length > 0 || Object.keys(tableMetadata.enums).length > 0) nextTables[operation.table] = tableMetadata;
+			if (Object.keys(tableMetadata.columns).length > 0 || Object.keys(tableMetadata.enums).length > 0 || tableMetadata.primaryKeyGeneration) nextTables[operation.table] = tableMetadata;
 			else delete nextTables[operation.table];
 			return;
 		}
@@ -2724,11 +2776,12 @@ const applyOperationsToPersistedColumnMappingsState = (state, operations, featur
 			operation.addColumns.forEach((column) => {
 				applyMappedColumn(tableMetadata.columns, column, features, operation.table);
 				applyEnumColumn(tableMetadata.enums, column, features, operation.table);
+				applyPrimaryKeyGeneration(tableMetadata, column);
 			});
 			operation.dropColumns.forEach((columnName) => {
 				removePersistedColumnMetadata(tableMetadata, columnName);
 			});
-			if (Object.keys(tableMetadata.columns).length > 0 || Object.keys(tableMetadata.enums).length > 0) nextTables[operation.table] = tableMetadata;
+			if (Object.keys(tableMetadata.columns).length > 0 || Object.keys(tableMetadata.enums).length > 0 || tableMetadata.primaryKeyGeneration) nextTables[operation.table] = tableMetadata;
 			else delete nextTables[operation.table];
 			return;
 		}
@@ -4164,21 +4217,30 @@ var CliApp = class {
 			skipped
 		};
 	}
-	applyPersistedEnumMetadata(structure) {
-		const persistedEnums = getPersistedEnumMap(structure.table, {
+	applyPersistedFieldMetadata(structure) {
+		const persistedMetadata = getPersistedTableMetadata(structure.table, {
 			features: resolvePersistedMetadataFeatures(this.getConfig("features")),
 			strict: true
 		});
-		if (Object.keys(persistedEnums).length === 0) return structure;
+		if (Object.keys(persistedMetadata.columns).length === 0 && Object.keys(persistedMetadata.enums).length === 0) return structure;
+		const attributesByColumn = Object.entries(persistedMetadata.columns).reduce((all, [attribute, column]) => {
+			all[column] = attribute;
+			return all;
+		}, {});
 		return {
 			...structure,
 			fields: structure.fields.map((field) => {
-				const enumValues = persistedEnums[field.name];
-				if (!enumValues || enumValues.length === 0) return field;
+				const logicalName = attributesByColumn[field.name] ?? field.name;
+				const enumValues = persistedMetadata.enums[logicalName] ?? persistedMetadata.enums[field.name];
+				if (!enumValues || enumValues.length === 0) return {
+					...field,
+					name: logicalName
+				};
 				const enumType = getPersistedEnumTsType(enumValues);
 				const isArray = /^Array<.+>$/.test(field.type);
 				return {
 					...field,
+					name: logicalName,
 					type: isArray ? `Array<${enumType}>` : enumType
 				};
 			})
@@ -4343,7 +4405,7 @@ var CliApp = class {
 			}, /* @__PURE__ */ new Map());
 			const discovered = await adapter.introspectModels({ tables: [...new Set([...sources.values()].map((source) => source.table))] });
 			const structuresByTable = new Map(discovered.map((model) => {
-				const enriched = this.applyPersistedEnumMetadata(model);
+				const enriched = this.applyPersistedFieldMetadata(model);
 				return [enriched.table, enriched];
 			}));
 			const result = this.syncModelFiles(modelFiles, (filePath) => {
@@ -7628,7 +7690,8 @@ var QueryBuilder = class QueryBuilder {
 	* @returns 
 	*/
 	async create(data) {
-		const created = await this.executeInsertRow(data);
+		const [payload] = this.normalizeInsertPayloads(data);
+		const created = await this.executeInsertRow(payload);
 		return this.model.hydrate(created);
 	}
 	/**
@@ -7639,7 +7702,8 @@ var QueryBuilder = class QueryBuilder {
 	*/
 	async createMany(values) {
 		if (values.length === 0) return [];
-		return await Promise.all(values.map(async (value) => await this.create(value)));
+		const payloads = this.normalizeInsertPayloads(values);
+		return await Promise.all(payloads.map(async (value) => await this.create(value)));
 	}
 	/**
 	* Insert one or more records.
@@ -7903,8 +7967,17 @@ var QueryBuilder = class QueryBuilder {
 		return !await this.exists();
 	}
 	normalizeInsertPayloads(values) {
-		if (Array.isArray(values)) return values;
-		return [values];
+		const payloads = Array.isArray(values) ? values : [values];
+		const metadata = this.model.getModelMetadata();
+		return payloads.map((payload) => {
+			const nextPayload = { ...payload };
+			const primaryKeyValue = nextPayload[metadata.primaryKey];
+			if (primaryKeyValue !== void 0 && primaryKeyValue !== null) return nextPayload;
+			const generated = PrimaryKeyGenerationPlanner.generate(metadata.primaryKeyGeneration);
+			if (generated === void 0) return nextPayload;
+			nextPayload[metadata.primaryKey] = generated;
+			return nextPayload;
+		});
 	}
 	resolveAffectedCount(result, fallback) {
 		if (typeof result === "number") return result;
@@ -8147,6 +8220,7 @@ var QueryBuilder = class QueryBuilder {
 			modelName: this.model.name,
 			table: metadata.table,
 			primaryKey: metadata.primaryKey,
+			primaryKeyGeneration: metadata.primaryKeyGeneration,
 			columns: metadata.columns,
 			softDelete: metadata.softDelete
 		};
@@ -8959,10 +9033,10 @@ var Model = class Model {
 		const adapter = this.getAdapter();
 		const shouldStrictlyValidatePersistedMappings = Boolean(adapter) && !(adapter instanceof PrismaDatabaseAdapter);
 		return {
-			...getPersistedColumnMap(this.getTable(), {
+			...getPersistedTableMetadata(this.getTable(), {
 				features: resolvePersistedMetadataFeatures(getUserConfig("features")),
 				strict: shouldStrictlyValidatePersistedMappings
-			}),
+			}).columns,
 			...this.columns
 		};
 	}
@@ -8970,11 +9044,26 @@ var Model = class Model {
 		return this.getColumnMap()[attribute] ?? attribute;
 	}
 	static getModelMetadata() {
+		const adapter = this.getAdapter();
+		const shouldStrictlyValidatePersistedMappings = Boolean(adapter) && !(adapter instanceof PrismaDatabaseAdapter);
+		const persistedMetadata = getPersistedTableMetadata(this.getTable(), {
+			features: resolvePersistedMetadataFeatures(getUserConfig("features")),
+			strict: shouldStrictlyValidatePersistedMappings
+		});
 		return {
 			table: this.getTable(),
 			primaryKey: this.getPrimaryKey(),
-			columns: this.getColumnMap(),
-			softDelete: this.getSoftDeleteConfig()
+			columns: {
+				...persistedMetadata.columns,
+				...this.columns
+			},
+			softDelete: this.getSoftDeleteConfig(),
+			primaryKeyGeneration: persistedMetadata.primaryKeyGeneration?.column === this.getPrimaryKey() ? {
+				strategy: persistedMetadata.primaryKeyGeneration.strategy,
+				prismaDefault: persistedMetadata.primaryKeyGeneration.prismaDefault,
+				databaseDefault: persistedMetadata.primaryKeyGeneration.databaseDefault,
+				runtimeFactory: persistedMetadata.primaryKeyGeneration.runtimeFactory
+			} : void 0
 		};
 	}
 	static getRelationMetadata(name) {
@@ -9976,4 +10065,4 @@ var Model = class Model {
 };
 
 //#endregion
-export { ArkormCollection, ArkormException, Attribute, CliApp, EnumBuilder, ForeignKeyBuilder, InitCommand, InlineFactory, KyselyDatabaseAdapter, LengthAwarePaginator, MIGRATION_BRAND, MakeFactoryCommand, MakeMigrationCommand, MakeModelCommand, MakeSeederCommand, MigrateCommand, MigrateFreshCommand, MigrateRollbackCommand, Migration, MigrationHistoryCommand, MissingDelegateException, Model, ModelFactory, ModelNotFoundException, ModelsSyncCommand, PRISMA_ENUM_MEMBER_REGEX, PRISMA_ENUM_REGEX, PRISMA_MODEL_REGEX, Paginator, PrismaDatabaseAdapter, QueryBuilder, QueryConstraintException, RelationResolutionException, RuntimeModuleLoader, SEEDER_BRAND, SchemaBuilder, ScopeNotDefinedException, SeedCommand, Seeder, TableBuilder, URLDriver, UniqueConstraintResolutionException, UnsupportedAdapterFeatureException, applyAlterTableOperation, applyCreateTableOperation, applyDropTableOperation, applyMigrationRollbackToDatabase, applyMigrationRollbackToPrismaSchema, applyMigrationToDatabase, applyMigrationToPrismaSchema, applyOperationsToPersistedColumnMappingsState, applyOperationsToPrismaSchema, bindAdapterToModels, buildEnumBlock, buildFieldLine, buildIndexLine, buildInverseRelationLine, buildMigrationIdentity, buildMigrationRunId, buildMigrationSource, buildModelBlock, buildRelationLine, computeMigrationChecksum, configureArkormRuntime, createEmptyAppliedMigrationsState, createEmptyPersistedColumnMappingsState, createKyselyAdapter, createMigrationTimestamp, createPrismaAdapter, createPrismaCompatibilityAdapter, createPrismaDatabaseAdapter, createPrismaDelegateMap, defineConfig, defineFactory, deleteAppliedMigrationsStateFromStore, deletePersistedColumnMappingsState, deriveCollectionFieldName, deriveInverseRelationAlias, deriveRelationAlias, deriveRelationFieldName, deriveSingularFieldName, ensureArkormConfigLoading, escapeRegex, findAppliedMigration, findEnumBlock, findModelBlock, formatDefaultValue, formatEnumDefaultValue, formatRelationAction, generateMigrationFile, getActiveTransactionClient, getDefaultStubsPath, getLastMigrationRun, getLatestAppliedMigrations, getMigrationPlan, getPersistedColumnMap, getPersistedEnumMap, getPersistedEnumTsType, getPersistedTableMetadata, getRuntimeAdapter, getRuntimePaginationCurrentPageResolver, getRuntimePaginationURLDriverFactory, getRuntimePrismaClient, getUserConfig, inferDelegateName, isDelegateLike, isMigrationApplied, isTransactionCapableClient, loadArkormConfig, markMigrationApplied, markMigrationRun, pad, readAppliedMigrationsState, readAppliedMigrationsStateFromStore, readPersistedColumnMappingsState, rebuildPersistedColumnMappingsState, removeAppliedMigration, resetArkormRuntimeForTests, resetPersistedColumnMappingsCache, resolveCast, resolveColumnMappingsFilePath, resolveEnumName, resolveMigrationClassName, resolveMigrationStateFilePath, resolvePersistedMetadataFeatures, resolvePrismaType, runArkormTransaction, runMigrationWithPrisma, runPrismaCommand, stripPrismaSchemaModelsAndEnums, supportsDatabaseMigrationExecution, supportsDatabaseMigrationState, supportsDatabaseReset, syncPersistedColumnMappingsFromState, toMigrationFileSlug, toModelName, validatePersistedMetadataFeaturesForMigrations, writeAppliedMigrationsState, writeAppliedMigrationsStateToStore, writePersistedColumnMappingsState };
+export { ArkormCollection, ArkormException, Attribute, CliApp, EnumBuilder, ForeignKeyBuilder, InitCommand, InlineFactory, KyselyDatabaseAdapter, LengthAwarePaginator, MIGRATION_BRAND, MakeFactoryCommand, MakeMigrationCommand, MakeModelCommand, MakeSeederCommand, MigrateCommand, MigrateFreshCommand, MigrateRollbackCommand, Migration, MigrationHistoryCommand, MissingDelegateException, Model, ModelFactory, ModelNotFoundException, ModelsSyncCommand, PRISMA_ENUM_MEMBER_REGEX, PRISMA_ENUM_REGEX, PRISMA_MODEL_REGEX, Paginator, PrimaryKeyGenerationPlanner, PrismaDatabaseAdapter, QueryBuilder, QueryConstraintException, RelationResolutionException, RuntimeModuleLoader, SEEDER_BRAND, SchemaBuilder, ScopeNotDefinedException, SeedCommand, Seeder, TableBuilder, URLDriver, UniqueConstraintResolutionException, UnsupportedAdapterFeatureException, applyAlterTableOperation, applyCreateTableOperation, applyDropTableOperation, applyMigrationRollbackToDatabase, applyMigrationRollbackToPrismaSchema, applyMigrationToDatabase, applyMigrationToPrismaSchema, applyOperationsToPersistedColumnMappingsState, applyOperationsToPrismaSchema, bindAdapterToModels, buildEnumBlock, buildFieldLine, buildIndexLine, buildInverseRelationLine, buildMigrationIdentity, buildMigrationRunId, buildMigrationSource, buildModelBlock, buildRelationLine, computeMigrationChecksum, configureArkormRuntime, createEmptyAppliedMigrationsState, createEmptyPersistedColumnMappingsState, createKyselyAdapter, createMigrationTimestamp, createPrismaAdapter, createPrismaCompatibilityAdapter, createPrismaDatabaseAdapter, createPrismaDelegateMap, defineConfig, defineFactory, deleteAppliedMigrationsStateFromStore, deletePersistedColumnMappingsState, deriveCollectionFieldName, deriveInverseRelationAlias, deriveRelationAlias, deriveRelationFieldName, deriveSingularFieldName, ensureArkormConfigLoading, escapeRegex, findAppliedMigration, findEnumBlock, findModelBlock, formatDefaultValue, formatEnumDefaultValue, formatRelationAction, generateMigrationFile, getActiveTransactionClient, getDefaultStubsPath, getLastMigrationRun, getLatestAppliedMigrations, getMigrationPlan, getPersistedColumnMap, getPersistedEnumMap, getPersistedEnumTsType, getPersistedPrimaryKeyGeneration, getPersistedTableMetadata, getRuntimeAdapter, getRuntimePaginationCurrentPageResolver, getRuntimePaginationURLDriverFactory, getRuntimePrismaClient, getUserConfig, inferDelegateName, isDelegateLike, isMigrationApplied, isTransactionCapableClient, loadArkormConfig, markMigrationApplied, markMigrationRun, pad, readAppliedMigrationsState, readAppliedMigrationsStateFromStore, readPersistedColumnMappingsState, rebuildPersistedColumnMappingsState, removeAppliedMigration, resetArkormRuntimeForTests, resetPersistedColumnMappingsCache, resolveCast, resolveColumnMappingsFilePath, resolveEnumName, resolveMigrationClassName, resolveMigrationStateFilePath, resolvePersistedMetadataFeatures, resolvePrismaType, runArkormTransaction, runMigrationWithPrisma, runPrismaCommand, stripPrismaSchemaModelsAndEnums, supportsDatabaseMigrationExecution, supportsDatabaseMigrationState, supportsDatabaseReset, syncPersistedColumnMappingsFromState, toMigrationFileSlug, toModelName, validatePersistedMetadataFeaturesForMigrations, writeAppliedMigrationsState, writeAppliedMigrationsStateToStore, writePersistedColumnMappingsState };

package/package.json

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