@punks/backend-entity-manager 0.0.197 → 0.0.199

package/dist/cjs/index.js

@@ -2844,6 +2844,35 @@ class PermissionsChecker {
     }
 }
 
+const mergeWhereClauses = (where1, where2) => {
+    const mergedWhere = {};
+    for (const key in where1) {
+        if (where1.hasOwnProperty(key)) {
+            mergedWhere[key] = where1[key];
+        }
+    }
+    for (const key in where2) {
+        if (where2.hasOwnProperty(key)) {
+            if (mergedWhere.hasOwnProperty(key)) {
+                if (typeof where2[key] === "object" &&
+                    typeof mergedWhere[key] === "object") {
+                    mergedWhere[key] = {
+                        ...mergedWhere[key],
+                        ...where2[key],
+                    };
+                }
+                else {
+                    mergedWhere[key] = where2[key];
+                }
+            }
+            else {
+                mergedWhere[key] = where2[key];
+            }
+        }
+    }
+    return mergedWhere;
+};
+
 class TypeOrmQueryBuilder extends QueryBuilderBase {
     constructor(services) {
         super();
@@ -3026,22 +3055,13 @@ class TypeOrmQueryBuilder extends QueryBuilderBase {
             return result;
         }
         if (!Array.isArray(a) && !Array.isArray(b)) {
-            return {
-                ...a,
-                ...b,
-            };
+            return mergeWhereClauses(a, b);
         }
         if (Array.isArray(a) && !Array.isArray(b)) {
-            return a.map((x) => ({
-                ...x,
-                ...b,
-            }));
+            return a.map((x) => mergeWhereClauses(x, b));
         }
         if (!Array.isArray(a) && Array.isArray(b)) {
-            return b.map((x) => ({
-                ...a,
-                ...x,
-            }));
+            return b.map((x) => mergeWhereClauses(a, x));
         }
         return {
             ...a,