arkormx 1.2.0 → 1.2.2

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
@@ -3438,6 +3449,30 @@ var Relation = class {
 		if (results instanceof ArkormCollection) return results.all()[0] ?? null;
 		return results;
 	}
+	/**
+	* Count records that match the relationship query.
+	*
+	* @returns
+	*/
+	async count() {
+		return (await this.getQuery()).count();
+	}
+	/**
+	* Determine whether the relationship query has any matching records.
+	*
+	* @returns
+	*/
+	async exists() {
+		return (await this.getQuery()).exists();
+	}
+	/**
+	* Determine whether the relationship query has no matching records.
+	*
+	* @returns
+	*/
+	async doesntExist() {
+		return !await this.exists();
+	}
 };
 
 //#endregion
@@ -3460,15 +3495,55 @@ var BelongsToManyRelation = class extends Relation {
 		this.relatedKey = relatedKey;
 	}
 	/**
+	* Build the relationship query.
+	*
+	* @returns
+	*/
+	async getQuery() {
+		const parentValue = this.parent.getAttribute(this.parentKey);
+		const ids = (await this.related.getDelegate(this.throughDelegate).findMany({ where: { [this.foreignPivotKey]: parentValue } })).map((row) => row[this.relatedPivotKey]);
+		return this.applyConstraint(this.related.query().where({ [this.relatedKey]: { in: ids } }));
+	}
+	/**
 	* Fetches the related models for this relationship.
 	* 
 	* @returns 
 	*/
 	async getResults() {
-		const parentValue = this.parent.getAttribute(this.parentKey);
-		const ids = (await this.related.getDelegate(this.throughDelegate).findMany({ where: { [this.foreignPivotKey]: parentValue } })).map((row) => row[this.relatedPivotKey]);
-		if (ids.length === 0) return new ArkormCollection([]);
-		return this.applyConstraint(this.related.query().where({ [this.relatedKey]: { in: ids } })).get();
+		return (await this.getQuery()).get();
+	}
+};
+
+//#endregion
+//#region src/relationship/SingleResultRelation.ts
+/**
+* Base class for relationships that resolve to a single related model.
+* 
+* @author Legacy (3m1n3nc3)
+* @since 1.3.0
+*/
+var SingleResultRelation = class extends Relation {
+	defaultValue;
+	constructor(parent, related) {
+		super();
+		this.parent = parent;
+		this.related = related;
+	}
+	/**
+	* Defines a default value to return when the relationship does not find a related model.
+	* 
+	* @param value     The default value or a callback that returns the default value.
+	* @returns         The current instance for method chaining.
+	*/
+	withDefault(value = {}) {
+		this.defaultValue = value;
+		return this;
+	}
+	resolveDefaultResult() {
+		if (typeof this.defaultValue === "undefined") return null;
+		const resolved = typeof this.defaultValue === "function" ? this.defaultValue(this.parent) : this.defaultValue;
+		if (resolved instanceof this.related) return resolved;
+		return this.related.hydrate(resolved);
 	}
 };
 
@@ -3480,22 +3555,28 @@ var BelongsToManyRelation = class extends Relation {
 * @author Legacy (3m1n3nc3)
 * @since 0.1.0
 */
-var BelongsToRelation = class extends Relation {
+var BelongsToRelation = class extends SingleResultRelation {
 	constructor(parent, related, foreignKey, ownerKey) {
-		super();
-		this.parent = parent;
-		this.related = related;
+		super(parent, related);
 		this.foreignKey = foreignKey;
 		this.ownerKey = ownerKey;
 	}
 	/**
+	* Build the relationship query.
+	*
+	* @returns
+	*/
+	async getQuery() {
+		const foreignValue = this.parent.getAttribute(this.foreignKey);
+		return this.applyConstraint(this.related.query().where({ [this.ownerKey]: foreignValue }));
+	}
+	/**
 	* Fetches the related models for this relationship.
 	* 
 	* @returns 
 	*/
 	async getResults() {
-		const foreignValue = this.parent.getAttribute(this.foreignKey);
-		return this.applyConstraint(this.related.query().where({ [this.ownerKey]: foreignValue })).first();
+		return await (await this.getQuery()).first() ?? this.resolveDefaultResult();
 	}
 };
 
@@ -3516,13 +3597,21 @@ var HasManyRelation = class extends Relation {
 		this.localKey = localKey;
 	}
 	/**
+	* Build the relationship query.
+	*
+	* @returns
+	*/
+	async getQuery() {
+		const localValue = this.parent.getAttribute(this.localKey);
+		return this.applyConstraint(this.related.query().where({ [this.foreignKey]: localValue }));
+	}
+	/**
 	* Fetches the related models for this relationship.
 	* 
 	* @returns 
 	*/
 	async getResults() {
-		const localValue = this.parent.getAttribute(this.localKey);
-		return this.applyConstraint(this.related.query().where({ [this.foreignKey]: localValue })).get();
+		return (await this.getQuery()).get();
 	}
 };
 
@@ -3547,15 +3636,22 @@ var HasManyThroughRelation = class extends Relation {
 		this.secondLocalKey = secondLocalKey;
 	}
 	/**
+	* Build the relationship query.
+	*
+	* @returns
+	*/
+	async getQuery() {
+		const localValue = this.parent.getAttribute(this.localKey);
+		const keys = (await this.related.getDelegate(this.throughDelegate).findMany({ where: { [this.firstKey]: localValue } })).map((row) => row[this.secondLocalKey]);
+		return this.applyConstraint(this.related.query().where({ [this.secondKey]: { in: keys } }));
+	}
+	/**
 	* Fetches the related models for this relationship.
 	* 
 	* @returns 
 	*/
 	async getResults() {
-		const localValue = this.parent.getAttribute(this.localKey);
-		const keys = (await this.related.getDelegate(this.throughDelegate).findMany({ where: { [this.firstKey]: localValue } })).map((row) => row[this.secondLocalKey]);
-		if (keys.length === 0) return new ArkormCollection([]);
-		return this.applyConstraint(this.related.query().where({ [this.secondKey]: { in: keys } })).get();
+		return (await this.getQuery()).get();
 	}
 };
 
@@ -3567,22 +3663,28 @@ var HasManyThroughRelation = class extends Relation {
 * @author Legacy (3m1n3nc3)
 * @since 0.1.0
 */
-var HasOneRelation = class extends Relation {
+var HasOneRelation = class extends SingleResultRelation {
 	constructor(parent, related, foreignKey, localKey) {
-		super();
-		this.parent = parent;
-		this.related = related;
+		super(parent, related);
 		this.foreignKey = foreignKey;
 		this.localKey = localKey;
 	}
 	/**
+	* Build the relationship query.
+	*
+	* @returns
+	*/
+	async getQuery() {
+		const localValue = this.parent.getAttribute(this.localKey);
+		return this.applyConstraint(this.related.query().where({ [this.foreignKey]: localValue }));
+	}
+	/**
 	* Fetches the related models for this relationship.
 	* 
 	* @returns 
 	*/
 	async getResults() {
-		const localValue = this.parent.getAttribute(this.localKey);
-		return this.applyConstraint(this.related.query().where({ [this.foreignKey]: localValue })).first();
+		return await (await this.getQuery()).first() ?? this.resolveDefaultResult();
 	}
 };
 
@@ -3595,11 +3697,9 @@ var HasOneRelation = class extends Relation {
 * @author Legacy (3m1n3nc3)
 * @since 0.1.0
 */
-var HasOneThroughRelation = class extends Relation {
+var HasOneThroughRelation = class extends SingleResultRelation {
 	constructor(parent, related, throughDelegate, firstKey, secondKey, localKey, secondLocalKey) {
-		super();
-		this.parent = parent;
-		this.related = related;
+		super(parent, related);
 		this.throughDelegate = throughDelegate;
 		this.firstKey = firstKey;
 		this.secondKey = secondKey;
@@ -3607,15 +3707,23 @@ var HasOneThroughRelation = class extends Relation {
 		this.secondLocalKey = secondLocalKey;
 	}
 	/**
+	* Build the relationship query.
+	*
+	* @returns
+	*/
+	async getQuery() {
+		const localValue = this.parent.getAttribute(this.localKey);
+		const intermediate = await this.related.getDelegate(this.throughDelegate).findFirst({ where: { [this.firstKey]: localValue } });
+		if (!intermediate) return this.applyConstraint(this.related.query().where({ [this.secondKey]: { in: [] } }));
+		return this.applyConstraint(this.related.query().where({ [this.secondKey]: intermediate[this.secondLocalKey] }));
+	}
+	/**
 	* Fetches the related models for this relationship.
 	* 
 	* @returns 
 	*/
 	async getResults() {
-		const localValue = this.parent.getAttribute(this.localKey);
-		const intermediate = await this.related.getDelegate(this.throughDelegate).findFirst({ where: { [this.firstKey]: localValue } });
-		if (!intermediate) return null;
-		return this.applyConstraint(this.related.query().where({ [this.secondKey]: intermediate[this.secondLocalKey] })).first();
+		return await (await this.getQuery()).first() ?? this.resolveDefaultResult();
 	}
 };
 
@@ -3636,17 +3744,25 @@ var MorphManyRelation = class extends Relation {
 		this.localKey = localKey;
 	}
 	/**
-	* Fetches the related models for this relationship.
-	* 
-	* @returns 
+	* Build the relationship query.
+	*
+	* @returns
 	*/
-	async getResults() {
+	async getQuery() {
 		const id = this.parent.getAttribute(this.localKey);
 		const type = this.parent.constructor.name;
 		return this.applyConstraint(this.related.query().where({
 			[`${this.morphName}Id`]: id,
 			[`${this.morphName}Type`]: type
-		})).get();
+		}));
+	}
+	/**
+	* Fetches the related models for this relationship.
+	* 
+	* @returns 
+	*/
+	async getResults() {
+		return (await this.getQuery()).get();
 	}
 };
 
@@ -3658,26 +3774,32 @@ var MorphManyRelation = class extends Relation {
 * @author Legacy (3m1n3nc3)
 * @since 0.1.0
 */
-var MorphOneRelation = class extends Relation {
+var MorphOneRelation = class extends SingleResultRelation {
 	constructor(parent, related, morphName, localKey) {
-		super();
-		this.parent = parent;
-		this.related = related;
+		super(parent, related);
 		this.morphName = morphName;
 		this.localKey = localKey;
 	}
 	/**
-	* Fetches the related models for this relationship.
-	* 
-	* @returns 
+	* Build the relationship query.
+	*
+	* @returns
 	*/
-	async getResults() {
+	async getQuery() {
 		const id = this.parent.getAttribute(this.localKey);
 		const type = this.parent.constructor.name;
 		return this.applyConstraint(this.related.query().where({
 			[`${this.morphName}Id`]: id,
 			[`${this.morphName}Type`]: type
-		})).first();
+		}));
+	}
+	/**
+	* Fetches the related models for this relationship.
+	* 
+	* @returns 
+	*/
+	async getResults() {
+		return await (await this.getQuery()).first() ?? this.resolveDefaultResult();
 	}
 };
 
@@ -3701,19 +3823,26 @@ var MorphToManyRelation = class extends Relation {
 		this.relatedKey = relatedKey;
 	}
 	/**
-	* Fetches the related models for this relationship.
-	* 
-	* @returns 
+	* Build the relationship query.
+	*
+	* @returns
 	*/
-	async getResults() {
+	async getQuery() {
 		const parentValue = this.parent.getAttribute(this.parentKey);
 		const morphType = this.parent.constructor.name;
 		const ids = (await this.related.getDelegate(this.throughDelegate).findMany({ where: {
 			[`${this.morphName}Id`]: parentValue,
 			[`${this.morphName}Type`]: morphType
 		} })).map((row) => row[this.relatedPivotKey]);
-		if (ids.length === 0) return new ArkormCollection([]);
-		return this.applyConstraint(this.related.query().where({ [this.relatedKey]: { in: ids } })).get();
+		return this.applyConstraint(this.related.query().where({ [this.relatedKey]: { in: ids } }));
+	}
+	/**
+	* Fetches the related models for this relationship.
+	* 
+	* @returns 
+	*/
+	async getResults() {
+		return (await this.getQuery()).get();
 	}
 };
 
@@ -6468,7 +6597,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;