arkormx 2.6.0 → 2.7.0

package/dist/relationship/index.cjs

@@ -1,5 +1,5 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
-const require_relationship = require('../relationship-D9u7BlWh.cjs');
+const require_relationship = require('../relationship-B8FaJYIx.cjs');
 
 exports.BelongsToManyRelation = require_relationship.BelongsToManyRelation;
 exports.BelongsToRelation = require_relationship.BelongsToRelation;

package/dist/relationship/index.d.cts

@@ -1,2 +1,2 @@
-import { Co as BelongsToRelation, Do as RelationTableLoader, Eo as Relation, So as HasManyRelation, To as BelongsToManyRelation, _o as MorphOneRelation, bo as HasOneRelation, go as MorphToManyRelation, ho as MorphToRelation, mo as SetBasedEagerLoader, vo as MorphManyRelation, wo as SingleResultRelation, xo as HasManyThroughRelation, yo as HasOneThroughRelation } from "../index-CpZK_wI9.cjs";
+import { Ao as MorphManyRelation, Do as MorphToRelation, Eo as SetBasedEagerLoader, Fo as BelongsToRelation, Io as SingleResultRelation, Lo as BelongsToManyRelation, Mo as HasOneRelation, No as HasManyThroughRelation, Oo as MorphToManyRelation, Po as HasManyRelation, Ro as Relation, jo as HasOneThroughRelation, ko as MorphOneRelation, zo as RelationTableLoader } from "../index-Dnn0lsDy.cjs";
 export { BelongsToManyRelation, BelongsToRelation, HasManyRelation, HasManyThroughRelation, HasOneRelation, HasOneThroughRelation, MorphManyRelation, MorphOneRelation, MorphToManyRelation, MorphToRelation, Relation, RelationTableLoader, SetBasedEagerLoader, SingleResultRelation };

package/dist/relationship/index.d.mts

@@ -1,2 +1,2 @@
-import { Co as BelongsToRelation, Do as RelationTableLoader, Eo as Relation, So as HasManyRelation, To as BelongsToManyRelation, _o as MorphOneRelation, bo as HasOneRelation, go as MorphToManyRelation, ho as MorphToRelation, mo as SetBasedEagerLoader, vo as MorphManyRelation, wo as SingleResultRelation, xo as HasManyThroughRelation, yo as HasOneThroughRelation } from "../index-DjiQjqkW.mjs";
+import { Ao as MorphManyRelation, Do as MorphToRelation, Eo as SetBasedEagerLoader, Fo as BelongsToRelation, Io as SingleResultRelation, Lo as BelongsToManyRelation, Mo as HasOneRelation, No as HasManyThroughRelation, Oo as MorphToManyRelation, Po as HasManyRelation, Ro as Relation, jo as HasOneThroughRelation, ko as MorphOneRelation, zo as RelationTableLoader } from "../index-C77nMASp.mjs";
 export { BelongsToManyRelation, BelongsToRelation, HasManyRelation, HasManyThroughRelation, HasOneRelation, HasOneThroughRelation, MorphManyRelation, MorphOneRelation, MorphToManyRelation, MorphToRelation, Relation, RelationTableLoader, SetBasedEagerLoader, SingleResultRelation };

package/dist/relationship/index.mjs

@@ -1,3 +1,3 @@
-import { Nn as SetBasedEagerLoader, Pn as RelationTableLoader, a as HasOneThroughRelation, c as HasManyRelation, d as BelongsToManyRelation, f as Relation, i as MorphManyRelation, l as BelongsToRelation, n as MorphToManyRelation, o as HasOneRelation, r as MorphOneRelation, s as HasManyThroughRelation, t as MorphToRelation, u as SingleResultRelation } from "../relationship-C5hos4aH.mjs";
+import { Nn as SetBasedEagerLoader, Pn as RelationTableLoader, a as HasOneThroughRelation, c as HasManyRelation, d as BelongsToManyRelation, f as Relation, i as MorphManyRelation, l as BelongsToRelation, n as MorphToManyRelation, o as HasOneRelation, r as MorphOneRelation, s as HasManyThroughRelation, t as MorphToRelation, u as SingleResultRelation } from "../relationship-BuwKUTOb.mjs";
 
 export { BelongsToManyRelation, BelongsToRelation, HasManyRelation, HasManyThroughRelation, HasOneRelation, HasOneThroughRelation, MorphManyRelation, MorphOneRelation, MorphToManyRelation, MorphToRelation, Relation, RelationTableLoader, SetBasedEagerLoader, SingleResultRelation };

package/dist/{relationship-D9u7BlWh.cjs → relationship-B8FaJYIx.cjs}

@@ -205,6 +205,12 @@ var SetBasedEagerLoader = class SetBasedEagerLoader {
 			case "morphTo":
 				await this.loadMorphTo(name, metadata, constraint);
 				return;
+			case "morphOne":
+				await this.loadMorphOne(name, resolver, metadata, constraint);
+				return;
+			case "morphMany":
+				await this.loadMorphMany(name, metadata, constraint);
+				return;
 			default: await this.loadIndividually(name, resolver, constraint);
 		}
 	}
@@ -631,6 +637,86 @@ var SetBasedEagerLoader = class SetBasedEagerLoader {
 		});
 	}
 	/**
+	* Loads a polymorphic one-to-one ("morph one") relationship for the set of
+	* models. See {@link loadMorphChildren} for the batching strategy.
+	*
+	* @param name
+	* @param resolver
+	* @param metadata
+	* @param constraint
+	*/
+	async loadMorphOne(name, resolver, metadata, constraint) {
+		const relatedByKey = await this.loadMorphChildren(metadata, constraint);
+		this.models.forEach((model) => {
+			const bucket = relatedByKey.get(this.morphParentKey(model, metadata.localKey));
+			model.setLoadedRelation(name, bucket?.[0] ?? this.resolveSingleDefault(resolver, model));
+		});
+	}
+	/**
+	* Loads a polymorphic one-to-many ("morph many") relationship for the set of
+	* models. See {@link loadMorphChildren} for the batching strategy.
+	*
+	* @param name
+	* @param metadata
+	* @param constraint
+	*/
+	async loadMorphMany(name, metadata, constraint) {
+		const relatedByKey = await this.loadMorphChildren(metadata, constraint);
+		this.models.forEach((model) => {
+			const bucket = relatedByKey.get(this.morphParentKey(model, metadata.localKey)) ?? [];
+			model.setLoadedRelation(name, new ArkormCollection(bucket));
+		});
+	}
+	/**
+	* Batch-loads the children for a morphOne/morphMany relationship. Parents are
+	* grouped by their own morph type (constructor name), so each distinct type
+	* runs a single query constrained by `idColumn IN (...) AND typeColumn = type`
+	* instead of one query per parent row. This also supports a heterogeneous
+	* parent set (e.g. the result of a nested load after a morphTo).
+	*
+	* @param metadata
+	* @param constraint
+	* @returns A map of `"{type}:{localKey}" -> related[]`.
+	*/
+	async loadMorphChildren(metadata, constraint) {
+		const keysByType = /* @__PURE__ */ new Map();
+		const seenByType = /* @__PURE__ */ new Map();
+		this.models.forEach((model) => {
+			const morphType = this.morphTypeOf(model);
+			const localValue = model.getAttribute(metadata.localKey);
+			if (morphType.length === 0 || localValue == null) return;
+			const keys = keysByType.get(morphType) ?? [];
+			const seen = seenByType.get(morphType) ?? /* @__PURE__ */ new Set();
+			const lookupKey = this.toLookupKey(localValue);
+			if (!seen.has(lookupKey)) {
+				seen.add(lookupKey);
+				keys.push(localValue);
+			}
+			keysByType.set(morphType, keys);
+			seenByType.set(morphType, seen);
+		});
+		const relatedByKey = /* @__PURE__ */ new Map();
+		await Promise.all(Array.from(keysByType.entries()).map(async ([morphType, keys]) => {
+			let query = metadata.relatedModel.query().whereIn(metadata.morphIdColumn, keys).where({ [metadata.morphTypeColumn]: morphType });
+			query = this.applyConstraint(query, constraint);
+			(await query.get()).all().forEach((related) => {
+				const value = this.readModelAttribute(related, metadata.morphIdColumn);
+				if (value == null) return;
+				const key = `${morphType}:${this.toLookupKey(value)}`;
+				const bucket = relatedByKey.get(key) ?? [];
+				bucket.push(related);
+				relatedByKey.set(key, bucket);
+			});
+		}));
+		return relatedByKey;
+	}
+	morphParentKey(model, localKey) {
+		return `${this.morphTypeOf(model)}:${this.toLookupKey(model.getAttribute(localKey))}`;
+	}
+	morphTypeOf(model) {
+		return model.constructor?.name ?? "";
+	}
+	/**
 	* Fallback method to load relationships individually for each model when the
 	* relationship type is not supported for set-based loading.
 	*
@@ -1043,6 +1129,10 @@ var PrimaryKeyGenerationPlanner = class {
 //#endregion
 //#region src/database/TableBuilder.ts
 const PRISMA_ENUM_MEMBER_REGEX$1 = /^[A-Za-z][A-Za-z0-9_]*$/;
+const defaultTimestampNames = {
+	createdAt: "createdAt",
+	updatedAt: "updatedAt"
+};
 const normalizeEnumMember = (columnName, value) => {
 	const normalized = value.trim();
 	if (!normalized) throw new Error(`Enum column [${columnName}] must define only non-empty values.`);
@@ -1354,21 +1444,59 @@ var TableBuilder = class {
 	}
 	/**
 	* Defines both createdAt and updatedAt timestamp columns in the table.
-	* 
-	* @returns 
+	*
+	* The attribute casing (the names exposed on the model) is controlled by the
+	* first argument, while the optional second argument controls the casing used
+	* for the persisted database column names via `.map()`.
+	*
+	* @example
+	* table.timestamps()                       // createdAt / updatedAt
+	* table.timestamps('snake')                // created_at / updated_at
+	* table.timestamps('camel', 'snake')       // createdAt -> created_at (mapped)
+	* table.timestamps({ createdAt: 'createdOn' })
+	* table.timestamps('camel', { createdAt: 'created_on' })
+	*
+	* @param casing    The casing (or explicit names) used for the attribute names.
+	* @param mapCasing The casing (or explicit names) used for the mapped database columns.
+	* @returns
 	*/
-	timestamps() {
-		this.timestamp("createdAt", {
+	timestamps(casing = "camel", mapCasing) {
+		const names = this.resolveTimestampNames(casing, defaultTimestampNames);
+		const maps = mapCasing === void 0 ? void 0 : this.resolveTimestampNames(mapCasing, names);
+		this.timestamp(names.createdAt, {
 			nullable: false,
-			default: "now()"
+			default: "now()",
+			...maps && maps.createdAt !== names.createdAt ? { map: maps.createdAt } : {}
 		});
-		this.timestamp("updatedAt", {
+		this.timestamp(names.updatedAt, {
 			nullable: false,
-			updatedAt: true
+			updatedAt: true,
+			...maps && maps.updatedAt !== names.updatedAt ? { map: maps.updatedAt } : {}
 		});
 		return this;
 	}
 	/**
+	* Resolves a timestamp naming option into concrete createdAt / updatedAt names.
+	*
+	* @param naming    The casing keyword or explicit name overrides.
+	* @param fallback  The names used when an explicit override is omitted.
+	* @returns
+	*/
+	resolveTimestampNames(naming, fallback) {
+		if (naming === "snake") return {
+			createdAt: "created_at",
+			updatedAt: "updated_at"
+		};
+		if (naming === "camel") return {
+			createdAt: "createdAt",
+			updatedAt: "updatedAt"
+		};
+		return {
+			createdAt: naming.createdAt ?? fallback.createdAt,
+			updatedAt: naming.updatedAt ?? fallback.updatedAt
+		};
+	}
+	/**
 	* Defines a soft delete timestamp column in the table.
 	* 
 	* @param column    The name of the soft delete column.

package/dist/{relationship-C5hos4aH.mjs → relationship-BuwKUTOb.mjs}

@@ -177,6 +177,12 @@ var SetBasedEagerLoader = class SetBasedEagerLoader {
 			case "morphTo":
 				await this.loadMorphTo(name, metadata, constraint);
 				return;
+			case "morphOne":
+				await this.loadMorphOne(name, resolver, metadata, constraint);
+				return;
+			case "morphMany":
+				await this.loadMorphMany(name, metadata, constraint);
+				return;
 			default: await this.loadIndividually(name, resolver, constraint);
 		}
 	}
@@ -603,6 +609,86 @@ var SetBasedEagerLoader = class SetBasedEagerLoader {
 		});
 	}
 	/**
+	* Loads a polymorphic one-to-one ("morph one") relationship for the set of
+	* models. See {@link loadMorphChildren} for the batching strategy.
+	*
+	* @param name
+	* @param resolver
+	* @param metadata
+	* @param constraint
+	*/
+	async loadMorphOne(name, resolver, metadata, constraint) {
+		const relatedByKey = await this.loadMorphChildren(metadata, constraint);
+		this.models.forEach((model) => {
+			const bucket = relatedByKey.get(this.morphParentKey(model, metadata.localKey));
+			model.setLoadedRelation(name, bucket?.[0] ?? this.resolveSingleDefault(resolver, model));
+		});
+	}
+	/**
+	* Loads a polymorphic one-to-many ("morph many") relationship for the set of
+	* models. See {@link loadMorphChildren} for the batching strategy.
+	*
+	* @param name
+	* @param metadata
+	* @param constraint
+	*/
+	async loadMorphMany(name, metadata, constraint) {
+		const relatedByKey = await this.loadMorphChildren(metadata, constraint);
+		this.models.forEach((model) => {
+			const bucket = relatedByKey.get(this.morphParentKey(model, metadata.localKey)) ?? [];
+			model.setLoadedRelation(name, new ArkormCollection(bucket));
+		});
+	}
+	/**
+	* Batch-loads the children for a morphOne/morphMany relationship. Parents are
+	* grouped by their own morph type (constructor name), so each distinct type
+	* runs a single query constrained by `idColumn IN (...) AND typeColumn = type`
+	* instead of one query per parent row. This also supports a heterogeneous
+	* parent set (e.g. the result of a nested load after a morphTo).
+	*
+	* @param metadata
+	* @param constraint
+	* @returns A map of `"{type}:{localKey}" -> related[]`.
+	*/
+	async loadMorphChildren(metadata, constraint) {
+		const keysByType = /* @__PURE__ */ new Map();
+		const seenByType = /* @__PURE__ */ new Map();
+		this.models.forEach((model) => {
+			const morphType = this.morphTypeOf(model);
+			const localValue = model.getAttribute(metadata.localKey);
+			if (morphType.length === 0 || localValue == null) return;
+			const keys = keysByType.get(morphType) ?? [];
+			const seen = seenByType.get(morphType) ?? /* @__PURE__ */ new Set();
+			const lookupKey = this.toLookupKey(localValue);
+			if (!seen.has(lookupKey)) {
+				seen.add(lookupKey);
+				keys.push(localValue);
+			}
+			keysByType.set(morphType, keys);
+			seenByType.set(morphType, seen);
+		});
+		const relatedByKey = /* @__PURE__ */ new Map();
+		await Promise.all(Array.from(keysByType.entries()).map(async ([morphType, keys]) => {
+			let query = metadata.relatedModel.query().whereIn(metadata.morphIdColumn, keys).where({ [metadata.morphTypeColumn]: morphType });
+			query = this.applyConstraint(query, constraint);
+			(await query.get()).all().forEach((related) => {
+				const value = this.readModelAttribute(related, metadata.morphIdColumn);
+				if (value == null) return;
+				const key = `${morphType}:${this.toLookupKey(value)}`;
+				const bucket = relatedByKey.get(key) ?? [];
+				bucket.push(related);
+				relatedByKey.set(key, bucket);
+			});
+		}));
+		return relatedByKey;
+	}
+	morphParentKey(model, localKey) {
+		return `${this.morphTypeOf(model)}:${this.toLookupKey(model.getAttribute(localKey))}`;
+	}
+	morphTypeOf(model) {
+		return model.constructor?.name ?? "";
+	}
+	/**
 	* Fallback method to load relationships individually for each model when the
 	* relationship type is not supported for set-based loading.
 	*
@@ -1015,6 +1101,10 @@ var PrimaryKeyGenerationPlanner = class {
 //#endregion
 //#region src/database/TableBuilder.ts
 const PRISMA_ENUM_MEMBER_REGEX$1 = /^[A-Za-z][A-Za-z0-9_]*$/;
+const defaultTimestampNames = {
+	createdAt: "createdAt",
+	updatedAt: "updatedAt"
+};
 const normalizeEnumMember = (columnName, value) => {
 	const normalized = value.trim();
 	if (!normalized) throw new Error(`Enum column [${columnName}] must define only non-empty values.`);
@@ -1326,21 +1416,59 @@ var TableBuilder = class {
 	}
 	/**
 	* Defines both createdAt and updatedAt timestamp columns in the table.
-	* 
-	* @returns 
+	*
+	* The attribute casing (the names exposed on the model) is controlled by the
+	* first argument, while the optional second argument controls the casing used
+	* for the persisted database column names via `.map()`.
+	*
+	* @example
+	* table.timestamps()                       // createdAt / updatedAt
+	* table.timestamps('snake')                // created_at / updated_at
+	* table.timestamps('camel', 'snake')       // createdAt -> created_at (mapped)
+	* table.timestamps({ createdAt: 'createdOn' })
+	* table.timestamps('camel', { createdAt: 'created_on' })
+	*
+	* @param casing    The casing (or explicit names) used for the attribute names.
+	* @param mapCasing The casing (or explicit names) used for the mapped database columns.
+	* @returns
 	*/
-	timestamps() {
-		this.timestamp("createdAt", {
+	timestamps(casing = "camel", mapCasing) {
+		const names = this.resolveTimestampNames(casing, defaultTimestampNames);
+		const maps = mapCasing === void 0 ? void 0 : this.resolveTimestampNames(mapCasing, names);
+		this.timestamp(names.createdAt, {
 			nullable: false,
-			default: "now()"
+			default: "now()",
+			...maps && maps.createdAt !== names.createdAt ? { map: maps.createdAt } : {}
 		});
-		this.timestamp("updatedAt", {
+		this.timestamp(names.updatedAt, {
 			nullable: false,
-			updatedAt: true
+			updatedAt: true,
+			...maps && maps.updatedAt !== names.updatedAt ? { map: maps.updatedAt } : {}
 		});
 		return this;
 	}
 	/**
+	* Resolves a timestamp naming option into concrete createdAt / updatedAt names.
+	*
+	* @param naming    The casing keyword or explicit name overrides.
+	* @param fallback  The names used when an explicit override is omitted.
+	* @returns
+	*/
+	resolveTimestampNames(naming, fallback) {
+		if (naming === "snake") return {
+			createdAt: "created_at",
+			updatedAt: "updated_at"
+		};
+		if (naming === "camel") return {
+			createdAt: "createdAt",
+			updatedAt: "updatedAt"
+		};
+		return {
+			createdAt: naming.createdAt ?? fallback.createdAt,
+			updatedAt: naming.updatedAt ?? fallback.updatedAt
+		};
+	}
+	/**
 	* Defines a soft delete timestamp column in the table.
 	* 
 	* @param column    The name of the soft delete column.

package/package.json

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