datum-merge 0.9.5 → 0.9.8

package/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2024 Rohit Kulkarni
+Copyright (c) 2024-2025 Rohit Kulkarni
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/README.md

@@ -31,7 +31,10 @@ const changed = detailMerge(target, source, {
     mykey: UpdateCode.I,
     myarr: UpdateCode.XM,
     anobj: UpdateCode.B,
-    myobj: { myid: UpdateCode.I },
+    myobj: {
+        myid: UpdateCode.I,
+        vals: UpdateCode.XR,
+    },
 });
 ```
 
@@ -55,7 +58,7 @@ const diff = customMerge(target, source, conf);
 
 ## Upcoming Features
 
-1. inline the unmaintained [deep-diff](https://github.com/flitbit/diff) library which contains serious bugs. (available)
+1. inline the [deep-diff](https://github.com/flitbit/diff) library which unmaintained and buggy. ([available](/src/diff-lib/README.md))
 
 2. formalize config schema for deeply nested objects (for v1).
 
@@ -92,9 +95,9 @@ The value is migrated from the source field to the target field only if the pred
 | I | `sX & t0` | insert only, no update or delete |
 | D | `s0 & tX` | delete only, no update or insert |
 | XR | `sX & tX` | full vector replacement |
-| XM | `s ∪ t`   | set union, vector merge |
+| XM | `t ∪ s`   | set union, vector merge |
 | XD | `t - s`   | set difference, delete given values |
-| XI | `s ∩ t`   | set intersection, delete missing values |
+| XI | `t ∩ s`   | set intersection, delete missing values |
 | XS | `t + s` | preserve order insert (allows dupes) |
 | XF | `s + t` | insert from start (allows dupes) |
 

package/dist/cjs/datum-utils.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.selectGlobKeys = exports.createGlobRegex = exports.areArraysEqual = exports.toUniqueArray = exports.deepClone = exports.deepEqualsPath = exports.deepEquals = exports.createValueKeys = exports.getObjectKeys = void 0;
+exports.selectObjKeys = exports.getGlobKeys = exports.createGlobRegex = exports.areArraysEqual = exports.toUniqueArray = exports.deepClone = exports.deepEqualsPath = exports.deepEquals = exports.createValueKeys = exports.getObjectKeys = void 0;
 const lodash_es_1 = require("lodash-es");
 const fast_deep_equal_1 = __importDefault(require("fast-deep-equal"));
 function getObjectKeys(obj, excludeKeys, includeKeys) {
@@ -58,21 +58,36 @@ function areArraysEqual(arr1, arr2) {
 }
 exports.areArraysEqual = areArraysEqual;
 function createGlobRegex(search) {
-    let pattern = search.replace(/\*/g, ".+");
+    const pattern = search.replace(/\*/g, ".+");
     return new RegExp(`^${pattern}$`);
 }
 exports.createGlobRegex = createGlobRegex;
-function selectGlobKeys(obj, includePats = ["*"], excludeKeys) {
+function getGlobKeys(obj, includePats = ["*"], excludeKeys) {
     const includeKeys = [];
     if (!obj || !(includePats === null || includePats === void 0 ? void 0 : includePats.length)) {
         return includeKeys;
     }
-    const globPats = includePats.map((g) => createGlobRegex(g));
-    for (const label of getObjectKeys(obj, excludeKeys)) {
-        if (globPats.findIndex((r) => r.test(label)) >= 0) {
+    const labels = getObjectKeys(obj, excludeKeys);
+    if (!labels || !labels.length) {
+        return includeKeys;
+    }
+    const globPats = includePats.filter((s) => s.includes("*"))
+        .map((g) => createGlobRegex(g));
+    for (const label of labels) {
+        if (includePats.includes(label)) {
+            includeKeys.push(label);
+        }
+        else if (globPats.findIndex((r) => r.test(label)) >= 0) {
             includeKeys.push(label);
         }
     }
     return includeKeys;
 }
-exports.selectGlobKeys = selectGlobKeys;
+exports.getGlobKeys = getGlobKeys;
+function selectObjKeys(obj, includeKeys) {
+    if (!(includeKeys === null || includeKeys === void 0 ? void 0 : includeKeys.length))
+        return Object.assign({}, obj);
+    return Object.fromEntries(Object.entries(obj)
+        .filter(([k, _]) => includeKeys.includes(k)));
+}
+exports.selectObjKeys = selectObjKeys;

package/dist/cjs/diff-high.js

@@ -1,15 +1,22 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.unflattenObject = exports.flattenObject = exports.deepDiffFlat = exports.deepDiffLow = exports.deepDiffTyped = void 0;
+exports.unflattenObject = exports.flattenObject = exports.deepDiffFlat = exports.deepDiffLow = exports.antiDiffTyped = exports.deepDiffTyped = void 0;
+const type_utils_1 = require("./type-utils");
 const deep_diff_1 = require("./diff-lib/deep-diff");
 function deepDiffTyped(lhsObj, rhsObj, orderInd = false) {
+    if ((0, type_utils_1.emptyObject)(rhsObj)) {
+        return {};
+    }
+    if ((0, type_utils_1.emptyObject)(lhsObj)) {
+        return Object.assign({}, rhsObj);
+    }
     const differences = deepDiffLow(lhsObj, rhsObj, orderInd);
     const deltaObj = {};
     if (!differences) {
         return deltaObj;
     }
     for (const difference of differences) {
-        (0, deep_diff_1.applyChange)(deltaObj, null, difference);
+        (0, deep_diff_1.applyChange)(deltaObj, undefined, difference);
     }
     cleanupObjArrays(deltaObj);
     return deltaObj;
@@ -24,6 +31,24 @@ function cleanupObjArrays(obj) {
         }
     }
 }
+function antiDiffTyped(lhsObj, rhsObj, orderInd = false) {
+    if ((0, type_utils_1.emptyObject)(lhsObj) || (0, type_utils_1.emptyObject)(rhsObj)) {
+        return {};
+    }
+    const differences = deepDiffLow(lhsObj, rhsObj, orderInd);
+    if (!differences) {
+        return Object.assign({}, lhsObj);
+    }
+    const modFields = new Set();
+    differences.map((d) => d === null || d === void 0 ? void 0 : d.path)
+        .filter((p) => !!p && p.length > 0)
+        .map((p) => (p === null || p === void 0 ? void 0 : p[0]).toString())
+        .forEach((s) => modFields.add(s));
+    const shareObj = Object.fromEntries(Object.entries(lhsObj)
+        .filter(([k, _]) => !modFields.has(k)));
+    return shareObj;
+}
+exports.antiDiffTyped = antiDiffTyped;
 function deepDiffLow(lhsObj, rhsObj, orderInd = false) {
     const differences = !orderInd
         ? (0, deep_diff_1.diff)(lhsObj, rhsObj)

package/dist/cjs/diff-lib/deep-diff.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getOrderIndependentHash = exports.realTypeOf = exports.applyDiff = exports.revertChange = exports.applyChange = exports.orderIndependentObservableDiff = exports.observableDiff = exports.accumulateDiff = exports.orderIndependentDiff = exports.diff = void 0;
+exports.getOrderIndependentHash = exports.realTypeOf = exports.applyDiff = exports.revertChange = exports.applyChange = exports.orderIndependentDeepDiff = exports.observableDiff = exports.accumulateDiff = exports.orderIndependentDiff = exports.diff = void 0;
 const typeNormalizer = {
     normalize: function (currentPath, key, lhs, rhs) {
         if (realTypeOf(lhs) === 'regexp' && realTypeOf(rhs) === 'regexp') {
@@ -21,14 +21,13 @@ function diff(lhs, rhs, prefilter) {
 }
 exports.diff = diff;
 function orderIndependentDiff(lhs, rhs, prefilter) {
-    const changes = [];
-    deepDiff(lhs, rhs, changes, prefilter, null, null, null, true);
+    const changes = observableDiff(lhs, rhs, undefined, prefilter, true);
     return (changes === null || changes === void 0 ? void 0 : changes.length) ? changes : undefined;
 }
 exports.orderIndependentDiff = orderIndependentDiff;
 function observableDiff(lhs, rhs, observer, prefilter, orderIndependent) {
     const changes = [];
-    deepDiff(lhs, rhs, changes, prefilter, null, null, null, orderIndependent);
+    deepDiff(lhs, rhs, changes, prefilter, undefined, undefined, undefined, orderIndependent);
     if (observer) {
         changes.forEach((c) => observer(c));
     }
@@ -46,10 +45,10 @@ function accumulateDiff(lhs, rhs, prefilter, accum, orderIndependent) {
     return accum ? accum : (changes.length) ? changes : undefined;
 }
 exports.accumulateDiff = accumulateDiff;
-function orderIndependentObservableDiff(lhs, rhs, changes, prefilter, path, key, stack) {
+function orderIndependentDeepDiff(lhs, rhs, changes, prefilter, path, key, stack) {
     deepDiff(lhs, rhs, changes, prefilter, path, key, stack, true);
 }
-exports.orderIndependentObservableDiff = orderIndependentObservableDiff;
+exports.orderIndependentDeepDiff = orderIndependentDeepDiff;
 function deepDiff(lhs, rhs, changes, prefilter, path, key, stack, orderIndependent = false) {
     changes = changes || [];
     path = path || [];
@@ -82,11 +81,11 @@ function deepDiff(lhs, rhs, changes, prefilter, path, key, stack, orderIndepende
     const ltype = typeof lhs;
     const rtype = typeof rhs;
     const ldefined = ltype !== 'undefined' ||
-        (stack && (stack.length > 0) && stack[stack.length - 1].lhs &&
-            Object.getOwnPropertyDescriptor(stack[stack.length - 1].lhs, key));
+        (stack && (stack.length > 0) && stack.at(-1).lhs &&
+            Object.getOwnPropertyDescriptor(stack.at(-1).lhs, key));
     const rdefined = rtype !== 'undefined' ||
-        (stack && (stack.length > 0) && stack[stack.length - 1].rhs &&
-            Object.getOwnPropertyDescriptor(stack[stack.length - 1].rhs, key));
+        (stack && (stack.length > 0) && stack.at(-1).rhs &&
+            Object.getOwnPropertyDescriptor(stack.at(-1).rhs, key));
     if (!ldefined && rdefined) {
         changes.push({
             kind: 'N',
@@ -120,12 +119,11 @@ function deepDiff(lhs, rhs, changes, prefilter, path, key, stack, orderIndepende
             lhs,
             rhs
         });
-        new Date();
+        return;
     }
-    else if (ltype === 'object' && lhs !== null && rhs !== null) {
-        let i, j;
+    if (ltype === 'object' && lhs !== null && rhs !== null) {
         let other = false;
-        for (i = stack.length - 1; i > -1; --i) {
+        for (let i = stack.length - 1; i > -1; --i) {
             if (stack[i].lhs === lhs) {
                 other = true;
                 break;
@@ -134,22 +132,24 @@ function deepDiff(lhs, rhs, changes, prefilter, path, key, stack, orderIndepende
         if (!other) {
             stack.push({ lhs: lhs, rhs: rhs });
             if (Array.isArray(lhs) && Array.isArray(rhs)) {
-                i = rhs.length - 1;
-                j = lhs.length - 1;
+                let lArr = lhs;
+                let rArr = rhs;
                 if (orderIndependent) {
-                    lhs = lhs.slice().sort(function (a, b) {
+                    lArr = lArr.slice(0).sort(function (a, b) {
                         return getOrderIndependentHash(a) - getOrderIndependentHash(b);
                     });
-                    rhs = rhs.slice().sort(function (a, b) {
+                    rArr = rArr.slice(0).sort(function (a, b) {
                         return getOrderIndependentHash(a) - getOrderIndependentHash(b);
                     });
                 }
+                let i = rArr.length - 1;
+                let j = lArr.length - 1;
                 while (i > j) {
                     changes.push({
                         kind: 'A',
                         path: currentPath,
                         index: i,
-                        item: { kind: 'N', rhs: rhs[i--] },
+                        item: { kind: 'N', rhs: rArr[i--], path: undefined },
                     });
                 }
                 while (j > i) {
@@ -157,31 +157,33 @@ function deepDiff(lhs, rhs, changes, prefilter, path, key, stack, orderIndepende
                         kind: 'A',
                         path: currentPath,
                         index: j,
-                        item: { kind: 'D', lhs: lhs[j--] },
+                        item: { kind: 'D', lhs: lArr[j--], path: undefined },
                     });
                 }
                 for (; i >= 0; --i) {
-                    deepDiff(lhs[i], rhs[i], changes, prefilter, currentPath, i, stack, orderIndependent);
+                    deepDiff(lArr[i], rArr[i], changes, prefilter, currentPath, i, stack, orderIndependent);
                 }
             }
             else {
-                const akeys = [...Object.keys(lhs), ...Object.getOwnPropertySymbols(lhs)];
-                const pkeys = [...Object.keys(rhs), ...Object.getOwnPropertySymbols(rhs)];
-                for (i = 0; i < akeys.length; ++i) {
+                const lObj = lhs;
+                const rObj = rhs;
+                const akeys = [...Object.keys(lObj), ...Object.getOwnPropertySymbols(lObj)];
+                const pkeys = [...Object.keys(rObj), ...Object.getOwnPropertySymbols(rObj)];
+                for (let i = 0; i < akeys.length; ++i) {
                     const k = akeys[i];
                     const ki = pkeys.indexOf(k);
                     if (ki >= 0) {
-                        deepDiff(lhs[k], rhs[k], changes, prefilter, currentPath, k, stack, orderIndependent);
+                        deepDiff(lObj[k], rObj[k], changes, prefilter, currentPath, k, stack, orderIndependent);
                         pkeys[ki] = null;
                     }
                     else {
-                        deepDiff(lhs[k], undefined, changes, prefilter, currentPath, k, stack, orderIndependent);
+                        deepDiff(lObj[k], undefined, changes, prefilter, currentPath, k, stack, orderIndependent);
                     }
                 }
-                for (i = 0; i < pkeys.length; ++i) {
+                for (let i = 0; i < pkeys.length; ++i) {
                     const k = pkeys[i];
                     if (k) {
-                        deepDiff(undefined, rhs[k], changes, prefilter, currentPath, k, stack, orderIndependent);
+                        deepDiff(undefined, rObj[k], changes, prefilter, currentPath, k, stack, orderIndependent);
                     }
                 }
             }
@@ -209,18 +211,18 @@ function deepDiff(lhs, rhs, changes, prefilter, path, key, stack, orderIndepende
 }
 function applyDiff(target, source, filter) {
     if (!target || !source) {
-        return;
+        return target;
     }
     const onChange = function (change) {
         if (!filter || filter(target, source, change)) {
-            applyChange(target, source, change);
+            applyChange(target, undefined, change);
         }
     };
     observableDiff(target, source, onChange);
     return target;
 }
 exports.applyDiff = applyDiff;
-function applyChange(target, source, change) {
+function applyChange(target, unused, change) {
     var _a;
     if (!target || !change || !change.kind) {
         return;
@@ -255,10 +257,10 @@ function applyChange(target, source, change) {
 exports.applyChange = applyChange;
 function applyArrayChange(arr, index, change) {
     if (change.path && change.path.length > 0) {
-        const u = change.path.length - 1;
+        const last = change.path.length - 1;
         let it = arr[index];
         let i;
-        for (i = 0; i < u; i++) {
+        for (i = 0; i < last; i++) {
             it = it[change.path[i]];
         }
         switch (change.kind) {
@@ -290,7 +292,7 @@ function applyArrayChange(arr, index, change) {
     }
     return arr;
 }
-function revertChange(target, source, change) {
+function revertChange(target, unused, change) {
     var _a;
     if (!target || !change || !change.kind) {
         return;
@@ -323,10 +325,10 @@ function revertChange(target, source, change) {
 exports.revertChange = revertChange;
 function revertArrayChange(arr, index, change) {
     if (change.path && change.path.length > 0) {
-        const u = change.path.length - 1;
+        const last = change.path.length - 1;
         let it = arr[index];
         let i;
-        for (i = 0; i < u; i++) {
+        for (i = 0; i < last; i++) {
             it = it[change.path[i]];
         }
         switch (change.kind) {

package/dist/cjs/index.js

@@ -14,7 +14,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.deepDiff = exports.mergeDiff = exports.merge = exports.deepPatchLog = exports.asLodashPath = exports.diffToPatchLog = exports.immutableCustomMerge = exports.customMerge = exports.fillUpdateCodes = exports.immutableDetailMerge = exports.detailMerge = exports.diffFromMerge = exports.immutableDeepMerge = exports.deepMerge = exports.immutableMerge = exports.shallowMerge = exports.updateCodeInfo = exports.MC = exports.UpdateCode = exports.unflattenObject = exports.flattenObject = exports.deepDiffFlat = exports.deepDiffTyped = exports.deepDiffLow = exports.deepClone = exports.deepEquals = void 0;
+exports.deepDiff = exports.mergeDiff = exports.merge = exports.deepPatchLog = exports.asLodashPath = exports.diffToPatchLog = exports.bypassMerge = exports.immutableCustomMerge = exports.customMerge = exports.fillUpdateCodes = exports.immutableDetailMerge = exports.detailMerge = exports.diffFromMerge = exports.immutableDeepMerge = exports.deepMerge = exports.immutableMerge = exports.shallowMerge = exports.updateCodeInfo = exports.MC = exports.UpdateCode = exports.unflattenObject = exports.flattenObject = exports.deepDiffFlat = exports.antiDiffTyped = exports.deepDiffTyped = exports.deepDiffLow = exports.deepClone = exports.deepEquals = void 0;
 var datum_utils_1 = require("./datum-utils");
 Object.defineProperty(exports, "deepEquals", { enumerable: true, get: function () { return datum_utils_1.deepEquals; } });
 var datum_utils_2 = require("./datum-utils");
@@ -23,6 +23,7 @@ var diff_high_1 = require("./diff-high");
 Object.defineProperty(exports, "deepDiffLow", { enumerable: true, get: function () { return diff_high_1.deepDiffLow; } });
 var diff_high_2 = require("./diff-high");
 Object.defineProperty(exports, "deepDiffTyped", { enumerable: true, get: function () { return diff_high_2.deepDiffTyped; } });
+Object.defineProperty(exports, "antiDiffTyped", { enumerable: true, get: function () { return diff_high_2.antiDiffTyped; } });
 var diff_high_3 = require("./diff-high");
 Object.defineProperty(exports, "deepDiffFlat", { enumerable: true, get: function () { return diff_high_3.deepDiffFlat; } });
 var diff_high_4 = require("./diff-high");
@@ -50,6 +51,8 @@ Object.defineProperty(exports, "fillUpdateCodes", { enumerable: true, get: funct
 var merge_conf_3 = require("./merge-conf");
 Object.defineProperty(exports, "customMerge", { enumerable: true, get: function () { return merge_conf_3.customMerge; } });
 Object.defineProperty(exports, "immutableCustomMerge", { enumerable: true, get: function () { return merge_conf_3.immutableCustomMerge; } });
+var merge_conf_4 = require("./merge-conf");
+Object.defineProperty(exports, "bypassMerge", { enumerable: true, get: function () { return merge_conf_4.bypassMerge; } });
 var patch_low_1 = require("./patch-low");
 Object.defineProperty(exports, "diffToPatchLog", { enumerable: true, get: function () { return patch_low_1.diffToPatchLog; } });
 Object.defineProperty(exports, "asLodashPath", { enumerable: true, get: function () { return patch_low_1.asLodashPath; } });
@@ -57,8 +60,8 @@ var patch_low_2 = require("./patch-low");
 Object.defineProperty(exports, "deepPatchLog", { enumerable: true, get: function () { return patch_low_2.deepPatchLog; } });
 var merge_high_5 = require("./merge-high");
 Object.defineProperty(exports, "merge", { enumerable: true, get: function () { return merge_high_5.deepMerge; } });
-var merge_conf_4 = require("./merge-conf");
-Object.defineProperty(exports, "mergeDiff", { enumerable: true, get: function () { return merge_conf_4.customMerge; } });
+var merge_conf_5 = require("./merge-conf");
+Object.defineProperty(exports, "mergeDiff", { enumerable: true, get: function () { return merge_conf_5.customMerge; } });
 __exportStar(require("./diff-lib/deep-diff"), exports);
 var diff_high_5 = require("./diff-high");
 Object.defineProperty(exports, "deepDiff", { enumerable: true, get: function () { return diff_high_5.deepDiffLow; } });

package/dist/cjs/merge-conf.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.fillUpdateCodes = exports.immutableCustomMerge = exports.customMerge = exports.selectDetailKeys = exports.immutableDetailMerge = exports.detailMerge = void 0;
+exports.fillUpdateCodes = exports.immutableCustomMerge = exports.bypassMerge = exports.customMerge = exports.getDetailKeys = exports.immutableDetailMerge = exports.detailMerge = void 0;
 const type_utils_1 = require("./type-utils");
 const datum_utils_1 = require("./datum-utils");
 const diff_high_1 = require("./diff-high");
@@ -43,7 +43,7 @@ function immutableDetailMerge(target, source, mergeCodes) {
     return targetCopy;
 }
 exports.immutableDetailMerge = immutableDetailMerge;
-function selectDetailKeys(obj, mergeCodes, excludeKeys) {
+function getDetailKeys(obj, mergeCodes, excludeKeys) {
     const includeKeys = [];
     if (!obj || !mergeCodes) {
         return includeKeys;
@@ -57,7 +57,7 @@ function selectDetailKeys(obj, mergeCodes, excludeKeys) {
     }
     return includeKeys;
 }
-exports.selectDetailKeys = selectDetailKeys;
+exports.getDetailKeys = getDetailKeys;
 function customMerge(target, source, mergeConf, excludeKeys) {
     switch (mergeConf) {
         case merge_low_1.UpdateCode.C:
@@ -67,9 +67,7 @@ function customMerge(target, source, mergeConf, excludeKeys) {
         case merge_low_1.UpdateCode.N:
             return false;
         case merge_low_1.UpdateCode.Y:
-            const delta = (0, diff_high_1.deepDiffTyped)(target, source);
-            Object.assign(target, Object.assign({}, source));
-            return delta;
+            return bypassMerge(target, source);
     }
     const mergeCodes = (0, exports.fillUpdateCodes)(source, mergeConf, false, excludeKeys);
     if ((0, type_utils_1.emptyObject)(mergeCodes)) {
@@ -84,6 +82,16 @@ function customMerge(target, source, mergeConf, excludeKeys) {
     return false;
 }
 exports.customMerge = customMerge;
+function bypassMerge(target, source) {
+    if ((0, type_utils_1.emptyObject)(source)) {
+        return false;
+    }
+    let delta = (0, diff_high_1.deepDiffTyped)(target, source, true);
+    Object.assign(target, Object.assign({}, source));
+    delta = (0, datum_utils_1.selectObjKeys)(delta, (0, datum_utils_1.getObjectKeys)(source));
+    return (0, type_utils_1.emptyObject)(delta) ? false : delta;
+}
+exports.bypassMerge = bypassMerge;
 function immutableCustomMerge(target, source, mergeConf, skipFill = false) {
     const mergeCodes = !skipFill
         ? (0, exports.fillUpdateCodes)(source, mergeConf)
@@ -94,17 +102,17 @@ function immutableCustomMerge(target, source, mergeConf, skipFill = false) {
 }
 exports.immutableCustomMerge = immutableCustomMerge;
 const fillUpdateCodes = (source, mergeConf, blockUnset = false, excludeKeys) => {
-    var _a, _b, _c;
     if ((0, type_utils_1.isString)(mergeConf)) {
         mergeConf = { scalar: mergeConf };
     }
     const deepConf = {
-        scalar: (_a = mergeConf === null || mergeConf === void 0 ? void 0 : mergeConf.scalar) !== null && _a !== void 0 ? _a : merge_low_1.UpdateCode.B,
-        vector: (_b = mergeConf === null || mergeConf === void 0 ? void 0 : mergeConf.vector) !== null && _b !== void 0 ? _b : merge_low_1.UpdateCode.XS,
-        nested: (_c = mergeConf === null || mergeConf === void 0 ? void 0 : mergeConf.nested) !== null && _c !== void 0 ? _c : merge_low_1.UpdateCode.N,
+        scalar: (mergeConf === null || mergeConf === void 0 ? void 0 : mergeConf.scalar) || merge_low_1.UpdateCode.B,
+        vector: (mergeConf === null || mergeConf === void 0 ? void 0 : mergeConf.vector) || merge_low_1.UpdateCode.XS,
+        nested: (mergeConf === null || mergeConf === void 0 ? void 0 : mergeConf.nested) || merge_low_1.UpdateCode.N,
     };
     const globKeys = (0, datum_utils_1.getObjectKeys)(mergeConf)
-        .filter((s) => s.includes("*"));
+        .filter((s) => s.includes("*"))
+        .sort((s1, s2) => s2.length - s1.length);
     const globPats = globKeys.map((g) => (0, datum_utils_1.createGlobRegex)(g));
     const mergeCodes = {};
     const sourceKeys = (0, datum_utils_1.getObjectKeys)(source);
@@ -124,7 +132,7 @@ const fillUpdateCodes = (source, mergeConf, blockUnset = false, excludeKeys) =>
             continue;
         }
         if ((0, type_utils_1.isObject)(labelConf) && (0, type_utils_1.isObject)(srcValue)) {
-            mergeCodes[srcLabel] = (0, exports.fillUpdateCodes)(srcValue, labelConf, blockUnset);
+            mergeCodes[srcLabel] = (0, exports.fillUpdateCodes)(srcValue, Object.assign(Object.assign({}, deepConf), labelConf), blockUnset);
             continue;
         }
         const globIndex = globPats.findIndex((r) => r.test(srcLabel));
@@ -135,7 +143,7 @@ const fillUpdateCodes = (source, mergeConf, blockUnset = false, excludeKeys) =>
                 continue;
             }
             if ((0, type_utils_1.isObject)(globConf) && (0, type_utils_1.isObject)(srcValue)) {
-                mergeCodes[srcLabel] = (0, exports.fillUpdateCodes)(srcValue, globConf, blockUnset);
+                mergeCodes[srcLabel] = (0, exports.fillUpdateCodes)(srcValue, Object.assign(Object.assign({}, deepConf), globConf), blockUnset);
                 continue;
             }
         }

package/dist/cjs/merge-high.js

@@ -96,9 +96,9 @@ function immutableDeepMerge(target, source, scalarCode, vectorCode, nestedCode)
 }
 exports.immutableDeepMerge = immutableDeepMerge;
 ;
-function diffFromMerge(target, source, scalarCode, vectorCode, nestedCode) {
+function diffFromMerge(target, source, scalarCode, vectorCode, nestedCode, orderInd = false) {
     const targetCopy = immutableDeepMerge(target, source, scalarCode, vectorCode, nestedCode);
-    const delta = (0, diff_high_1.deepDiffTyped)(target, targetCopy);
+    const delta = (0, diff_high_1.deepDiffTyped)(target, targetCopy, orderInd);
     return (0, type_utils_1.emptyObject)(delta) ? false : delta;
 }
 exports.diffFromMerge = diffFromMerge;

package/dist/cjs/merge-low.js

@@ -23,7 +23,8 @@ exports.UpdateCode = {
 };
 function mergeScalarField(target, source, label, mergeCode) {
     const sourceHas = !(0, type_utils_1.isNullish)(source[label]);
-    const targetHas = target.hasOwnProperty(label);
+    const targetKey = target.hasOwnProperty(label);
+    const targetHas = targetKey && !(0, type_utils_1.isNullish)(target[label]);
     if (!targetHas && !sourceHas) {
         return false;
     }
@@ -40,7 +41,7 @@ function mergeScalarField(target, source, label, mergeCode) {
         case exports.UpdateCode.N:
             return false;
         case exports.UpdateCode.Y:
-            target[label] = source[label];
+            target[label] = (0, datum_utils_1.deepClone)(source[label]);
             return true;
         case exports.UpdateCode.B:
             if (sourceHas)
@@ -73,10 +74,12 @@ function mergeScalarField(target, source, label, mergeCode) {
     if (!migrateVal) {
         return false;
     }
-    target[label] = (0, datum_utils_1.deepClone)(source[label]);
+    target[label] = !sourceHas || (0, type_utils_1.isPrimitive)(source[label])
+        ? source[label]
+        : (0, datum_utils_1.deepClone)(source[label]);
     if ((0, type_utils_1.emptyValue)(target[label])) {
         delete target[label];
-        return targetHas;
+        return targetKey;
     }
     return true;
 }
@@ -89,7 +92,8 @@ function mergeVectorField(target, source, label, mergeCode) {
         return false;
     }
     let sourceVec = (0, type_utils_1.isArrayOfAny)(sourceVals);
-    const targetHas = target.hasOwnProperty(label);
+    const targetKey = target.hasOwnProperty(label);
+    const targetHas = targetKey && !(0, type_utils_1.isNullish)(target[label]);
     const targetVec = (0, type_utils_1.isArrayOfAny)(target[label]);
     if (targetHas && !targetVec) {
         throw new TypeError("type change to vector for " + label);
@@ -103,9 +107,11 @@ function mergeVectorField(target, source, label, mergeCode) {
         case exports.UpdateCode.N:
             return false;
         case exports.UpdateCode.Y:
-        case exports.UpdateCode.XR:
             target[label] = (0, datum_utils_1.deepClone)(sourceVals);
             return true;
+        case exports.UpdateCode.XR:
+            targetVals = sourceVals;
+            break;
         case exports.UpdateCode.XS:
             targetVals = (0, lodash_es_1.concat)((_a = target[label]) !== null && _a !== void 0 ? _a : [], sourceVals);
             break;
@@ -127,10 +133,10 @@ function mergeVectorField(target, source, label, mergeCode) {
     }
     if (!(targetVals === null || targetVals === void 0 ? void 0 : targetVals.length)) {
         delete target[label];
-        return targetHas;
+        return targetKey;
     }
     const changed = !(0, datum_utils_1.areArraysEqual)(targetVals, target[label]);
-    target[label] = targetVals;
+    target[label] = !changed ? targetVals : (0, datum_utils_1.deepClone)(targetVals);
     return changed;
 }
 exports.mergeVectorField = mergeVectorField;

package/dist/cjs/patch-low.js

@@ -44,6 +44,8 @@ exports.deepPatchLog = deepPatchLog;
 function escapePathPart(path) {
     if (typeof path === 'number')
         return path.toString();
+    if (typeof path === 'symbol')
+        return path.toString();
     if (path.indexOf('/') === -1 && path.indexOf('~') === -1)
         return path;
     return path.replace(/~/g, '~0').replace(/\//g, '~1');

package/dist/{cjs → dts}/datum-utils.d.ts

@@ -4,9 +4,10 @@ export declare function createValueKeys<T>(keys: string[], value: T): {
 };
 export declare function deepEquals(lhs: any, rhs: any): boolean;
 export declare function deepEqualsPath(lhs: any, rhs: any, atPath: string): boolean;
-export declare function deepClone(val: any): any;
+export declare function deepClone<T = any>(val: T): T;
 export declare function toUniqueArray<T>(arr: T[]): T[];
 export declare function areArraysEqual<T>(arr1: T[] | undefined, arr2: T[] | undefined): boolean;
 export declare function createGlobRegex(search: string): RegExp;
-export declare function selectGlobKeys(obj: any, includePats?: string[], excludeKeys?: string[]): string[];
+export declare function getGlobKeys(obj: any, includePats?: string[], excludeKeys?: string[]): string[];
+export declare function selectObjKeys<T extends object>(obj: T, includeKeys: string[]): Partial<T>;
 //# sourceMappingURL=datum-utils.d.ts.map

package/dist/dts/datum-utils.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"datum-utils.d.ts","sourceRoot":"","sources":["../../src/datum-utils.ts"],"names":[],"mappings":"AAGA,wBAAgB,aAAa,CACzB,GAAG,EAAE,GAAG,EACR,WAAW,CAAC,EAAE,MAAM,EAAE,EACtB,WAAW,CAAC,EAAE,MAAM,EAAE,GACvB,MAAM,EAAE,CAaV;AAED,wBAAgB,eAAe,CAAC,CAAC,EAC7B,IAAI,EAAE,MAAM,EAAE,EACd,KAAK,EAAE,CAAC,GACT;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,CAAC,CAAA;CAAE,CAEtB;AAED,wBAAgB,UAAU,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,GAAG,OAAO,CAEtD;AAED,wBAAgB,cAAc,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAE1E;AAED,wBAAgB,SAAS,CAAC,CAAC,GAAG,GAAG,EAAE,GAAG,EAAE,CAAC,GAAG,CAAC,CAE5C;AAED,wBAAgB,aAAa,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,CAAC,EAAE,CAE9C;AAED,wBAAgB,cAAc,CAAC,CAAC,EAC5B,IAAI,EAAE,CAAC,EAAE,GAAG,SAAS,EACrB,IAAI,EAAE,CAAC,EAAE,GAAG,SAAS,GACtB,OAAO,CAaT;AAID,wBAAgB,eAAe,CAC3B,MAAM,EAAE,MAAM,GACf,MAAM,CAIR;AAED,wBAAgB,WAAW,CACvB,GAAG,EAAE,GAAG,EACR,WAAW,GAAE,MAAM,EAAU,EAC7B,WAAW,CAAC,EAAE,MAAM,EAAE,GACvB,MAAM,EAAE,CAmBV;AAED,wBAAgB,aAAa,CAAC,CAAC,SAAS,MAAM,EAC1C,GAAG,EAAE,CAAC,EACN,WAAW,EAAE,MAAM,EAAE,GACtB,OAAO,CAAC,CAAC,CAAC,CAMZ"}

package/dist/dts/diff-high.d.ts

@@ -0,0 +1,16 @@
+import { Diff } from "./diff-lib/deep-diff";
+export declare function deepDiffTyped<T extends object>(lhsObj: T, rhsObj: T, orderInd?: boolean): Partial<T>;
+export declare function antiDiffTyped<T extends object>(lhsObj: T, rhsObj: object, orderInd?: boolean): Partial<T>;
+export declare function deepDiffLow<T = any, S = T>(lhsObj: T, rhsObj: S, orderInd?: boolean): readonly Diff<T, S>[] | false;
+export declare function deepDiffFlat(oldFlat: any, newFlat: any, flatten?: boolean): [any, any];
+export declare function flattenObject(obj: {
+    [key: string]: any;
+}): {
+    [key: string]: any;
+};
+export declare function unflattenObject(flatObj: {
+    [key: string]: any;
+}): {
+    [key: string]: any;
+};
+//# sourceMappingURL=diff-high.d.ts.map

package/dist/dts/diff-high.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"diff-high.d.ts","sourceRoot":"","sources":["../../src/diff-high.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAA2C,MAAM,sBAAsB,CAAC;AAOrF,wBAAgB,aAAa,CAAC,CAAC,SAAS,MAAM,EAC1C,MAAM,EAAE,CAAC,EACT,MAAM,EAAE,CAAC,EACT,QAAQ,GAAE,OAAe,GAC1B,OAAO,CAAC,CAAC,CAAC,CAiBZ;AAeD,wBAAgB,aAAa,CAAC,CAAC,SAAS,MAAM,EAC1C,MAAM,EAAE,CAAC,EACT,MAAM,EAAE,MAAM,EACd,QAAQ,GAAE,OAAe,GAC1B,OAAO,CAAC,CAAC,CAAC,CAoBZ;AAED,wBAAgB,WAAW,CAAC,CAAC,GAAG,GAAG,EAAE,CAAC,GAAG,CAAC,EACtC,MAAM,EAAE,CAAC,EACT,MAAM,EAAE,CAAC,EACT,QAAQ,GAAE,OAAe,GAC1B,SAAS,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,GAAG,KAAK,CAO/B;AAID,wBAAgB,YAAY,CACxB,OAAO,EAAE,GAAG,EACZ,OAAO,EAAE,GAAG,EACZ,OAAO,GAAE,OAAc,GACxB,CAAC,GAAG,EAAE,GAAG,CAAC,CAeZ;AAED,wBAAgB,aAAa,CACzB,GAAG,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;CAAE,GAC5B;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;CAAE,CAiBxB;AAED,wBAAgB,eAAe,CAC3B,OAAO,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;CAAE,GAChC;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;CAAE,CAgBxB"}