@resolveio/server-lib 12.6.5 → 12.6.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@resolveio/server-lib",
-  "version": "12.6.5",
+  "version": "12.6.7",
   "description": "",
   "scripts": {
     "package": "npm run build-prod && npm pack ./dist",
@@ -13,6 +13,7 @@
   "dependencies": {
     "@aws-sdk/client-s3": "3.435.0",
     "@aws-sdk/s3-request-presigner": "3.435.0",
+    "async": "3.2.4",
     "axios": "1.5.1",
     "body-parser": "1.20.2",
     "clone": "2.1.2",

package/util/common.d.ts

@@ -16,8 +16,8 @@ export declare function mergeUpdates(...updatesToMerge: any[]): {
     $pull: {};
 };
 export declare function getDeepDiff(doc1: any, doc2: any): any;
-export declare function deepDiffDetails(obj1: Object, obj2: Object): string;
 export declare function applyMongoUpdate(uDoc: any, delta: any): any;
+export declare function deepDiffDetails(obj1: Object, obj2: Object): string;
 export declare function getBinarySize(string: any): number;
 export declare function pad(num: any, size: any): string;
 export declare function randomString(length: any, chars: any): string;

package/util/common.js

@@ -9,7 +9,7 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
     return to.concat(ar || Array.prototype.slice.call(from));
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.mergeDeep = exports.isObject = exports.toTitleCase = exports.randomString = exports.pad = exports.getBinarySize = exports.applyMongoUpdate = exports.deepDiffDetails = exports.getDeepDiff = exports.mergeUpdates = exports.getMongoMergeUpdatedDoc = exports.getMongoUpdates = exports.dateReviver = exports.deepCopy = exports.floorPrecision = exports.roundPrecision = exports.throwErr = exports.buildRbLookups = exports.buildRbSchema = void 0;
+exports.mergeDeep = exports.isObject = exports.toTitleCase = exports.randomString = exports.pad = exports.getBinarySize = exports.deepDiffDetails = exports.applyMongoUpdate = exports.getDeepDiff = exports.mergeUpdates = exports.getMongoMergeUpdatedDoc = exports.getMongoUpdates = exports.dateReviver = exports.deepCopy = exports.floorPrecision = exports.roundPrecision = exports.throwErr = exports.buildRbLookups = exports.buildRbSchema = void 0;
 var rusDiff = require('rus-diff');
 var deepDiff = require('deep-diff').diff;
 var deep_object_diff_1 = require("deep-object-diff");
@@ -195,58 +195,46 @@ function mergeUpdates() {
         $push: {},
         $pull: {}
     };
-    updatesToMerge.filter(function (a) { return a; }).forEach(function (anUpdate) {
+    updatesToMerge.filter(Boolean).forEach(function (anUpdate) {
         anUpdate.forEach(function (change) {
-            var path = change.path[0];
-            for (var i = 1; i < change.path.length; i++) {
-                path += '.' + change.path[i];
-            }
-            if (change.kind === 'E') {
-                if (typeof (change.rhs) === 'number' && path.endsWith('quantity')) {
-                    if (merged.$inc[path]) {
-                        merged.$inc[path] += change.rhs - change.lhs;
-                    }
-                    else {
-                        merged.$inc[path] = change.rhs - change.lhs;
-                    }
-                }
-                else {
-                    merged.$set[path] = change.rhs;
-                }
-            }
-            else if (change.kind === 'A') {
-                if (change.item.kind === 'N') {
-                    if (!merged.$push[path] || JSON.stringify(merged.$push[path]) !== JSON.stringify(change.item.rhs)) {
-                        if (!merged.$push[path]) {
-                            merged.$push[path] = [];
-                        }
-                        if (!merged.$push[path].filter(function (a) { return JSON.stringify(a) === JSON.stringify(change.item.rhs); }).length) {
-                            merged.$push[path].push(change.item.rhs);
-                        }
-                    }
-                }
-                else if (change.item.kind === 'D') {
-                    if (!merged.$pull[path] || JSON.stringify(merged.$pull[path]) !== JSON.stringify(change.item.lhs)) {
-                        if (!merged.$pull[path]) {
-                            merged.$pull[path] = [];
-                        }
-                        if (!merged.$pull[path].filter(function (a) { return JSON.stringify(a) === JSON.stringify(change.item.lhs); }).length) {
-                            merged.$pull[path].push(change.item.lhs);
-                        }
-                    }
-                }
-                else if (change.item.kind === 'E') {
-                    console.log('Condition E not satisfied.');
-                    // if (!merged.$pull[path] || JSON.stringify(merged.$pull[path]) !== JSON.stringify(change.item.lhs)) {
-                    // 	merged.$pull[path] = change.item.lhs;
-                    // }
-                }
+            var path = change.path.join('.');
+            switch (change.kind) {
+                case 'E':
+                    handleEditedChange(merged, path, change);
+                    break;
+                case 'A':
+                    handleArrayChange(merged, path, change);
+                    break;
+                default:
+                    break;
             }
         });
     });
     return merged;
 }
 exports.mergeUpdates = mergeUpdates;
+function handleEditedChange(merged, path, change) {
+    if (typeof (change.rhs) === 'number' && (path.includes('quantity') || path.includes('qty'))) {
+        merged.$inc[path] = (merged.$inc[path] || 0) + change.rhs - change.lhs;
+    }
+    else {
+        merged.$set[path] = change.rhs;
+    }
+}
+function handleArrayChange(merged, path, change) {
+    if (change.item.kind === 'N') {
+        merged.$push[path] = merged.$push[path] || [];
+        if (!merged.$push[path].some(function (a) { return JSON.stringify(a) === JSON.stringify(change.item.rhs); })) {
+            merged.$push[path].push(change.item.rhs);
+        }
+    }
+    else if (change.item.kind === 'D') {
+        merged.$pull[path] = merged.$pull[path] || [];
+        if (!merged.$pull[path].some(function (a) { return JSON.stringify(a) === JSON.stringify(change.item.lhs); })) {
+            merged.$pull[path].push(change.item.lhs);
+        }
+    }
+}
 function getDeepDiff(doc1, doc2) {
     delete doc1._id;
     delete doc1.__v;
@@ -267,10 +255,167 @@ function getDeepDiff(doc1, doc2) {
     return deepDiff(doc1, doc2);
 }
 exports.getDeepDiff = getDeepDiff;
+function applyMongoUpdate(uDoc, delta) {
+    var orig = deepCopy(uDoc);
+    if (delta) {
+        if (delta.$rename)
+            handleRename(uDoc, delta.$rename);
+        if (delta.$set)
+            handleSet(uDoc, delta.$set);
+        if (delta.$inc)
+            handleInc(uDoc, delta.$inc);
+        if (delta.$unset)
+            handleUnset(uDoc, delta.$unset);
+        if (delta.$pull)
+            handlePull(uDoc, orig, delta.$pull);
+        if (delta.$push)
+            handlePush(uDoc, delta.$push);
+    }
+    return uDoc;
+}
+exports.applyMongoUpdate = applyMongoUpdate;
+function handleRename(uDoc, renameMap) {
+    for (var k in renameMap) {
+        var v = renameMap[k];
+        var _a = resolve(uDoc, k), o1 = _a[0], n1 = _a[1];
+        var _b = resolve(uDoc, v), o2 = _b[0], n2 = _b[1];
+        if (o1 && n1.length === 1) {
+            if (o2 && n2.length === 1) {
+                o2[n2[0]] = o1[n1[0]];
+                delete o1[n1[0]];
+            }
+            else {
+                logError(o2, n2, uDoc, v);
+            }
+        }
+        else {
+            logError(o1, n1, uDoc, k);
+        }
+    }
+}
+function handleSet(uDoc, setMap) {
+    for (var k in setMap) {
+        var v = setMap[k];
+        var _a = resolve(uDoc, k, { force: true }), o = _a[0], n = _a[1];
+        if (o && n.length === 1) {
+            o[n[0]] = v;
+        }
+        else {
+            logError(o, n, uDoc, k);
+        }
+    }
+}
+function handleInc(uDoc, incMap) {
+    for (var k in incMap) {
+        var v = incMap[k];
+        var _a = resolve(uDoc, k, { force: true }), o = _a[0], n = _a[1];
+        if (o && n.length === 1) {
+            o[n[0]] = (o[n[0]] || 0) + v;
+        }
+        else {
+            logError(o, n, uDoc, k);
+        }
+    }
+}
+function handleUnset(uDoc, unsetMap) {
+    for (var k in unsetMap) {
+        var _a = resolve(uDoc, k), o = _a[0], n = _a[1];
+        if (o && n.length === 1) {
+            delete o[n[0]];
+        }
+        else {
+            logError(o, n, uDoc, k);
+        }
+    }
+}
+function handlePull(uDoc, orig, pullMap) {
+    for (var pathk in pullMap) {
+        var pullValues = pullMap[pathk];
+        var _loop_1 = function (vk) {
+            var _a = resolve(uDoc, pathk), o = _a[0], n = _a[1];
+            var _b = resolve(orig, pathk), o2 = _b[0], n2 = _b[1];
+            if (o && n.length === 1) {
+                o[n[0]].splice(o2[n2[0]].findIndex(function (z) { return JSON.stringify(z) === JSON.stringify(vk); }), 1);
+            }
+            else {
+                logError(o, n, uDoc, pathk);
+            }
+        };
+        for (var _i = 0, pullValues_1 = pullValues; _i < pullValues_1.length; _i++) {
+            var vk = pullValues_1[_i];
+            _loop_1(vk);
+        }
+    }
+}
+function handlePush(uDoc, pushMap) {
+    for (var pathk in pushMap) {
+        var pushValues = pushMap[pathk];
+        for (var _i = 0, pushValues_1 = pushValues; _i < pushValues_1.length; _i++) {
+            var vk = pushValues_1[_i];
+            var _a = resolve(uDoc, pathk), o = _a[0], n = _a[1];
+            if (o && n.length === 1) {
+                o[n[0]].push(vk);
+            }
+            else {
+                logError(o, n, uDoc, pathk);
+            }
+        }
+    }
+}
+function logError(o, n, uDoc, key) {
+    console.log('Error', o + '/' + n + ' - couldn\'t resolve for ' + JSON.stringify(uDoc) + ' ' + key);
+}
+function resolve(a, path, options) {
+    if (options === void 0) { options = {}; }
+    var stack = arrize(path);
+    var last = [];
+    if (stack.length > 0) {
+        last.unshift(stack.pop());
+    }
+    var e = a;
+    while (stack.length > 0) {
+        var k = stack.shift();
+        if (e[k] !== void 0) {
+            e = e[k];
+        }
+        else {
+            if (!options.force) {
+                last.unshift(k);
+                last = stack.concat(last);
+                break;
+            }
+            var isNextNum = typeof stack[0] === 'number';
+            var isLastNum = stack.length === 0 && typeof last[0] === 'number';
+            e[k] = isNextNum || isLastNum ? [] : {};
+            e = e[k];
+        }
+    }
+    return [e, last];
+}
+function arrize(path, glue) {
+    if (glue === void 0) { glue = '.'; }
+    if (Array.isArray(path)) {
+        return path.slice();
+    }
+    if (path === void 0 || path === null || path === false || path === '') {
+        return [];
+    }
+    return path.toString().split(glue)
+        .map(function (e) {
+        if ([void 0, null, false, ''].includes(e)) {
+            return null;
+        }
+        return e.toString();
+    })
+        .filter(function (e) { return e !== null; });
+}
 function deepDiffDetails(obj1, obj2) {
     var diff = (0, deep_object_diff_1.detailedDiff)(obj2, obj1);
     var diffString = '';
     var formatObjectDiff = function (obj1, obj2) {
+        if (typeof obj1 === 'string' && typeof obj2 === 'string') {
+            return "from: \"".concat(obj1, "\" to: \"").concat(obj2, "\"");
+        }
         if (!obj1 || !obj2)
             return '';
         return Object.keys(obj1)
@@ -305,200 +450,6 @@ function deepDiffDetails(obj1, obj2) {
     return diffString;
 }
 exports.deepDiffDetails = deepDiffDetails;
-function applyMongoUpdate(uDoc, delta) {
-    var orig, k, pathk, vk, n, n1, n2, name, o, o1, o2, ref, ref1, ref2, ref3, ref4, ref5, ref6, ref7, ref8, ref9a, ref9b, ref10, ref11, ref12a, ref12b, ref13, v;
-    orig = deepCopy(uDoc);
-    if (delta != null) {
-        if (delta.$rename != null) {
-            ref = delta.$rename;
-            // tslint:disable-next-line:forin
-            for (k in ref) {
-                v = ref[k];
-                ref1 = resolve(uDoc, k), o1 = ref1[0], n1 = ref1[1];
-                ref2 = resolve(uDoc, v), o2 = ref2[0], n2 = ref2[1];
-                if ((o1 != null) && n1.length === 1) {
-                    if ((o2 != null) && n2.length === 1) {
-                        o2[n2[0]] = o1[n1[0]];
-                        delete o1[n1[0]];
-                    }
-                    else {
-                        // throw new Error(o2 + '/' + n2 + ' - couldn\'t resolve first for ' + uDoc + ' ' + v);
-                        console.log('Error', o2 + '/' + n2 + ' - couldn\'t resolve first for ' + uDoc + ' ' + v);
-                    }
-                }
-                else {
-                    // throw new Error(o1 + '/' + n1 + ' - couldn\'t resolve second for ' + uDoc + ' ' + k);
-                    console.log('Error', o1 + '/' + n1 + ' - couldn\'t resolve second for ' + uDoc + ' ' + k);
-                }
-            }
-        }
-        if (delta.$set != null) {
-            ref3 = delta.$set;
-            // tslint:disable-next-line:forin
-            for (k in ref3) {
-                v = ref3[k];
-                ref4 = resolve(uDoc, k, {
-                    force: true
-                }), o = ref4[0], n = ref4[1];
-                if ((o != null) && n.length === 1) {
-                    o[n[0]] = v;
-                }
-                else {
-                    // throw new Error(o + '/' + n + ' - couldn\'t set for ' + uDoc + ' ' + k);
-                    console.log('Error', o + '/' + n + ' - couldn\'t set for ' + uDoc + ' ' + k);
-                }
-            }
-        }
-        if (delta.$inc != null) {
-            ref5 = delta.$inc;
-            // tslint:disable-next-line:forin
-            for (k in ref5) {
-                v = ref5[k];
-                ref6 = resolve(uDoc, k, {
-                    force: true
-                }), o = ref6[0], n = ref6[1];
-                if ((o != null) && n.length === 1) {
-                    if (o[name = n[0]] == null) {
-                        o[name] = 0;
-                    }
-                    o[n[0]] += v;
-                }
-                else {
-                    // throw new Error(o + '/' + n + ' - couldn\'t set for ' + uDoc + ' ' + k);
-                    console.log('Error', o + '/' + n + ' - couldn\'t set for ' + uDoc + ' ' + k);
-                }
-            }
-        }
-        if (delta.$unset != null) {
-            ref7 = delta.$unset;
-            // tslint:disable-next-line:forin
-            for (k in ref7) {
-                v = ref7[k];
-                ref8 = resolve(uDoc, k), o = ref8[0], n = ref8[1];
-                if ((o != null) && n.length === 1) {
-                    delete o[n[0]];
-                }
-                else {
-                    // throw new Error(o + '/' + n + ' - couldn\'t unset for ' + uDoc + ' ' + k);
-                    console.log('Error', o + '/' + n + ' - couldn\'t unset for ' + uDoc + ' ' + k);
-                }
-            }
-        }
-        if (delta.$pull != null) {
-            ref9a = delta.$pull;
-            // tslint:disable-next-line:forin
-            for (pathk in ref9a) { // should only loop 1 time
-                ref9b = ref9a[pathk];
-                for (var kk = (ref9b.length - 1); kk >= 0; kk--) {
-                    vk = ref9b[kk];
-                    ref10 = resolve(uDoc, pathk), o = ref10[0], n = ref10[1];
-                    ref11 = resolve(orig, pathk), o2 = ref11[0], n2 = ref11[1];
-                    if ((o != null) && n.length === 1) {
-                        o[n[0]].splice(o2[n2[0]].findIndex(function (z) { return JSON.stringify(z) === JSON.stringify(vk); }), 1);
-                    }
-                    else {
-                        // throw new Error(o + '/' + n + ' - couldn\'t unset for ' + uDoc + ' ' + pathk);
-                        console.log('Error', o + '/' + n + ' - couldn\'t unset for ' + uDoc + ' ' + pathk);
-                    }
-                }
-            }
-        }
-        if (delta.$push != null) {
-            ref12a = delta.$push;
-            // tslint:disable-next-line:forin
-            for (pathk in ref12a) { // should only loop 1 time
-                ref12b = ref12a[pathk];
-                // for (let kk = 0; kk < ref12b.length; kk++) {
-                for (var kk = (ref12b.length - 1); kk >= 0; kk--) {
-                    vk = ref12b[kk];
-                    ref13 = resolve(uDoc, pathk), o = ref13[0], n = ref13[1];
-                    if ((o != null) && n.length === 1) {
-                        o[n[0]].push(vk);
-                    }
-                    else {
-                        // throw new Error(o + '/' + n + ' - couldn\'t unset for ' + uDoc + ' ' + pathk);
-                        console.log('Error', o + '/' + n + ' - couldn\'t unset for ' + uDoc + ' ' + pathk);
-                    }
-                }
-            }
-        }
-    }
-    return uDoc;
-}
-exports.applyMongoUpdate = applyMongoUpdate;
-function resolve(a, path, options) {
-    var e, k, last, stack;
-    if (options == null) {
-        options = {};
-    }
-    stack = arrize(path);
-    last = [];
-    if (stack.length > 0) {
-        last.unshift(stack.pop());
-    }
-    e = a;
-    if (e !== null) {
-        while ((k = stack.shift()) !== void 0) {
-            if (e[k] !== void 0) {
-                e = e[k];
-            }
-            else {
-                stack.unshift(k);
-                break;
-            }
-        }
-    }
-    if (options.force) {
-        while ((k = stack.shift()) !== void 0) {
-            if ((typeof stack[0] === 'number') || ((stack.length === 0) && (typeof last[0] === 'number'))) {
-                e[k] = [];
-            }
-            else {
-                e[k] = {};
-            }
-            e = e[k];
-        }
-    }
-    else {
-        while ((k = stack.pop()) !== void 0) {
-            last.unshift(k);
-        }
-    }
-    return [e, last];
-}
-function arrize(path, glue) {
-    if (glue == null) {
-        glue = '.';
-    }
-    return ((function () {
-        if (Array.isArray(path)) {
-            return path.slice(0);
-        }
-        else {
-            switch (path) {
-                case void 0:
-                case null:
-                case false:
-                case '':
-                    return [];
-                default:
-                    return path.toString().split(glue);
-            }
-        }
-    })()).map(function (e) {
-        switch (e) {
-            case void 0:
-            case null:
-            case false:
-            case '':
-                return null;
-            default:
-                return e.toString();
-        }
-    }).filter(function (e) {
-        return e != null;
-    });
-}
 function getBinarySize(string) {
     if (string) {
         return Buffer.byteLength(string, 'utf8');