@warlock.js/cascade 5.31.0 → 5.33.0

package/esm/drivers/postgres/postgres-query-builder.mjs

@@ -322,7 +322,7 @@ var PostgresQueryBuilder = class PostgresQueryBuilder extends QueryBuilder {
 			if (timing === "before") beforeOps.push(...temp.operations);
 			else afterOps.push(...temp.operations);
 		}
-		const HAS_OP_TYPES = new Set([
+		const HAS_OP_TYPES = /* @__PURE__ */ new Set([
 			"has",
 			"whereHas",
 			"orWhereHas",
@@ -475,8 +475,10 @@ var PostgresQueryBuilder = class PostgresQueryBuilder extends QueryBuilder {
 				if (!def) throw new Error(`Relation "${segName}" not found on model ${currentModel?.name ?? "unknown"}`);
 				let selectColumns = segColumns ?? def.select;
 				let constraintOps;
-				if (i === segments.length - 1 && constraint !== void 0) if (typeof constraint === "string") selectColumns = constraint.split(",").filter(Boolean);
-				else constraintOps = this._resolveConstraintOps(constraint);
+				if (i === segments.length - 1 && constraint !== void 0) {
+					if (typeof constraint === "string") selectColumns = constraint.split(",").filter(Boolean);
+					else constraintOps = this._resolveConstraintOps(constraint);
+				}
 				const alias = currentPath.replace(/\./g, "_");
 				this.joinRelations.set(currentPath, {
 					alias,
@@ -984,7 +986,7 @@ var PostgresQueryBuilder = class PostgresQueryBuilder extends QueryBuilder {
 	*/
 	applyHasRelations() {
 		if (this.hasRelationsApplied) return;
-		const HAS_OP_TYPES = new Set([
+		const HAS_OP_TYPES = /* @__PURE__ */ new Set([
 			"has",
 			"whereHas",
 			"orWhereHas",
@@ -1308,12 +1310,14 @@ var PostgresQueryBuilder = class PostgresQueryBuilder extends QueryBuilder {
 				const RelatedModel = resolveModelClass(config.model);
 				if (!RelatedModel) continue;
 				const childKeys = Array.from(this.joinRelations.keys()).filter((p) => p.startsWith(`${path}.`)).map((p) => p.split(".")[path.split(".").length]).filter((segment) => segment !== void 0);
-				if (config.type === "hasMany") attachLoadedRelation(model, key, (Array.isArray(data) ? data : []).map((row) => {
-					const rowData = { ...row };
-					for (const childKey of childKeys) delete rowData[childKey];
-					return RelatedModel.hydrate(rowData);
-				}));
-				else {
+				if (config.type === "hasMany") {
+					const instances = (Array.isArray(data) ? data : []).map((row) => {
+						const rowData = { ...row };
+						for (const childKey of childKeys) delete rowData[childKey];
+						return RelatedModel.hydrate(rowData);
+					});
+					attachLoadedRelation(model, key, instances);
+				} else {
 					const modelData = { ...data };
 					for (const childKey of childKeys) delete modelData[childKey];
 					const relatedInstance = RelatedModel.hydrate(modelData);