arkormx 1.2.0 → 1.2.1

package/dist/cli.mjs

@@ -549,7 +549,7 @@ var TableBuilder = class {
 	*/
 	foreign(column) {
 		const columnName = this.resolveColumn(column).name;
-		return this.foreignKey(columnName + (column ? "" : "Id"));
+		return this.foreignKey(column ?? columnName);
 	}
 	/**
 	* Returns a deep copy of the defined columns for the table.
@@ -967,24 +967,23 @@ const deriveRelationFieldName = (columnName) => {
 	if (trimmed.endsWith("_id") && trimmed.length > 3) return trimmed.slice(0, -3).replace(/_([a-zA-Z0-9])/g, (_, letter) => letter.toUpperCase());
 	return `${trimmed.charAt(0).toLowerCase()}${trimmed.slice(1)}`;
 };
-const pascalWords = (value) => {
-	return value.match(/[A-Z][a-z0-9]*/g) ?? [value];
-};
 /**
-* Derive a relation name for the inverse side of a relation based on the 
+* Derive a relation name for both sides of a relation based on the 
 * source and target model names, using an explicit alias if provided or a 
-* convention of combining the target model name with the last segment of 
-* the source model name.
+* convention of combining the full source model name with the target model name.
 * 
 * @param sourceModelName    The name of the source model in the relation.
 * @param targetModelName    The name of the target model in the relation.
-* @param explicitAlias      An optional explicit alias for the inverse relation.
-* @returns                  The derived or explicit inverse relation alias.
+* @param explicitAlias      An optional explicit alias for the relation.
+* @returns                  The derived or explicit relation alias.
 */
-const deriveInverseRelationAlias = (sourceModelName, targetModelName, explicitAlias) => {
+const deriveRelationAlias = (sourceModelName, targetModelName, explicitAlias) => {
 	if (explicitAlias && explicitAlias.trim().length > 0) return explicitAlias.trim();
-	const sourceWords = pascalWords(sourceModelName);
-	return `${sourceWords[sourceWords.length - 1] ?? sourceModelName}${targetModelName}`;
+	return [sourceModelName, targetModelName].sort((left, right) => left.localeCompare(right)).join("");
+};
+const deriveSingularFieldName = (modelName) => {
+	if (!modelName) return "item";
+	return `${modelName.charAt(0).toLowerCase()}${modelName.slice(1)}`;
 };
 const deriveCollectionFieldName = (modelName) => {
 	if (!modelName) return "items";
@@ -992,6 +991,12 @@ const deriveCollectionFieldName = (modelName) => {
 	if (camel.endsWith("s")) return `${camel}es`;
 	return `${camel}s`;
 };
+const resolveForeignKeyColumn = (columns, foreignKey) => {
+	return columns.find((column) => column.name === foreignKey.column);
+};
+const isOneToOneForeignKey = (column) => {
+	return Boolean(column?.unique || column?.primary);
+};
 /** 
 * Format a SchemaForeignKeyAction value as a Prisma onDelete action string.
 * 
@@ -1012,15 +1017,16 @@ const formatRelationAction = (action) => {
 * @param foreignKey    The foreign key definition to convert to a relation line.
 * @returns             The corresponding Prisma schema line for the relation field.
 */
-const buildRelationLine = (foreignKey) => {
+const buildRelationLine = (sourceModelName, foreignKey, columns = []) => {
 	if (!foreignKey.referencesTable.trim()) throw new ArkormException(`Foreign key [${foreignKey.column}] must define a referenced table.`);
 	if (!foreignKey.referencesColumn.trim()) throw new ArkormException(`Foreign key [${foreignKey.column}] must define a referenced column.`);
+	const sourceColumn = resolveForeignKeyColumn(columns, foreignKey);
 	const fieldName = foreignKey.fieldAlias?.trim() || deriveRelationFieldName(foreignKey.column);
 	const targetModel = toModelName(foreignKey.referencesTable);
-	const relationName = foreignKey.relationAlias?.trim();
-	const relationPrefix = relationName ? `@relation("${relationName.replace(/"/g, "\\\"")}", ` : "@relation(";
+	const relationName = deriveRelationAlias(sourceModelName, targetModel, foreignKey.relationAlias?.trim());
+	const optional = sourceColumn?.nullable ? "?" : "";
 	const onDelete = foreignKey.onDelete ? `, onDelete: ${formatRelationAction(foreignKey.onDelete)}` : "";
-	return `  ${fieldName} ${targetModel} ${relationPrefix}fields: [${foreignKey.column}], references: [${foreignKey.referencesColumn}]${onDelete})`;
+	return `  ${fieldName} ${targetModel}${optional} @relation("${relationName.replace(/"/g, "\\\"")}", fields: [${foreignKey.column}], references: [${foreignKey.referencesColumn}]${onDelete})`;
 };
 /**
 * Build a Prisma relation field line for the inverse side of a relation, based 
@@ -1032,8 +1038,11 @@ const buildRelationLine = (foreignKey) => {
 * @param foreignKey        The foreign key definition for the relation.
 * @returns                 The Prisma schema line for the inverse relation field.
 */
-const buildInverseRelationLine = (sourceModelName, targetModelName, foreignKey) => {
-	return `  ${deriveCollectionFieldName(sourceModelName)} ${sourceModelName}[] @relation("${deriveInverseRelationAlias(sourceModelName, targetModelName, foreignKey.inverseRelationAlias).replace(/"/g, "\\\"")}")`;
+const buildInverseRelationLine = (sourceModelName, targetModelName, foreignKey, columns = []) => {
+	const sourceColumn = resolveForeignKeyColumn(columns, foreignKey);
+	const fieldName = isOneToOneForeignKey(sourceColumn) ? deriveSingularFieldName(sourceModelName) : deriveCollectionFieldName(sourceModelName);
+	const relationName = deriveRelationAlias(sourceModelName, targetModelName, foreignKey.relationAlias?.trim());
+	return `  ${fieldName} ${isOneToOneForeignKey(sourceColumn) ? `${sourceModelName}?` : `${sourceModelName}[]`} @relation("${relationName.replace(/"/g, "\\\"")}")`;
 };
 /**
 * Inject a line into the body of a Prisma model block if it does not already 
@@ -1061,14 +1070,15 @@ const injectLineIntoModelBody = (bodyLines, line, exists) => {
 * @param foreignKeys An array of foreign key definitions to process.
 * @returns The updated Prisma schema string with inverse relations applied.
 */
-const applyInverseRelations = (schema, sourceModelName, foreignKeys) => {
+const applyInverseRelations = (schema, sourceModelName, foreignKeys, columns = []) => {
 	let nextSchema = schema;
 	for (const foreignKey of foreignKeys) {
 		const targetModel = findModelBlock(nextSchema, foreignKey.referencesTable);
 		if (!targetModel) continue;
-		const inverseLine = buildInverseRelationLine(sourceModelName, targetModel.modelName, foreignKey);
+		const sourceColumn = resolveForeignKeyColumn(columns, foreignKey);
+		const inverseLine = buildInverseRelationLine(sourceModelName, targetModel.modelName, foreignKey, columns);
 		const targetBodyLines = targetModel.block.split("\n");
-		const fieldName = deriveCollectionFieldName(sourceModelName);
+		const fieldName = isOneToOneForeignKey(sourceColumn) ? deriveSingularFieldName(sourceModelName) : deriveCollectionFieldName(sourceModelName);
 		const fieldRegex = new RegExp(`^\\s*${escapeRegex(fieldName)}\\s+`);
 		injectLineIntoModelBody(targetBodyLines, inverseLine, (line) => fieldRegex.test(line));
 		const updatedTarget = targetBodyLines.join("\n");
@@ -1087,7 +1097,7 @@ const buildModelBlock = (operation) => {
 	const modelName = toModelName(operation.table);
 	const mapped = operation.table !== modelName.toLowerCase();
 	const fields = operation.columns.map(buildFieldLine);
-	const relations = (operation.foreignKeys ?? []).map(buildRelationLine);
+	const relations = (operation.foreignKeys ?? []).map((foreignKey) => buildRelationLine(modelName, foreignKey, operation.columns));
 	const metadata = [...(operation.indexes ?? []).map(buildIndexLine), ...mapped ? [`  @@map("${str(operation.table).snake()}")`] : []];
 	return `model ${modelName} {\n${(metadata.length > 0 ? [
 		...fields,
@@ -1145,7 +1155,7 @@ const applyCreateTableOperation = (schema, operation) => {
 	if (findModelBlock(schema, operation.table)) throw new ArkormException(`Prisma model for table [${operation.table}] already exists.`);
 	const schemaWithEnums = ensureEnumBlocks(schema, operation.columns);
 	const block = buildModelBlock(operation);
-	return applyInverseRelations(`${schemaWithEnums.trimEnd()}\n\n${block}\n`, toModelName(operation.table), operation.foreignKeys ?? []);
+	return applyInverseRelations(`${schemaWithEnums.trimEnd()}\n\n${block}\n`, toModelName(operation.table), operation.foreignKeys ?? [], operation.columns);
 };
 /**
 * Apply an alter table operation to a Prisma schema string, modifying the model 
@@ -1186,12 +1196,12 @@ const applyAlterTableOperation = (schema, operation) => {
 		bodyLines.splice(insertIndex, 0, indexLine);
 	});
 	for (const foreignKey of operation.addForeignKeys ?? []) {
-		const relationLine = buildRelationLine(foreignKey);
+		const relationLine = buildRelationLine(model.modelName, foreignKey, operation.addColumns);
 		const relationRegex = new RegExp(`^\\s*${escapeRegex(foreignKey.fieldAlias?.trim() || deriveRelationFieldName(foreignKey.column))}\\s+`);
 		injectLineIntoModelBody(bodyLines, relationLine, (line) => relationRegex.test(line));
 	}
 	block = bodyLines.join("\n");
-	return applyInverseRelations(`${schemaWithEnums.slice(0, refreshedModel.start)}${block}${schemaWithEnums.slice(refreshedModel.end)}`, model.modelName, operation.addForeignKeys ?? []);
+	return applyInverseRelations(`${schemaWithEnums.slice(0, refreshedModel.start)}${block}${schemaWithEnums.slice(refreshedModel.end)}`, model.modelName, operation.addForeignKeys ?? [], operation.addColumns);
 };
 /**
 * Apply a drop table operation to a Prisma schema string, removing the model block

package/dist/index.cjs

@@ -658,7 +658,7 @@ var TableBuilder = class {
 	*/
 	foreign(column) {
 		const columnName = this.resolveColumn(column).name;
-		return this.foreignKey(columnName + (column ? "" : "Id"));
+		return this.foreignKey(column ?? columnName);
 	}
 	/**
 	* Returns a deep copy of the defined columns for the table.
@@ -1076,24 +1076,24 @@ const deriveRelationFieldName = (columnName) => {
 	if (trimmed.endsWith("_id") && trimmed.length > 3) return trimmed.slice(0, -3).replace(/_([a-zA-Z0-9])/g, (_, letter) => letter.toUpperCase());
 	return `${trimmed.charAt(0).toLowerCase()}${trimmed.slice(1)}`;
 };
-const pascalWords = (value) => {
-	return value.match(/[A-Z][a-z0-9]*/g) ?? [value];
-};
 /**
-* Derive a relation name for the inverse side of a relation based on the 
+* Derive a relation name for both sides of a relation based on the 
 * source and target model names, using an explicit alias if provided or a 
-* convention of combining the target model name with the last segment of 
-* the source model name.
+* convention of combining the full source model name with the target model name.
 * 
 * @param sourceModelName    The name of the source model in the relation.
 * @param targetModelName    The name of the target model in the relation.
-* @param explicitAlias      An optional explicit alias for the inverse relation.
-* @returns                  The derived or explicit inverse relation alias.
+* @param explicitAlias      An optional explicit alias for the relation.
+* @returns                  The derived or explicit relation alias.
 */
-const deriveInverseRelationAlias = (sourceModelName, targetModelName, explicitAlias) => {
+const deriveRelationAlias = (sourceModelName, targetModelName, explicitAlias) => {
 	if (explicitAlias && explicitAlias.trim().length > 0) return explicitAlias.trim();
-	const sourceWords = pascalWords(sourceModelName);
-	return `${sourceWords[sourceWords.length - 1] ?? sourceModelName}${targetModelName}`;
+	return [sourceModelName, targetModelName].sort((left, right) => left.localeCompare(right)).join("");
+};
+const deriveInverseRelationAlias = deriveRelationAlias;
+const deriveSingularFieldName = (modelName) => {
+	if (!modelName) return "item";
+	return `${modelName.charAt(0).toLowerCase()}${modelName.slice(1)}`;
 };
 const deriveCollectionFieldName = (modelName) => {
 	if (!modelName) return "items";
@@ -1101,6 +1101,12 @@ const deriveCollectionFieldName = (modelName) => {
 	if (camel.endsWith("s")) return `${camel}es`;
 	return `${camel}s`;
 };
+const resolveForeignKeyColumn = (columns, foreignKey) => {
+	return columns.find((column) => column.name === foreignKey.column);
+};
+const isOneToOneForeignKey = (column) => {
+	return Boolean(column?.unique || column?.primary);
+};
 /** 
 * Format a SchemaForeignKeyAction value as a Prisma onDelete action string.
 * 
@@ -1121,15 +1127,16 @@ const formatRelationAction = (action) => {
 * @param foreignKey    The foreign key definition to convert to a relation line.
 * @returns             The corresponding Prisma schema line for the relation field.
 */
-const buildRelationLine = (foreignKey) => {
+const buildRelationLine = (sourceModelName, foreignKey, columns = []) => {
 	if (!foreignKey.referencesTable.trim()) throw new ArkormException(`Foreign key [${foreignKey.column}] must define a referenced table.`);
 	if (!foreignKey.referencesColumn.trim()) throw new ArkormException(`Foreign key [${foreignKey.column}] must define a referenced column.`);
+	const sourceColumn = resolveForeignKeyColumn(columns, foreignKey);
 	const fieldName = foreignKey.fieldAlias?.trim() || deriveRelationFieldName(foreignKey.column);
 	const targetModel = toModelName(foreignKey.referencesTable);
-	const relationName = foreignKey.relationAlias?.trim();
-	const relationPrefix = relationName ? `@relation("${relationName.replace(/"/g, "\\\"")}", ` : "@relation(";
+	const relationName = deriveRelationAlias(sourceModelName, targetModel, foreignKey.relationAlias?.trim());
+	const optional = sourceColumn?.nullable ? "?" : "";
 	const onDelete = foreignKey.onDelete ? `, onDelete: ${formatRelationAction(foreignKey.onDelete)}` : "";
-	return `  ${fieldName} ${targetModel} ${relationPrefix}fields: [${foreignKey.column}], references: [${foreignKey.referencesColumn}]${onDelete})`;
+	return `  ${fieldName} ${targetModel}${optional} @relation("${relationName.replace(/"/g, "\\\"")}", fields: [${foreignKey.column}], references: [${foreignKey.referencesColumn}]${onDelete})`;
 };
 /**
 * Build a Prisma relation field line for the inverse side of a relation, based 
@@ -1141,8 +1148,11 @@ const buildRelationLine = (foreignKey) => {
 * @param foreignKey        The foreign key definition for the relation.
 * @returns                 The Prisma schema line for the inverse relation field.
 */
-const buildInverseRelationLine = (sourceModelName, targetModelName, foreignKey) => {
-	return `  ${deriveCollectionFieldName(sourceModelName)} ${sourceModelName}[] @relation("${deriveInverseRelationAlias(sourceModelName, targetModelName, foreignKey.inverseRelationAlias).replace(/"/g, "\\\"")}")`;
+const buildInverseRelationLine = (sourceModelName, targetModelName, foreignKey, columns = []) => {
+	const sourceColumn = resolveForeignKeyColumn(columns, foreignKey);
+	const fieldName = isOneToOneForeignKey(sourceColumn) ? deriveSingularFieldName(sourceModelName) : deriveCollectionFieldName(sourceModelName);
+	const relationName = deriveRelationAlias(sourceModelName, targetModelName, foreignKey.relationAlias?.trim());
+	return `  ${fieldName} ${isOneToOneForeignKey(sourceColumn) ? `${sourceModelName}?` : `${sourceModelName}[]`} @relation("${relationName.replace(/"/g, "\\\"")}")`;
 };
 /**
 * Inject a line into the body of a Prisma model block if it does not already 
@@ -1170,14 +1180,15 @@ const injectLineIntoModelBody = (bodyLines, line, exists) => {
 * @param foreignKeys An array of foreign key definitions to process.
 * @returns The updated Prisma schema string with inverse relations applied.
 */
-const applyInverseRelations = (schema, sourceModelName, foreignKeys) => {
+const applyInverseRelations = (schema, sourceModelName, foreignKeys, columns = []) => {
 	let nextSchema = schema;
 	for (const foreignKey of foreignKeys) {
 		const targetModel = findModelBlock(nextSchema, foreignKey.referencesTable);
 		if (!targetModel) continue;
-		const inverseLine = buildInverseRelationLine(sourceModelName, targetModel.modelName, foreignKey);
+		const sourceColumn = resolveForeignKeyColumn(columns, foreignKey);
+		const inverseLine = buildInverseRelationLine(sourceModelName, targetModel.modelName, foreignKey, columns);
 		const targetBodyLines = targetModel.block.split("\n");
-		const fieldName = deriveCollectionFieldName(sourceModelName);
+		const fieldName = isOneToOneForeignKey(sourceColumn) ? deriveSingularFieldName(sourceModelName) : deriveCollectionFieldName(sourceModelName);
 		const fieldRegex = new RegExp(`^\\s*${escapeRegex(fieldName)}\\s+`);
 		injectLineIntoModelBody(targetBodyLines, inverseLine, (line) => fieldRegex.test(line));
 		const updatedTarget = targetBodyLines.join("\n");
@@ -1196,7 +1207,7 @@ const buildModelBlock = (operation) => {
 	const modelName = toModelName(operation.table);
 	const mapped = operation.table !== modelName.toLowerCase();
 	const fields = operation.columns.map(buildFieldLine);
-	const relations = (operation.foreignKeys ?? []).map(buildRelationLine);
+	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()}")`] : []];
 	return `model ${modelName} {\n${(metadata.length > 0 ? [
 		...fields,
@@ -1254,7 +1265,7 @@ const applyCreateTableOperation = (schema, operation) => {
 	if (findModelBlock(schema, operation.table)) throw new ArkormException(`Prisma model for table [${operation.table}] already exists.`);
 	const schemaWithEnums = ensureEnumBlocks(schema, operation.columns);
 	const block = buildModelBlock(operation);
-	return applyInverseRelations(`${schemaWithEnums.trimEnd()}\n\n${block}\n`, toModelName(operation.table), operation.foreignKeys ?? []);
+	return applyInverseRelations(`${schemaWithEnums.trimEnd()}\n\n${block}\n`, toModelName(operation.table), operation.foreignKeys ?? [], operation.columns);
 };
 /**
 * Apply an alter table operation to a Prisma schema string, modifying the model 
@@ -1295,12 +1306,12 @@ const applyAlterTableOperation = (schema, operation) => {
 		bodyLines.splice(insertIndex, 0, indexLine);
 	});
 	for (const foreignKey of operation.addForeignKeys ?? []) {
-		const relationLine = buildRelationLine(foreignKey);
+		const relationLine = buildRelationLine(model.modelName, foreignKey, operation.addColumns);
 		const relationRegex = new RegExp(`^\\s*${escapeRegex(foreignKey.fieldAlias?.trim() || deriveRelationFieldName(foreignKey.column))}\\s+`);
 		injectLineIntoModelBody(bodyLines, relationLine, (line) => relationRegex.test(line));
 	}
 	block = bodyLines.join("\n");
-	return applyInverseRelations(`${schemaWithEnums.slice(0, refreshedModel.start)}${block}${schemaWithEnums.slice(refreshedModel.end)}`, model.modelName, operation.addForeignKeys ?? []);
+	return applyInverseRelations(`${schemaWithEnums.slice(0, refreshedModel.start)}${block}${schemaWithEnums.slice(refreshedModel.end)}`, model.modelName, operation.addForeignKeys ?? [], operation.addColumns);
 };
 /**
 * Apply a drop table operation to a Prisma schema string, removing the model block
@@ -6468,7 +6479,9 @@ exports.defineConfig = defineConfig;
 exports.defineFactory = defineFactory;
 exports.deriveCollectionFieldName = deriveCollectionFieldName;
 exports.deriveInverseRelationAlias = deriveInverseRelationAlias;
+exports.deriveRelationAlias = deriveRelationAlias;
 exports.deriveRelationFieldName = deriveRelationFieldName;
+exports.deriveSingularFieldName = deriveSingularFieldName;
 exports.ensureArkormConfigLoading = ensureArkormConfigLoading;
 exports.escapeRegex = escapeRegex;
 exports.findAppliedMigration = findAppliedMigration;

package/dist/index.d.cts

@@ -3281,17 +3281,18 @@ declare const buildIndexLine: (index: SchemaIndex) => string;
  */
 declare const deriveRelationFieldName: (columnName: string) => string;
 /**
- * Derive a relation name for the inverse side of a relation based on the
+ * Derive a relation name for both sides of a relation based on the
  * source and target model names, using an explicit alias if provided or a
- * convention of combining the target model name with the last segment of
- * the source model name.
+ * convention of combining the full source model name with the target model name.
  *
  * @param sourceModelName    The name of the source model in the relation.
  * @param targetModelName    The name of the target model in the relation.
- * @param explicitAlias      An optional explicit alias for the inverse relation.
- * @returns                  The derived or explicit inverse relation alias.
+ * @param explicitAlias      An optional explicit alias for the relation.
+ * @returns                  The derived or explicit relation alias.
  */
+declare const deriveRelationAlias: (sourceModelName: string, targetModelName: string, explicitAlias?: string) => string;
 declare const deriveInverseRelationAlias: (sourceModelName: string, targetModelName: string, explicitAlias?: string) => string;
+declare const deriveSingularFieldName: (modelName: string) => string;
 declare const deriveCollectionFieldName: (modelName: string) => string;
 /**
  * Format a SchemaForeignKeyAction value as a Prisma onDelete action string.
@@ -3307,7 +3308,7 @@ declare const formatRelationAction: (action: SchemaForeignKeyAction) => string;
  * @param foreignKey    The foreign key definition to convert to a relation line.
  * @returns             The corresponding Prisma schema line for the relation field.
  */
-declare const buildRelationLine: (foreignKey: SchemaForeignKey) => string;
+declare const buildRelationLine: (sourceModelName: string, foreignKey: SchemaForeignKey, columns?: SchemaColumn[]) => string;
 /**
  * Build a Prisma relation field line for the inverse side of a relation, based
  * on the source and target model names and the foreign key definition, using
@@ -3318,7 +3319,7 @@ declare const buildRelationLine: (foreignKey: SchemaForeignKey) => string;
  * @param foreignKey        The foreign key definition for the relation.
  * @returns                 The Prisma schema line for the inverse relation field.
  */
-declare const buildInverseRelationLine: (sourceModelName: string, targetModelName: string, foreignKey: SchemaForeignKey) => string;
+declare const buildInverseRelationLine: (sourceModelName: string, targetModelName: string, foreignKey: SchemaForeignKey, columns?: SchemaColumn[]) => string;
 /**
  * Build a Prisma model block string based on a SchemaTableCreateOperation, including
  * all fields and any necessary mapping.
@@ -3598,4 +3599,4 @@ declare class URLDriver {
   url(page: number): string;
 }
 //#endregion
-export { ArkormCollection, ArkormErrorContext, ArkormException, Attribute, AttributeOptions, CliApp, EnumBuilder, ForeignKeyBuilder, InitCommand, InlineFactory, LengthAwarePaginator, MIGRATION_BRAND, MakeFactoryCommand, MakeMigrationCommand, MakeModelCommand, MakeSeederCommand, MigrateCommand, MigrateRollbackCommand, Migration, MigrationHistoryCommand, MissingDelegateException, Model, ModelFactory, ModelNotFoundException, ModelsSyncCommand, PRISMA_ENUM_MEMBER_REGEX, PRISMA_ENUM_REGEX, PRISMA_MODEL_REGEX, Paginator, PrismaDelegateMap, QueryBuilder, QueryConstraintException, RelationResolutionException, SEEDER_BRAND, SchemaBuilder, ScopeNotDefinedException, SeedCommand, Seeder, SeederCallArgument, SeederConstructor, SeederInput, TableBuilder, URLDriver, UniqueConstraintResolutionException, UnsupportedAdapterFeatureException, applyAlterTableOperation, applyCreateTableOperation, applyDropTableOperation, applyMigrationRollbackToPrismaSchema, applyMigrationToPrismaSchema, applyOperationsToPrismaSchema, buildEnumBlock, buildFieldLine, buildIndexLine, buildInverseRelationLine, buildMigrationIdentity, buildMigrationRunId, buildMigrationSource, buildModelBlock, buildRelationLine, computeMigrationChecksum, configureArkormRuntime, createMigrationTimestamp, createPrismaAdapter, createPrismaDelegateMap, defineConfig, defineFactory, deriveCollectionFieldName, deriveInverseRelationAlias, deriveRelationFieldName, ensureArkormConfigLoading, escapeRegex, findAppliedMigration, findEnumBlock, findModelBlock, formatDefaultValue, formatEnumDefaultValue, formatRelationAction, generateMigrationFile, getActiveTransactionClient, getDefaultStubsPath, getLastMigrationRun, getLatestAppliedMigrations, getMigrationPlan, getRuntimePaginationCurrentPageResolver, getRuntimePaginationURLDriverFactory, getRuntimePrismaClient, getUserConfig, inferDelegateName, isDelegateLike, isMigrationApplied, isTransactionCapableClient, loadArkormConfig, markMigrationApplied, markMigrationRun, pad, readAppliedMigrationsState, removeAppliedMigration, resetArkormRuntimeForTests, resolveCast, resolveEnumName, resolveMigrationClassName, resolveMigrationStateFilePath, resolvePrismaType, runArkormTransaction, runMigrationWithPrisma, runPrismaCommand, toMigrationFileSlug, toModelName, writeAppliedMigrationsState };
+export { ArkormCollection, ArkormErrorContext, ArkormException, Attribute, AttributeOptions, CliApp, EnumBuilder, ForeignKeyBuilder, InitCommand, InlineFactory, LengthAwarePaginator, MIGRATION_BRAND, MakeFactoryCommand, MakeMigrationCommand, MakeModelCommand, MakeSeederCommand, MigrateCommand, MigrateRollbackCommand, Migration, MigrationHistoryCommand, MissingDelegateException, Model, ModelFactory, ModelNotFoundException, ModelsSyncCommand, PRISMA_ENUM_MEMBER_REGEX, PRISMA_ENUM_REGEX, PRISMA_MODEL_REGEX, Paginator, PrismaDelegateMap, QueryBuilder, QueryConstraintException, RelationResolutionException, SEEDER_BRAND, SchemaBuilder, ScopeNotDefinedException, SeedCommand, Seeder, SeederCallArgument, SeederConstructor, SeederInput, TableBuilder, URLDriver, UniqueConstraintResolutionException, UnsupportedAdapterFeatureException, applyAlterTableOperation, applyCreateTableOperation, applyDropTableOperation, applyMigrationRollbackToPrismaSchema, applyMigrationToPrismaSchema, applyOperationsToPrismaSchema, buildEnumBlock, buildFieldLine, buildIndexLine, buildInverseRelationLine, buildMigrationIdentity, buildMigrationRunId, buildMigrationSource, buildModelBlock, buildRelationLine, computeMigrationChecksum, configureArkormRuntime, createMigrationTimestamp, createPrismaAdapter, createPrismaDelegateMap, defineConfig, defineFactory, deriveCollectionFieldName, deriveInverseRelationAlias, deriveRelationAlias, deriveRelationFieldName, deriveSingularFieldName, ensureArkormConfigLoading, escapeRegex, findAppliedMigration, findEnumBlock, findModelBlock, formatDefaultValue, formatEnumDefaultValue, formatRelationAction, generateMigrationFile, getActiveTransactionClient, getDefaultStubsPath, getLastMigrationRun, getLatestAppliedMigrations, getMigrationPlan, getRuntimePaginationCurrentPageResolver, getRuntimePaginationURLDriverFactory, getRuntimePrismaClient, getUserConfig, inferDelegateName, isDelegateLike, isMigrationApplied, isTransactionCapableClient, loadArkormConfig, markMigrationApplied, markMigrationRun, pad, readAppliedMigrationsState, removeAppliedMigration, resetArkormRuntimeForTests, resolveCast, resolveEnumName, resolveMigrationClassName, resolveMigrationStateFilePath, resolvePrismaType, runArkormTransaction, runMigrationWithPrisma, runPrismaCommand, toMigrationFileSlug, toModelName, writeAppliedMigrationsState };

package/dist/index.d.mts

@@ -3281,17 +3281,18 @@ declare const buildIndexLine: (index: SchemaIndex) => string;
  */
 declare const deriveRelationFieldName: (columnName: string) => string;
 /**
- * Derive a relation name for the inverse side of a relation based on the
+ * Derive a relation name for both sides of a relation based on the
  * source and target model names, using an explicit alias if provided or a
- * convention of combining the target model name with the last segment of
- * the source model name.
+ * convention of combining the full source model name with the target model name.
  *
  * @param sourceModelName    The name of the source model in the relation.
  * @param targetModelName    The name of the target model in the relation.
- * @param explicitAlias      An optional explicit alias for the inverse relation.
- * @returns                  The derived or explicit inverse relation alias.
+ * @param explicitAlias      An optional explicit alias for the relation.
+ * @returns                  The derived or explicit relation alias.
  */
+declare const deriveRelationAlias: (sourceModelName: string, targetModelName: string, explicitAlias?: string) => string;
 declare const deriveInverseRelationAlias: (sourceModelName: string, targetModelName: string, explicitAlias?: string) => string;
+declare const deriveSingularFieldName: (modelName: string) => string;
 declare const deriveCollectionFieldName: (modelName: string) => string;
 /**
  * Format a SchemaForeignKeyAction value as a Prisma onDelete action string.
@@ -3307,7 +3308,7 @@ declare const formatRelationAction: (action: SchemaForeignKeyAction) => string;
  * @param foreignKey    The foreign key definition to convert to a relation line.
  * @returns             The corresponding Prisma schema line for the relation field.
  */
-declare const buildRelationLine: (foreignKey: SchemaForeignKey) => string;
+declare const buildRelationLine: (sourceModelName: string, foreignKey: SchemaForeignKey, columns?: SchemaColumn[]) => string;
 /**
  * Build a Prisma relation field line for the inverse side of a relation, based
  * on the source and target model names and the foreign key definition, using
@@ -3318,7 +3319,7 @@ declare const buildRelationLine: (foreignKey: SchemaForeignKey) => string;
  * @param foreignKey        The foreign key definition for the relation.
  * @returns                 The Prisma schema line for the inverse relation field.
  */
-declare const buildInverseRelationLine: (sourceModelName: string, targetModelName: string, foreignKey: SchemaForeignKey) => string;
+declare const buildInverseRelationLine: (sourceModelName: string, targetModelName: string, foreignKey: SchemaForeignKey, columns?: SchemaColumn[]) => string;
 /**
  * Build a Prisma model block string based on a SchemaTableCreateOperation, including
  * all fields and any necessary mapping.
@@ -3598,4 +3599,4 @@ declare class URLDriver {
   url(page: number): string;
 }
 //#endregion
-export { ArkormCollection, ArkormErrorContext, ArkormException, Attribute, AttributeOptions, CliApp, EnumBuilder, ForeignKeyBuilder, InitCommand, InlineFactory, LengthAwarePaginator, MIGRATION_BRAND, MakeFactoryCommand, MakeMigrationCommand, MakeModelCommand, MakeSeederCommand, MigrateCommand, MigrateRollbackCommand, Migration, MigrationHistoryCommand, MissingDelegateException, Model, ModelFactory, ModelNotFoundException, ModelsSyncCommand, PRISMA_ENUM_MEMBER_REGEX, PRISMA_ENUM_REGEX, PRISMA_MODEL_REGEX, Paginator, PrismaDelegateMap, QueryBuilder, QueryConstraintException, RelationResolutionException, SEEDER_BRAND, SchemaBuilder, ScopeNotDefinedException, SeedCommand, Seeder, SeederCallArgument, SeederConstructor, SeederInput, TableBuilder, URLDriver, UniqueConstraintResolutionException, UnsupportedAdapterFeatureException, applyAlterTableOperation, applyCreateTableOperation, applyDropTableOperation, applyMigrationRollbackToPrismaSchema, applyMigrationToPrismaSchema, applyOperationsToPrismaSchema, buildEnumBlock, buildFieldLine, buildIndexLine, buildInverseRelationLine, buildMigrationIdentity, buildMigrationRunId, buildMigrationSource, buildModelBlock, buildRelationLine, computeMigrationChecksum, configureArkormRuntime, createMigrationTimestamp, createPrismaAdapter, createPrismaDelegateMap, defineConfig, defineFactory, deriveCollectionFieldName, deriveInverseRelationAlias, deriveRelationFieldName, ensureArkormConfigLoading, escapeRegex, findAppliedMigration, findEnumBlock, findModelBlock, formatDefaultValue, formatEnumDefaultValue, formatRelationAction, generateMigrationFile, getActiveTransactionClient, getDefaultStubsPath, getLastMigrationRun, getLatestAppliedMigrations, getMigrationPlan, getRuntimePaginationCurrentPageResolver, getRuntimePaginationURLDriverFactory, getRuntimePrismaClient, getUserConfig, inferDelegateName, isDelegateLike, isMigrationApplied, isTransactionCapableClient, loadArkormConfig, markMigrationApplied, markMigrationRun, pad, readAppliedMigrationsState, removeAppliedMigration, resetArkormRuntimeForTests, resolveCast, resolveEnumName, resolveMigrationClassName, resolveMigrationStateFilePath, resolvePrismaType, runArkormTransaction, runMigrationWithPrisma, runPrismaCommand, toMigrationFileSlug, toModelName, writeAppliedMigrationsState };
+export { ArkormCollection, ArkormErrorContext, ArkormException, Attribute, AttributeOptions, CliApp, EnumBuilder, ForeignKeyBuilder, InitCommand, InlineFactory, LengthAwarePaginator, MIGRATION_BRAND, MakeFactoryCommand, MakeMigrationCommand, MakeModelCommand, MakeSeederCommand, MigrateCommand, MigrateRollbackCommand, Migration, MigrationHistoryCommand, MissingDelegateException, Model, ModelFactory, ModelNotFoundException, ModelsSyncCommand, PRISMA_ENUM_MEMBER_REGEX, PRISMA_ENUM_REGEX, PRISMA_MODEL_REGEX, Paginator, PrismaDelegateMap, QueryBuilder, QueryConstraintException, RelationResolutionException, SEEDER_BRAND, SchemaBuilder, ScopeNotDefinedException, SeedCommand, Seeder, SeederCallArgument, SeederConstructor, SeederInput, TableBuilder, URLDriver, UniqueConstraintResolutionException, UnsupportedAdapterFeatureException, applyAlterTableOperation, applyCreateTableOperation, applyDropTableOperation, applyMigrationRollbackToPrismaSchema, applyMigrationToPrismaSchema, applyOperationsToPrismaSchema, buildEnumBlock, buildFieldLine, buildIndexLine, buildInverseRelationLine, buildMigrationIdentity, buildMigrationRunId, buildMigrationSource, buildModelBlock, buildRelationLine, computeMigrationChecksum, configureArkormRuntime, createMigrationTimestamp, createPrismaAdapter, createPrismaDelegateMap, defineConfig, defineFactory, deriveCollectionFieldName, deriveInverseRelationAlias, deriveRelationAlias, deriveRelationFieldName, deriveSingularFieldName, ensureArkormConfigLoading, escapeRegex, findAppliedMigration, findEnumBlock, findModelBlock, formatDefaultValue, formatEnumDefaultValue, formatRelationAction, generateMigrationFile, getActiveTransactionClient, getDefaultStubsPath, getLastMigrationRun, getLatestAppliedMigrations, getMigrationPlan, getRuntimePaginationCurrentPageResolver, getRuntimePaginationURLDriverFactory, getRuntimePrismaClient, getUserConfig, inferDelegateName, isDelegateLike, isMigrationApplied, isTransactionCapableClient, loadArkormConfig, markMigrationApplied, markMigrationRun, pad, readAppliedMigrationsState, removeAppliedMigration, resetArkormRuntimeForTests, resolveCast, resolveEnumName, resolveMigrationClassName, resolveMigrationStateFilePath, resolvePrismaType, runArkormTransaction, runMigrationWithPrisma, runPrismaCommand, toMigrationFileSlug, toModelName, writeAppliedMigrationsState };

package/dist/index.mjs

@@ -629,7 +629,7 @@ var TableBuilder = class {
 	*/
 	foreign(column) {
 		const columnName = this.resolveColumn(column).name;
-		return this.foreignKey(columnName + (column ? "" : "Id"));
+		return this.foreignKey(column ?? columnName);
 	}
 	/**
 	* Returns a deep copy of the defined columns for the table.
@@ -1047,24 +1047,24 @@ const deriveRelationFieldName = (columnName) => {
 	if (trimmed.endsWith("_id") && trimmed.length > 3) return trimmed.slice(0, -3).replace(/_([a-zA-Z0-9])/g, (_, letter) => letter.toUpperCase());
 	return `${trimmed.charAt(0).toLowerCase()}${trimmed.slice(1)}`;
 };
-const pascalWords = (value) => {
-	return value.match(/[A-Z][a-z0-9]*/g) ?? [value];
-};
 /**
-* Derive a relation name for the inverse side of a relation based on the 
+* Derive a relation name for both sides of a relation based on the 
 * source and target model names, using an explicit alias if provided or a 
-* convention of combining the target model name with the last segment of 
-* the source model name.
+* convention of combining the full source model name with the target model name.
 * 
 * @param sourceModelName    The name of the source model in the relation.
 * @param targetModelName    The name of the target model in the relation.
-* @param explicitAlias      An optional explicit alias for the inverse relation.
-* @returns                  The derived or explicit inverse relation alias.
+* @param explicitAlias      An optional explicit alias for the relation.
+* @returns                  The derived or explicit relation alias.
 */
-const deriveInverseRelationAlias = (sourceModelName, targetModelName, explicitAlias) => {
+const deriveRelationAlias = (sourceModelName, targetModelName, explicitAlias) => {
 	if (explicitAlias && explicitAlias.trim().length > 0) return explicitAlias.trim();
-	const sourceWords = pascalWords(sourceModelName);
-	return `${sourceWords[sourceWords.length - 1] ?? sourceModelName}${targetModelName}`;
+	return [sourceModelName, targetModelName].sort((left, right) => left.localeCompare(right)).join("");
+};
+const deriveInverseRelationAlias = deriveRelationAlias;
+const deriveSingularFieldName = (modelName) => {
+	if (!modelName) return "item";
+	return `${modelName.charAt(0).toLowerCase()}${modelName.slice(1)}`;
 };
 const deriveCollectionFieldName = (modelName) => {
 	if (!modelName) return "items";
@@ -1072,6 +1072,12 @@ const deriveCollectionFieldName = (modelName) => {
 	if (camel.endsWith("s")) return `${camel}es`;
 	return `${camel}s`;
 };
+const resolveForeignKeyColumn = (columns, foreignKey) => {
+	return columns.find((column) => column.name === foreignKey.column);
+};
+const isOneToOneForeignKey = (column) => {
+	return Boolean(column?.unique || column?.primary);
+};
 /** 
 * Format a SchemaForeignKeyAction value as a Prisma onDelete action string.
 * 
@@ -1092,15 +1098,16 @@ const formatRelationAction = (action) => {
 * @param foreignKey    The foreign key definition to convert to a relation line.
 * @returns             The corresponding Prisma schema line for the relation field.
 */
-const buildRelationLine = (foreignKey) => {
+const buildRelationLine = (sourceModelName, foreignKey, columns = []) => {
 	if (!foreignKey.referencesTable.trim()) throw new ArkormException(`Foreign key [${foreignKey.column}] must define a referenced table.`);
 	if (!foreignKey.referencesColumn.trim()) throw new ArkormException(`Foreign key [${foreignKey.column}] must define a referenced column.`);
+	const sourceColumn = resolveForeignKeyColumn(columns, foreignKey);
 	const fieldName = foreignKey.fieldAlias?.trim() || deriveRelationFieldName(foreignKey.column);
 	const targetModel = toModelName(foreignKey.referencesTable);
-	const relationName = foreignKey.relationAlias?.trim();
-	const relationPrefix = relationName ? `@relation("${relationName.replace(/"/g, "\\\"")}", ` : "@relation(";
+	const relationName = deriveRelationAlias(sourceModelName, targetModel, foreignKey.relationAlias?.trim());
+	const optional = sourceColumn?.nullable ? "?" : "";
 	const onDelete = foreignKey.onDelete ? `, onDelete: ${formatRelationAction(foreignKey.onDelete)}` : "";
-	return `  ${fieldName} ${targetModel} ${relationPrefix}fields: [${foreignKey.column}], references: [${foreignKey.referencesColumn}]${onDelete})`;
+	return `  ${fieldName} ${targetModel}${optional} @relation("${relationName.replace(/"/g, "\\\"")}", fields: [${foreignKey.column}], references: [${foreignKey.referencesColumn}]${onDelete})`;
 };
 /**
 * Build a Prisma relation field line for the inverse side of a relation, based 
@@ -1112,8 +1119,11 @@ const buildRelationLine = (foreignKey) => {
 * @param foreignKey        The foreign key definition for the relation.
 * @returns                 The Prisma schema line for the inverse relation field.
 */
-const buildInverseRelationLine = (sourceModelName, targetModelName, foreignKey) => {
-	return `  ${deriveCollectionFieldName(sourceModelName)} ${sourceModelName}[] @relation("${deriveInverseRelationAlias(sourceModelName, targetModelName, foreignKey.inverseRelationAlias).replace(/"/g, "\\\"")}")`;
+const buildInverseRelationLine = (sourceModelName, targetModelName, foreignKey, columns = []) => {
+	const sourceColumn = resolveForeignKeyColumn(columns, foreignKey);
+	const fieldName = isOneToOneForeignKey(sourceColumn) ? deriveSingularFieldName(sourceModelName) : deriveCollectionFieldName(sourceModelName);
+	const relationName = deriveRelationAlias(sourceModelName, targetModelName, foreignKey.relationAlias?.trim());
+	return `  ${fieldName} ${isOneToOneForeignKey(sourceColumn) ? `${sourceModelName}?` : `${sourceModelName}[]`} @relation("${relationName.replace(/"/g, "\\\"")}")`;
 };
 /**
 * Inject a line into the body of a Prisma model block if it does not already 
@@ -1141,14 +1151,15 @@ const injectLineIntoModelBody = (bodyLines, line, exists) => {
 * @param foreignKeys An array of foreign key definitions to process.
 * @returns The updated Prisma schema string with inverse relations applied.
 */
-const applyInverseRelations = (schema, sourceModelName, foreignKeys) => {
+const applyInverseRelations = (schema, sourceModelName, foreignKeys, columns = []) => {
 	let nextSchema = schema;
 	for (const foreignKey of foreignKeys) {
 		const targetModel = findModelBlock(nextSchema, foreignKey.referencesTable);
 		if (!targetModel) continue;
-		const inverseLine = buildInverseRelationLine(sourceModelName, targetModel.modelName, foreignKey);
+		const sourceColumn = resolveForeignKeyColumn(columns, foreignKey);
+		const inverseLine = buildInverseRelationLine(sourceModelName, targetModel.modelName, foreignKey, columns);
 		const targetBodyLines = targetModel.block.split("\n");
-		const fieldName = deriveCollectionFieldName(sourceModelName);
+		const fieldName = isOneToOneForeignKey(sourceColumn) ? deriveSingularFieldName(sourceModelName) : deriveCollectionFieldName(sourceModelName);
 		const fieldRegex = new RegExp(`^\\s*${escapeRegex(fieldName)}\\s+`);
 		injectLineIntoModelBody(targetBodyLines, inverseLine, (line) => fieldRegex.test(line));
 		const updatedTarget = targetBodyLines.join("\n");
@@ -1167,7 +1178,7 @@ const buildModelBlock = (operation) => {
 	const modelName = toModelName(operation.table);
 	const mapped = operation.table !== modelName.toLowerCase();
 	const fields = operation.columns.map(buildFieldLine);
-	const relations = (operation.foreignKeys ?? []).map(buildRelationLine);
+	const relations = (operation.foreignKeys ?? []).map((foreignKey) => buildRelationLine(modelName, foreignKey, operation.columns));
 	const metadata = [...(operation.indexes ?? []).map(buildIndexLine), ...mapped ? [`  @@map("${str(operation.table).snake()}")`] : []];
 	return `model ${modelName} {\n${(metadata.length > 0 ? [
 		...fields,
@@ -1225,7 +1236,7 @@ const applyCreateTableOperation = (schema, operation) => {
 	if (findModelBlock(schema, operation.table)) throw new ArkormException(`Prisma model for table [${operation.table}] already exists.`);
 	const schemaWithEnums = ensureEnumBlocks(schema, operation.columns);
 	const block = buildModelBlock(operation);
-	return applyInverseRelations(`${schemaWithEnums.trimEnd()}\n\n${block}\n`, toModelName(operation.table), operation.foreignKeys ?? []);
+	return applyInverseRelations(`${schemaWithEnums.trimEnd()}\n\n${block}\n`, toModelName(operation.table), operation.foreignKeys ?? [], operation.columns);
 };
 /**
 * Apply an alter table operation to a Prisma schema string, modifying the model 
@@ -1266,12 +1277,12 @@ const applyAlterTableOperation = (schema, operation) => {
 		bodyLines.splice(insertIndex, 0, indexLine);
 	});
 	for (const foreignKey of operation.addForeignKeys ?? []) {
-		const relationLine = buildRelationLine(foreignKey);
+		const relationLine = buildRelationLine(model.modelName, foreignKey, operation.addColumns);
 		const relationRegex = new RegExp(`^\\s*${escapeRegex(foreignKey.fieldAlias?.trim() || deriveRelationFieldName(foreignKey.column))}\\s+`);
 		injectLineIntoModelBody(bodyLines, relationLine, (line) => relationRegex.test(line));
 	}
 	block = bodyLines.join("\n");
-	return applyInverseRelations(`${schemaWithEnums.slice(0, refreshedModel.start)}${block}${schemaWithEnums.slice(refreshedModel.end)}`, model.modelName, operation.addForeignKeys ?? []);
+	return applyInverseRelations(`${schemaWithEnums.slice(0, refreshedModel.start)}${block}${schemaWithEnums.slice(refreshedModel.end)}`, model.modelName, operation.addForeignKeys ?? [], operation.addColumns);
 };
 /**
 * Apply a drop table operation to a Prisma schema string, removing the model block
@@ -6376,4 +6387,4 @@ var Model = class Model {
 };
 
 //#endregion
-export { ArkormCollection, ArkormException, Attribute, CliApp, EnumBuilder, ForeignKeyBuilder, InitCommand, InlineFactory, LengthAwarePaginator, MIGRATION_BRAND, MakeFactoryCommand, MakeMigrationCommand, MakeModelCommand, MakeSeederCommand, MigrateCommand, MigrateRollbackCommand, Migration, MigrationHistoryCommand, MissingDelegateException, Model, ModelFactory, ModelNotFoundException, ModelsSyncCommand, PRISMA_ENUM_MEMBER_REGEX, PRISMA_ENUM_REGEX, PRISMA_MODEL_REGEX, Paginator, QueryBuilder, QueryConstraintException, RelationResolutionException, SEEDER_BRAND, SchemaBuilder, ScopeNotDefinedException, SeedCommand, Seeder, TableBuilder, URLDriver, UniqueConstraintResolutionException, UnsupportedAdapterFeatureException, applyAlterTableOperation, applyCreateTableOperation, applyDropTableOperation, applyMigrationRollbackToPrismaSchema, applyMigrationToPrismaSchema, applyOperationsToPrismaSchema, buildEnumBlock, buildFieldLine, buildIndexLine, buildInverseRelationLine, buildMigrationIdentity, buildMigrationRunId, buildMigrationSource, buildModelBlock, buildRelationLine, computeMigrationChecksum, configureArkormRuntime, createMigrationTimestamp, createPrismaAdapter, createPrismaDelegateMap, defineConfig, defineFactory, deriveCollectionFieldName, deriveInverseRelationAlias, deriveRelationFieldName, ensureArkormConfigLoading, escapeRegex, findAppliedMigration, findEnumBlock, findModelBlock, formatDefaultValue, formatEnumDefaultValue, formatRelationAction, generateMigrationFile, getActiveTransactionClient, getDefaultStubsPath, getLastMigrationRun, getLatestAppliedMigrations, getMigrationPlan, getRuntimePaginationCurrentPageResolver, getRuntimePaginationURLDriverFactory, getRuntimePrismaClient, getUserConfig, inferDelegateName, isDelegateLike, isMigrationApplied, isTransactionCapableClient, loadArkormConfig, markMigrationApplied, markMigrationRun, pad, readAppliedMigrationsState, removeAppliedMigration, resetArkormRuntimeForTests, resolveCast, resolveEnumName, resolveMigrationClassName, resolveMigrationStateFilePath, resolvePrismaType, runArkormTransaction, runMigrationWithPrisma, runPrismaCommand, toMigrationFileSlug, toModelName, writeAppliedMigrationsState };
+export { ArkormCollection, ArkormException, Attribute, CliApp, EnumBuilder, ForeignKeyBuilder, InitCommand, InlineFactory, LengthAwarePaginator, MIGRATION_BRAND, MakeFactoryCommand, MakeMigrationCommand, MakeModelCommand, MakeSeederCommand, MigrateCommand, MigrateRollbackCommand, Migration, MigrationHistoryCommand, MissingDelegateException, Model, ModelFactory, ModelNotFoundException, ModelsSyncCommand, PRISMA_ENUM_MEMBER_REGEX, PRISMA_ENUM_REGEX, PRISMA_MODEL_REGEX, Paginator, QueryBuilder, QueryConstraintException, RelationResolutionException, SEEDER_BRAND, SchemaBuilder, ScopeNotDefinedException, SeedCommand, Seeder, TableBuilder, URLDriver, UniqueConstraintResolutionException, UnsupportedAdapterFeatureException, applyAlterTableOperation, applyCreateTableOperation, applyDropTableOperation, applyMigrationRollbackToPrismaSchema, applyMigrationToPrismaSchema, applyOperationsToPrismaSchema, buildEnumBlock, buildFieldLine, buildIndexLine, buildInverseRelationLine, buildMigrationIdentity, buildMigrationRunId, buildMigrationSource, buildModelBlock, buildRelationLine, computeMigrationChecksum, configureArkormRuntime, createMigrationTimestamp, createPrismaAdapter, createPrismaDelegateMap, defineConfig, defineFactory, deriveCollectionFieldName, deriveInverseRelationAlias, deriveRelationAlias, deriveRelationFieldName, deriveSingularFieldName, ensureArkormConfigLoading, escapeRegex, findAppliedMigration, findEnumBlock, findModelBlock, formatDefaultValue, formatEnumDefaultValue, formatRelationAction, generateMigrationFile, getActiveTransactionClient, getDefaultStubsPath, getLastMigrationRun, getLatestAppliedMigrations, getMigrationPlan, getRuntimePaginationCurrentPageResolver, getRuntimePaginationURLDriverFactory, getRuntimePrismaClient, getUserConfig, inferDelegateName, isDelegateLike, isMigrationApplied, isTransactionCapableClient, loadArkormConfig, markMigrationApplied, markMigrationRun, pad, readAppliedMigrationsState, removeAppliedMigration, resetArkormRuntimeForTests, resolveCast, resolveEnumName, resolveMigrationClassName, resolveMigrationStateFilePath, resolvePrismaType, runArkormTransaction, runMigrationWithPrisma, runPrismaCommand, toMigrationFileSlug, toModelName, writeAppliedMigrationsState };

package/package.json

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