arkormx 2.5.2 → 2.5.4

package/dist/{relationship-BOPI6ila.cjs → relationship-BS1AHptf.cjs}

@@ -2933,6 +2933,8 @@ const userConfig = {
 };
 let runtimeConfigLoaded = false;
 let runtimeConfigLoadingPromise;
+let runtimeModelRegistrationPromise;
+let runtimeModelRegistrationGeneration = 0;
 let runtimeClientResolver;
 let runtimeAdapter;
 let runtimePaginationURLDriverFactory;
@@ -2998,6 +3000,51 @@ const mergeFeatureConfig = (features) => {
 		...features ?? {}
 	};
 };
+const resolveRuntimeModelsDirectory = (directory) => {
+	if ((0, fs.existsSync)(directory)) return directory;
+	const buildOutput = userConfig.paths?.buildOutput;
+	if (typeof buildOutput !== "string" || buildOutput.trim().length === 0) return directory;
+	const relativeSource = path.default.relative(process.cwd(), directory);
+	if (!relativeSource || relativeSource.startsWith("..")) return directory;
+	const mappedDirectory = path.default.join(buildOutput, relativeSource);
+	return (0, fs.existsSync)(mappedDirectory) ? mappedDirectory : directory;
+};
+const collectRuntimeModelFiles = (directory) => {
+	if (!(0, fs.existsSync)(directory)) return [];
+	return (0, fs.readdirSync)(directory, { withFileTypes: true }).flatMap((entry) => {
+		const entryPath = path.default.join(directory, entry.name);
+		if (entry.isDirectory()) return collectRuntimeModelFiles(entryPath);
+		if (!entry.isFile() || !/\.(ts|tsx|mts|cts|js|mjs|cjs)$/i.test(entry.name)) return [];
+		if (/\.d\.(ts|mts|cts)$/i.test(entry.name)) return [];
+		return [entryPath];
+	});
+};
+const isModelConstructor = (value) => {
+	if (typeof value !== "function") return false;
+	const candidate = value;
+	return typeof candidate.query === "function" && typeof candidate.hydrate === "function" && typeof candidate.getTable === "function" && typeof candidate.getPrimaryKey === "function";
+};
+const registerConfiguredModels = async (generation) => {
+	const configured = userConfig.paths?.models;
+	const additional = getRegisteredPaths("models");
+	const files = [...typeof configured === "string" ? [configured] : [], ...additional].map((directory) => resolveRuntimeModelsDirectory(path.default.isAbsolute(directory) ? directory : path.default.resolve(process.cwd(), directory))).filter((directory, index, all) => all.indexOf(directory) === index).flatMap(collectRuntimeModelFiles);
+	const models = (await Promise.all(files.map(async (file) => {
+		try {
+			return await RuntimeModuleLoader.load(file);
+		} catch {
+			return null;
+		}
+	}))).flatMap((module) => module ? Object.values(module).filter(isModelConstructor) : []);
+	if (generation === runtimeModelRegistrationGeneration) registerModels(models);
+};
+const scheduleConfiguredModelRegistration = () => {
+	const generation = runtimeModelRegistrationGeneration;
+	runtimeModelRegistrationPromise = (runtimeModelRegistrationPromise ?? Promise.resolve()).then(async () => await registerConfiguredModels(generation));
+	return runtimeModelRegistrationPromise;
+};
+const awaitConfiguredModelsRegistration = async () => {
+	if (runtimeModelRegistrationPromise) await runtimeModelRegistrationPromise;
+};
 /**
 * Define the ArkORM runtime configuration. This function can be used to provide.
 * 
@@ -3058,6 +3105,7 @@ const configureArkormRuntime = (client, options = {}) => {
 	runtimePaginationURLDriverFactory = nextConfig.pagination?.urlDriver;
 	runtimePaginationCurrentPageResolver = nextConfig.pagination?.resolveCurrentPage;
 	runtimeDebugHandler = resolveDebugHandler(nextConfig.debug);
+	scheduleConfiguredModelRegistration();
 	const bootClient = resolveClient(resolvedClient);
 	options.boot?.({
 		client: bootClient,
@@ -3078,6 +3126,8 @@ const resetArkormRuntimeForTests = () => {
 	});
 	runtimeConfigLoaded = false;
 	runtimeConfigLoadingPromise = void 0;
+	runtimeModelRegistrationPromise = void 0;
+	runtimeModelRegistrationGeneration++;
 	runtimeClientResolver = void 0;
 	runtimeAdapter = void 0;
 	runtimePaginationURLDriverFactory = void 0;
@@ -3154,21 +3204,30 @@ const loadRuntimeConfigSync = () => {
 * @returns 
 */
 const loadArkormConfig = async () => {
-	if (runtimeConfigLoaded) return;
+	if (runtimeConfigLoaded) {
+		await awaitConfiguredModelsRegistration();
+		return;
+	}
 	if (runtimeConfigLoadingPromise) return await runtimeConfigLoadingPromise;
-	if (loadRuntimeConfigSync()) return;
+	if (loadRuntimeConfigSync()) {
+		await awaitConfiguredModelsRegistration();
+		return;
+	}
 	runtimeConfigLoadingPromise = (async () => {
 		const configPaths = [path.default.join(process.cwd(), "arkormx.config.js"), path.default.join(process.cwd(), "arkormx.config.ts")];
 		for (const configPath of configPaths) {
 			if (!(0, fs.existsSync)(configPath)) continue;
 			try {
 				resolveAndApplyConfig(await importConfigFile(configPath));
+				await awaitConfiguredModelsRegistration();
 				return;
 			} catch {
 				continue;
 			}
 		}
 		runtimeConfigLoaded = true;
+		await scheduleConfiguredModelRegistration();
+		await awaitConfiguredModelsRegistration();
 	})();
 	await runtimeConfigLoadingPromise;
 };
@@ -3553,6 +3612,77 @@ var Relation = class {
 		return this.constrain((query) => query.where(where));
 	}
 	/**
+	* Adds an OR where clause to the query.
+	*
+	* @param where
+	* @returns
+	*/
+	orWhere(where) {
+		return this.constrain((query) => query.orWhere(where));
+	}
+	/**
+	* Adds a NOT where clause to the query.
+	*
+	* @param where
+	* @returns
+	*/
+	whereNot(where) {
+		return this.constrain((query) => query.whereNot(where));
+	}
+	/**
+	* Adds an OR NOT where clause to the query.
+	*
+	* @param where
+	* @returns
+	*/
+	orWhereNot(where) {
+		return this.constrain((query) => query.orWhereNot(where));
+	}
+	/**
+	* Adds a null check for a key.
+	*
+	* @param key
+	* @returns
+	*/
+	whereNull(key) {
+		return this.constrain((query) => query.whereNull(key));
+	}
+	/**
+	* Adds a not-null check for a key.
+	*
+	* @param key
+	* @returns
+	*/
+	whereNotNull(key) {
+		return this.constrain((query) => query.whereNotNull(key));
+	}
+	/**
+	* Adds a between range clause for a key.
+	*
+	* @param key
+	* @param range
+	* @returns
+	*/
+	whereBetween(key, range) {
+		return this.constrain((query) => query.whereBetween(key, range));
+	}
+	/**
+	* Adds a date-only equality clause for a date-like key.
+	*
+	* @param key
+	* @param value
+	* @returns
+	*/
+	whereDate(key, value) {
+		return this.constrain((query) => query.whereDate(key, value));
+	}
+	whereMonth(key, month, year) {
+		return this.constrain((query) => query.whereMonth(key, month, year));
+	}
+	whereYear(key, year) {
+		return this.constrain((query) => query.whereYear(key, year));
+	}
+	/**
 	* Add a strongly-typed where key clause to the relationship query.
 	*
 	* @param key
@@ -3563,6 +3693,16 @@ var Relation = class {
 		return this.constrain((query) => query.whereKey(key, value));
 	}
 	/**
+	* Adds a strongly-typed inequality where clause for a single attribute key.
+	*
+	* @param key
+	* @param value
+	* @returns
+	*/
+	whereKeyNot(key, value) {
+		return this.constrain((query) => query.whereKeyNot(key, value));
+	}
+	/**
 	* Add a strongly-typed where in clause to the relationship query.
 	*
 	* @param key
@@ -3573,6 +3713,36 @@ var Relation = class {
 		return this.constrain((query) => query.whereIn(key, values));
 	}
 	/**
+	* Adds a strongly-typed OR IN where clause for a single attribute key.
+	*
+	* @param key
+	* @param values
+	* @returns
+	*/
+	orWhereIn(key, values) {
+		return this.constrain((query) => query.orWhereIn(key, values));
+	}
+	/**
+	* Adds a strongly-typed NOT IN where clause for a single attribute key.
+	*
+	* @param key
+	* @param values
+	* @returns
+	*/
+	whereNotIn(key, values) {
+		return this.constrain((query) => query.whereNotIn(key, values));
+	}
+	/**
+	* Adds a strongly-typed OR NOT IN where clause for a single attribute key.
+	*
+	* @param key
+	* @param values
+	* @returns
+	*/
+	orWhereNotIn(key, values) {
+		return this.constrain((query) => query.orWhereNotIn(key, values));
+	}
+	/**
 	* Add a string contains clause to the relationship query.
 	*
 	* @param key
@@ -3612,6 +3782,42 @@ var Relation = class {
 		return this.constrain((query) => query.orderBy(orderBy));
 	}
 	/**
+	* Puts the query results in random order.
+	*
+	* @returns
+	*/
+	inRandomOrder() {
+		return this.constrain((query) => query.inRandomOrder());
+	}
+	/**
+	* Removes existing order clauses and optionally applies a new one.
+	*
+	* @param column
+	* @param direction
+	* @returns
+	*/
+	reorder(column, direction = "asc") {
+		return this.constrain((query) => query.reorder(column, direction));
+	}
+	/**
+	* Adds an orderBy descending clause for a timestamp-like column.
+	*
+	* @param column
+	* @returns
+	*/
+	latest(column = "createdAt") {
+		return this.constrain((query) => query.latest(column));
+	}
+	/**
+	* Adds an orderBy ascending clause for a timestamp-like column.
+	*
+	* @param column
+	* @returns
+	*/
+	oldest(column = "createdAt") {
+		return this.constrain((query) => query.oldest(column));
+	}
+	/**
 	* Add an include clause to the relationship query.
 	*
 	* @param include
@@ -3638,6 +3844,9 @@ var Relation = class {
 	select(select) {
 		return this.constrain((query) => query.select(select));
 	}
+	addSelect(select) {
+		return this.constrain((query) => query.addSelect(select));
+	}
 	/**
 	* Add a skip clause to the relationship query.
 	*
@@ -3647,6 +3856,9 @@ var Relation = class {
 	skip(skip) {
 		return this.constrain((query) => query.skip(skip));
 	}
+	offset(value) {
+		return this.constrain((query) => query.offset(value));
+	}
 	/**
 	* Add a take clause to the relationship query.
 	*
@@ -3657,6 +3869,45 @@ var Relation = class {
 		return this.constrain((query) => query.take(take));
 	}
 	/**
+	* Alias for take.
+	*
+	* @param value
+	* @returns
+	*/
+	limit(value) {
+		return this.constrain((query) => query.limit(value));
+	}
+	/**
+	* Sets offset/limit for a 1-based page.
+	*
+	* @param page
+	* @param perPage
+	* @returns
+	*/
+	forPage(page, perPage = 15) {
+		return this.constrain((query) => query.forPage(page, perPage));
+	}
+	/**
+	* Adds a raw where clause when supported by the adapter.
+	*
+	* @param sql
+	* @param bindings
+	* @returns
+	*/
+	whereRaw(sql, bindings = []) {
+		return this.constrain((query) => query.whereRaw(sql, bindings));
+	}
+	/**
+	* Adds a raw OR where clause when supported by the adapter.
+	*
+	* @param sql
+	* @param bindings
+	* @returns
+	*/
+	orWhereRaw(sql, bindings = []) {
+		return this.constrain((query) => query.orWhereRaw(sql, bindings));
+	}
+	/**
 	* Include soft-deleted records in the relationship query.
 	*
 	* @returns
@@ -5034,6 +5285,78 @@ var MorphToManyRelation = class extends Relation {
 	}
 };
 
+//#endregion
+//#region src/relationship/MorphToRelation.ts
+/**
+* Defines the inverse side of a polymorphic one-to-one or one-to-many relationship.
+*
+* Related models are resolved from ArkORM's runtime model registry using the value
+* stored in the morph type column.
+*
+* @author Legacy (3m1n3nc3)
+* @since 2.6.0
+*/
+var MorphToRelation = class extends Relation {
+	constructor(parent, morphName, morphTypeColumn, morphIdColumn, ownerKey, relatedModel) {
+		super();
+		this.parent = parent;
+		this.morphName = morphName;
+		this.morphTypeColumn = morphTypeColumn;
+		this.morphIdColumn = morphIdColumn;
+		this.ownerKey = ownerKey;
+		this.relatedModel = relatedModel;
+	}
+	get related() {
+		return this.resolveRelatedModel();
+	}
+	/**
+	* Build the relationship query.
+	*
+	* @returns
+	*/
+	async getQuery() {
+		await awaitConfiguredModelsRegistration();
+		const related = this.resolveRelatedModel();
+		const resolvedOwnerKey = this.ownerKey ?? related.getPrimaryKey();
+		const morphId = this.parent.getAttribute(this.morphIdColumn);
+		return this.applyConstraint(related.query().where({ [resolvedOwnerKey]: morphId }));
+	}
+	getMetadata() {
+		return {
+			type: "morphTo",
+			morphName: this.morphName,
+			morphIdColumn: this.morphIdColumn,
+			morphTypeColumn: this.morphTypeColumn,
+			ownerKey: this.ownerKey
+		};
+	}
+	/**
+	* Fetch the polymorphic parent model.
+	*
+	* @returns
+	*/
+	async getResults() {
+		const morphType = this.parent.getAttribute(this.morphTypeColumn);
+		const morphId = this.parent.getAttribute(this.morphIdColumn);
+		if (morphType == null || morphId == null) return null;
+		return await (await this.getQuery()).first();
+	}
+	resolveRelatedModel() {
+		const morphType = this.parent.getAttribute(this.morphTypeColumn);
+		if (typeof morphType !== "string" || morphType.trim().length === 0) throw new RelationResolutionException(`Morph type column [${this.morphTypeColumn}] does not contain a model name.`, {
+			operation: "morphTo",
+			relation: this.morphName
+		});
+		const related = this.relatedModel?.name === morphType ? this.relatedModel : getRegisteredModels().find((model) => model.name === morphType);
+		if (!related) throw new RelationResolutionException(`Morph model [${morphType}] is not registered. Register it with Arkorm.registerModels().`, {
+			operation: "morphTo",
+			model: morphType,
+			relation: this.morphName
+		});
+		return related;
+	}
+};
+
 //#endregion
 Object.defineProperty(exports, 'ArkormCollection', {
   enumerable: true,
@@ -5119,6 +5442,12 @@ Object.defineProperty(exports, 'MorphToManyRelation', {
     return MorphToManyRelation;
   }
 });
+Object.defineProperty(exports, 'MorphToRelation', {
+  enumerable: true,
+  get: function () {
+    return MorphToRelation;
+  }
+});
 Object.defineProperty(exports, 'PRISMA_ENUM_MEMBER_REGEX', {
   enumerable: true,
   get: function () {
@@ -5269,6 +5598,12 @@ Object.defineProperty(exports, 'applyOperationsToPrismaSchema', {
     return applyOperationsToPrismaSchema;
   }
 });
+Object.defineProperty(exports, 'awaitConfiguredModelsRegistration', {
+  enumerable: true,
+  get: function () {
+    return awaitConfiguredModelsRegistration;
+  }
+});
 Object.defineProperty(exports, 'bindAdapterToModels', {
   enumerable: true,
   get: function () {

package/package.json

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