@ackplus/nest-crud-request 0.1.18 → 0.1.20

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ackplus/nest-crud-request",
-  "version": "0.1.18",
+  "version": "0.1.20",
   "type": "commonjs",
   "main": "./src/index.js",
   "types": "./src/index.d.ts",

package/src/lib/where-builder.d.ts

@@ -14,4 +14,5 @@ export declare class WhereBuilder {
     toJson(): string;
     private parseCondition;
     private updateCondition;
+    private mergeConditions;
 }

package/src/lib/where-builder.js

@@ -98,11 +98,32 @@ class WhereBuilder {
     }
     updateCondition(condition, type) {
         if (type === null) {
-            this.whereObject = Object.assign(Object.assign({}, this.whereObject), condition);
+            this.mergeConditions(this.whereObject, condition);
         }
         else {
             this.whereObject[type] = [...(this.whereObject[type] || []), condition].filter(Boolean);
         }
     }
+    mergeConditions(target, source) {
+        for (const key in source) {
+            const sourceValue = source[key];
+            if (key === '$and' || key === '$or') {
+                if (target[key]) {
+                    target[key] = [...(target[key] || []), ...(Array.isArray(sourceValue) ? sourceValue : [sourceValue])];
+                }
+                else {
+                    target[key] = Array.isArray(sourceValue) ? sourceValue : [sourceValue];
+                }
+            }
+            else {
+                if (target[key] && typeof target[key] === 'object' && typeof sourceValue === 'object') {
+                    target[key] = Object.assign(Object.assign({}, target[key]), sourceValue);
+                }
+                else {
+                    target[key] = sourceValue;
+                }
+            }
+        }
+    }
 }
 exports.WhereBuilder = WhereBuilder;