arkormx 2.0.0-next.22 → 2.0.0-next.24

package/dist/index.cjs

@@ -6010,7 +6010,7 @@ var RelationTableLoader = class {
 * @author Legacy (3m1n3nc3)
 * @since 2.0.0-next.2
 */
-var SetBasedEagerLoader = class {
+var SetBasedEagerLoader = class SetBasedEagerLoader {
 	constructor(models, relations) {
 		this.models = models;
 		this.relations = relations;
@@ -6022,10 +6022,18 @@ var SetBasedEagerLoader = class {
 	*/
 	async load() {
 		if (this.models.length === 0) return;
-		await Promise.all(Object.entries(this.relations).map(async ([name, constraint]) => {
-			await this.loadRelation(name, constraint);
+		const relationTree = this.buildRelationTree(this.relations);
+		await Promise.all(Array.from(relationTree.entries()).map(async ([name, node]) => {
+			await this.loadRelationNode(name, node);
 		}));
 	}
+	async loadRelationNode(name, node) {
+		await this.loadRelation(name, node.constraint);
+		if (node.children.size === 0) return;
+		const relatedModels = this.collectLoadedRelationModels(name);
+		if (relatedModels.length === 0) return;
+		await new SetBasedEagerLoader(relatedModels, this.relationTreeToMap(node.children)).load();
+	}
 	/**
 	* Loads a specific relationship for the set of models based on the relationship name 
 	* and an optional constraint.
@@ -6069,9 +6077,58 @@ var SetBasedEagerLoader = class {
 	*/
 	resolveRelationResolver(name) {
 		const resolver = this.models[0][name];
-		if (typeof resolver !== "function") return null;
+		if (typeof resolver !== "function") {
+			const modelName = this.models[0].constructor?.name ?? "Model";
+			throw new RelationResolutionException(`Relation [${name}] is not defined on the model.`, {
+				operation: "eagerLoad",
+				model: modelName,
+				relation: name
+			});
+		}
 		return resolver;
 	}
+	buildRelationTree(relations) {
+		const tree = /* @__PURE__ */ new Map();
+		Object.entries(relations).forEach(([path, constraint]) => {
+			const segments = path.split(".").map((segment) => segment.trim()).filter((segment) => segment.length > 0);
+			if (segments.length === 0) return;
+			let current = tree;
+			segments.forEach((segment, index) => {
+				const existing = current.get(segment) ?? {
+					constraint: void 0,
+					children: /* @__PURE__ */ new Map()
+				};
+				if (index === segments.length - 1 && constraint) existing.constraint = constraint;
+				current.set(segment, existing);
+				current = existing.children;
+			});
+		});
+		return tree;
+	}
+	relationTreeToMap(tree, prefix = "") {
+		return Array.from(tree.entries()).reduce((all, [name, node]) => {
+			const path = prefix ? `${prefix}.${name}` : name;
+			all[path] = node.constraint;
+			Object.assign(all, this.relationTreeToMap(node.children, path));
+			return all;
+		}, {});
+	}
+	collectLoadedRelationModels(name) {
+		return this.models.reduce((all, model) => {
+			const loaded = model.getAttribute(name);
+			if (loaded instanceof ArkormCollection) {
+				loaded.all().forEach((item) => {
+					if (this.isEagerLoadableModel(item)) all.push(item);
+				});
+				return all;
+			}
+			if (this.isEagerLoadableModel(loaded)) all.push(loaded);
+			return all;
+		}, []);
+	}
+	isEagerLoadableModel(value) {
+		return typeof value === "object" && value !== null && typeof value.getAttribute === "function" && typeof value.setLoadedRelation === "function";
+	}
 	/**
 	* Loads a "belongs to" relationship for the set of models.
 	* 
@@ -7536,12 +7593,14 @@ var QueryBuilder = class QueryBuilder {
 	* @returns
 	*/
 	async updateOrInsert(attributes, values = {}) {
-		if (typeof values !== "function" && this.adapter?.capabilities?.upsert && typeof this.requireAdapter().upsert === "function") {
+		if (typeof values !== "function" && this.adapter?.capabilities?.upsert && typeof this.requireAdapter().upsert === "function") try {
 			await this.executeUpsertRows([{
 				...attributes,
 				...values
 			}], Object.keys(attributes), Object.keys(values));
 			return true;
+		} catch (error) {
+			if (!this.shouldFallbackUpdateOrInsertUpsert(error)) throw error;
 		}
 		const exists = await this.clone().where(attributes).first() != null;
 		const resolvedValues = typeof values === "function" ? await values(exists) : values;
@@ -7554,6 +7613,13 @@ var QueryBuilder = class QueryBuilder {
 		}
 		return await this.clone().where(attributes).update(resolvedValues) != null;
 	}
+	shouldFallbackUpdateOrInsertUpsert(error) {
+		if (!(error instanceof QueryExecutionException)) return false;
+		const cause = error.cause;
+		const code = typeof cause?.code === "string" ? cause.code : void 0;
+		const message = typeof cause?.message === "string" ? cause.message : error.message;
+		return code === "42P10" || message.includes("there is no unique or exclusion constraint matching the ON CONFLICT specification");
+	}
 	/**
 	* Insert new records or update existing records by one or more unique keys.
 	*

package/dist/index.d.cts

@@ -2687,6 +2687,7 @@ declare class QueryBuilder<TModel, TDelegate extends PrismaDelegateLike = Prisma
    * @returns
    */
   updateOrInsert(attributes: Record<string, unknown>, values?: Record<string, unknown> | ((exists: boolean) => Record<string, unknown> | Promise<Record<string, unknown>>)): Promise<boolean>;
+  private shouldFallbackUpdateOrInsertUpsert;
   /**
    * Insert new records or update existing records by one or more unique keys.
    *

package/dist/index.d.mts

@@ -2687,6 +2687,7 @@ declare class QueryBuilder<TModel, TDelegate extends PrismaDelegateLike = Prisma
    * @returns
    */
   updateOrInsert(attributes: Record<string, unknown>, values?: Record<string, unknown> | ((exists: boolean) => Record<string, unknown> | Promise<Record<string, unknown>>)): Promise<boolean>;
+  private shouldFallbackUpdateOrInsertUpsert;
   /**
    * Insert new records or update existing records by one or more unique keys.
    *

package/dist/index.mjs

@@ -5981,7 +5981,7 @@ var RelationTableLoader = class {
 * @author Legacy (3m1n3nc3)
 * @since 2.0.0-next.2
 */
-var SetBasedEagerLoader = class {
+var SetBasedEagerLoader = class SetBasedEagerLoader {
 	constructor(models, relations) {
 		this.models = models;
 		this.relations = relations;
@@ -5993,10 +5993,18 @@ var SetBasedEagerLoader = class {
 	*/
 	async load() {
 		if (this.models.length === 0) return;
-		await Promise.all(Object.entries(this.relations).map(async ([name, constraint]) => {
-			await this.loadRelation(name, constraint);
+		const relationTree = this.buildRelationTree(this.relations);
+		await Promise.all(Array.from(relationTree.entries()).map(async ([name, node]) => {
+			await this.loadRelationNode(name, node);
 		}));
 	}
+	async loadRelationNode(name, node) {
+		await this.loadRelation(name, node.constraint);
+		if (node.children.size === 0) return;
+		const relatedModels = this.collectLoadedRelationModels(name);
+		if (relatedModels.length === 0) return;
+		await new SetBasedEagerLoader(relatedModels, this.relationTreeToMap(node.children)).load();
+	}
 	/**
 	* Loads a specific relationship for the set of models based on the relationship name 
 	* and an optional constraint.
@@ -6040,9 +6048,58 @@ var SetBasedEagerLoader = class {
 	*/
 	resolveRelationResolver(name) {
 		const resolver = this.models[0][name];
-		if (typeof resolver !== "function") return null;
+		if (typeof resolver !== "function") {
+			const modelName = this.models[0].constructor?.name ?? "Model";
+			throw new RelationResolutionException(`Relation [${name}] is not defined on the model.`, {
+				operation: "eagerLoad",
+				model: modelName,
+				relation: name
+			});
+		}
 		return resolver;
 	}
+	buildRelationTree(relations) {
+		const tree = /* @__PURE__ */ new Map();
+		Object.entries(relations).forEach(([path, constraint]) => {
+			const segments = path.split(".").map((segment) => segment.trim()).filter((segment) => segment.length > 0);
+			if (segments.length === 0) return;
+			let current = tree;
+			segments.forEach((segment, index) => {
+				const existing = current.get(segment) ?? {
+					constraint: void 0,
+					children: /* @__PURE__ */ new Map()
+				};
+				if (index === segments.length - 1 && constraint) existing.constraint = constraint;
+				current.set(segment, existing);
+				current = existing.children;
+			});
+		});
+		return tree;
+	}
+	relationTreeToMap(tree, prefix = "") {
+		return Array.from(tree.entries()).reduce((all, [name, node]) => {
+			const path = prefix ? `${prefix}.${name}` : name;
+			all[path] = node.constraint;
+			Object.assign(all, this.relationTreeToMap(node.children, path));
+			return all;
+		}, {});
+	}
+	collectLoadedRelationModels(name) {
+		return this.models.reduce((all, model) => {
+			const loaded = model.getAttribute(name);
+			if (loaded instanceof ArkormCollection) {
+				loaded.all().forEach((item) => {
+					if (this.isEagerLoadableModel(item)) all.push(item);
+				});
+				return all;
+			}
+			if (this.isEagerLoadableModel(loaded)) all.push(loaded);
+			return all;
+		}, []);
+	}
+	isEagerLoadableModel(value) {
+		return typeof value === "object" && value !== null && typeof value.getAttribute === "function" && typeof value.setLoadedRelation === "function";
+	}
 	/**
 	* Loads a "belongs to" relationship for the set of models.
 	* 
@@ -7507,12 +7564,14 @@ var QueryBuilder = class QueryBuilder {
 	* @returns
 	*/
 	async updateOrInsert(attributes, values = {}) {
-		if (typeof values !== "function" && this.adapter?.capabilities?.upsert && typeof this.requireAdapter().upsert === "function") {
+		if (typeof values !== "function" && this.adapter?.capabilities?.upsert && typeof this.requireAdapter().upsert === "function") try {
 			await this.executeUpsertRows([{
 				...attributes,
 				...values
 			}], Object.keys(attributes), Object.keys(values));
 			return true;
+		} catch (error) {
+			if (!this.shouldFallbackUpdateOrInsertUpsert(error)) throw error;
 		}
 		const exists = await this.clone().where(attributes).first() != null;
 		const resolvedValues = typeof values === "function" ? await values(exists) : values;
@@ -7525,6 +7584,13 @@ var QueryBuilder = class QueryBuilder {
 		}
 		return await this.clone().where(attributes).update(resolvedValues) != null;
 	}
+	shouldFallbackUpdateOrInsertUpsert(error) {
+		if (!(error instanceof QueryExecutionException)) return false;
+		const cause = error.cause;
+		const code = typeof cause?.code === "string" ? cause.code : void 0;
+		const message = typeof cause?.message === "string" ? cause.message : error.message;
+		return code === "42P10" || message.includes("there is no unique or exclusion constraint matching the ON CONFLICT specification");
+	}
 	/**
 	* Insert new records or update existing records by one or more unique keys.
 	*

package/package.json

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