datum-merge 1.3.0 → 1.5.0

package/README.md

@@ -61,7 +61,8 @@ import { customMergePatch, MergeResult, revertPatchLog } from "datum-merge";
 const conf = { scalar: "I", vector: "XM", nested: "B" };
 const patch: MergeResult[] = customMergePatch(target, source, conf);
 const changed = revertPatchLog(patch, target);
-applyPatchLog(patch, anotherTarget);
+applyPatchLog(patch, otherTarget); //op replayed, exact paths
+forcePatchLog(patch, anotherTarget); //op ignored, nulls deleted
 ```
 ---
 
@@ -73,11 +74,9 @@ applyPatchLog(patch, anotherTarget);
 
 3. option to ignore errors for datatype mismatch during merge.
 
-4. support custom equality check within vector merge.
+4. support custom equality check for vector labels.
 
-5. support merging for top level arrays or primitives.
-
-6. better anti-diff function that retains deep similarities.
+5. better anti-diff function that retains deep similarities.
 
 Code contributions are welcome via issues and pull requests.
 

package/dist/cjs/datum-utils.js

@@ -3,7 +3,17 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.selectObjKeys = exports.getGlobKeys = exports.fastGlobMatch = exports.areArraysEqual = exports.toUniqueArray = exports.deepClone = exports.deepEqualsPath = exports.deepEquals = exports.createValueKeys = exports.getObjectKeys = void 0;
+exports.getObjectKeys = getObjectKeys;
+exports.createValueKeys = createValueKeys;
+exports.shallowEquals = shallowEquals;
+exports.deepEquals = deepEquals;
+exports.deepEqualsPath = deepEqualsPath;
+exports.deepClone = deepClone;
+exports.toUniqueArray = toUniqueArray;
+exports.areArraysEqual = areArraysEqual;
+exports.fastGlobMatch = fastGlobMatch;
+exports.getGlobKeys = getGlobKeys;
+exports.selectObjKeys = selectObjKeys;
 const lodash_es_1 = require("lodash-es");
 const fast_deep_equal_1 = __importDefault(require("fast-deep-equal"));
 function getObjectKeys(obj, excludeKeys, includeKeys) {
@@ -20,30 +30,27 @@ function getObjectKeys(obj, excludeKeys, includeKeys) {
     }
     return sourceKeys;
 }
-exports.getObjectKeys = getObjectKeys;
 ;
 function createValueKeys(keys, value) {
     return Object.fromEntries(keys.map((k) => [k, value]));
 }
-exports.createValueKeys = createValueKeys;
+function shallowEquals(lhs, rhs) {
+    return lhs === rhs;
+}
 function deepEquals(lhs, rhs) {
     if (lhs === rhs)
         return true;
     return (0, fast_deep_equal_1.default)(lhs, rhs);
 }
-exports.deepEquals = deepEquals;
 function deepEqualsPath(lhs, rhs, atPath) {
     return (0, fast_deep_equal_1.default)((0, lodash_es_1.get)(lhs, atPath), (0, lodash_es_1.get)(rhs, atPath));
 }
-exports.deepEqualsPath = deepEqualsPath;
 function deepClone(val) {
     return (0, lodash_es_1.cloneDeep)(val);
 }
-exports.deepClone = deepClone;
 function toUniqueArray(arr) {
     return [...new Set(arr)];
 }
-exports.toUniqueArray = toUniqueArray;
 function areArraysEqual(arr1, arr2) {
     if (arr1 == null && arr2 == null)
         return true;
@@ -58,7 +65,6 @@ function areArraysEqual(arr1, arr2) {
     }
     return true;
 }
-exports.areArraysEqual = areArraysEqual;
 function fastGlobMatch(glob, text) {
     if (!glob.includes("*"))
         return text === glob;
@@ -85,17 +91,14 @@ function fastGlobMatch(glob, text) {
         return false;
     return true;
 }
-exports.fastGlobMatch = fastGlobMatch;
 function getGlobKeys(obj, inclPats = ["*"], exclPats) {
     return Object.keys(obj)
         .filter((k) => !inclPats || inclPats.some((g) => fastGlobMatch(g, k)))
         .filter((k) => !(exclPats === null || exclPats === void 0 ? void 0 : exclPats.length) || !exclPats.some((g) => fastGlobMatch(g, k)));
 }
-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,6 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.unflattenObject = exports.flattenObject = exports.deepDiffFlat = exports.deepDiffLow = exports.antiDiffTyped = exports.deepDiffTyped = void 0;
+exports.deepDiffTyped = deepDiffTyped;
+exports.antiDiffTyped = antiDiffTyped;
+exports.deepDiffLow = deepDiffLow;
+exports.deepDiffFlat = deepDiffFlat;
+exports.flattenObject = flattenObject;
+exports.unflattenObject = unflattenObject;
 const type_utils_1 = require("./type-utils");
 const deep_diff_1 = require("./diff-lib/deep-diff");
 function deepDiffTyped(lhsObj, rhsObj, orderInd = false) {
@@ -21,7 +26,6 @@ function deepDiffTyped(lhsObj, rhsObj, orderInd = false) {
     cleanupObjArrays(deltaObj);
     return deltaObj;
 }
-exports.deepDiffTyped = deepDiffTyped;
 ;
 function cleanupObjArrays(obj) {
     var _a;
@@ -48,7 +52,6 @@ function antiDiffTyped(lhsObj, rhsObj, orderInd = false) {
         .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)
@@ -57,7 +60,6 @@ function deepDiffLow(lhsObj, rhsObj, orderInd = false) {
         ? false
         : differences;
 }
-exports.deepDiffLow = deepDiffLow;
 ;
 function deepDiffFlat(oldFlat, newFlat, flatten = true) {
     if (flatten) {
@@ -74,7 +76,6 @@ function deepDiffFlat(oldFlat, newFlat, flatten = true) {
     }
     return [updated, removed];
 }
-exports.deepDiffFlat = deepDiffFlat;
 function flattenObject(obj) {
     const flatObj = {};
     const path = [];
@@ -94,7 +95,6 @@ function flattenObject(obj) {
     dig(obj);
     return flatObj;
 }
-exports.flattenObject = flattenObject;
 function unflattenObject(flatObj) {
     const unflatObj = {};
     for (const [path, value] of Object.entries(flatObj)) {
@@ -112,4 +112,3 @@ function unflattenObject(flatObj) {
     }
     return unflatObj;
 }
-exports.unflattenObject = unflattenObject;

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

@@ -1,6 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getOrderIndependentHash = exports.realTypeOf = exports.applyDiff = exports.revertChange = exports.applyChange = exports.orderIndependentDeepDiff = exports.observableDiff = exports.accumulateDiff = exports.orderIndependentDiff = exports.diff = void 0;
+exports.diff = diff;
+exports.orderIndependentDiff = orderIndependentDiff;
+exports.accumulateDiff = accumulateDiff;
+exports.observableDiff = observableDiff;
+exports.orderIndependentDeepDiff = orderIndependentDeepDiff;
+exports.applyChange = applyChange;
+exports.revertChange = revertChange;
+exports.applyDiff = applyDiff;
+exports.realTypeOf = realTypeOf;
+exports.getOrderIndependentHash = getOrderIndependentHash;
 const typeNormalizer = {
     normalize: function (currentPath, key, lhs, rhs) {
         if (realTypeOf(lhs) === 'regexp' && realTypeOf(rhs) === 'regexp') {
@@ -19,12 +28,10 @@ function diff(lhs, rhs, prefilter) {
     deepDiff(lhs, rhs, changes, prefilter);
     return (changes === null || changes === void 0 ? void 0 : changes.length) ? changes : undefined;
 }
-exports.diff = diff;
 function orderIndependentDiff(lhs, rhs, prefilter) {
     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, undefined, undefined, undefined, orderIndependent);
@@ -33,7 +40,6 @@ function observableDiff(lhs, rhs, observer, prefilter, orderIndependent) {
     }
     return changes;
 }
-exports.observableDiff = observableDiff;
 function accumulateDiff(lhs, rhs, prefilter, accum, orderIndependent) {
     const observer = (accum) ?
         function (difference) {
@@ -44,11 +50,9 @@ function accumulateDiff(lhs, rhs, prefilter, accum, orderIndependent) {
     const changes = observableDiff(lhs, rhs, observer, prefilter, orderIndependent);
     return accum ? accum : (changes.length) ? changes : undefined;
 }
-exports.accumulateDiff = accumulateDiff;
 function orderIndependentDeepDiff(lhs, rhs, changes, prefilter, path, key, stack) {
     deepDiff(lhs, rhs, changes, prefilter, path, key, stack, true);
 }
-exports.orderIndependentDeepDiff = orderIndependentDeepDiff;
 function deepDiff(lhs, rhs, changes, prefilter, path, key, stack, orderIndependent = false) {
     changes = changes || [];
     path = path || [];
@@ -221,7 +225,6 @@ function applyDiff(target, source, filter) {
     observableDiff(target, source, onChange);
     return target;
 }
-exports.applyDiff = applyDiff;
 function applyChange(target, unused, change) {
     var _a;
     if (!target || !change || !change.kind) {
@@ -254,7 +257,6 @@ function applyChange(target, unused, change) {
             break;
     }
 }
-exports.applyChange = applyChange;
 function applyArrayChange(arr, index, change) {
     if (change.path && change.path.length > 0) {
         const last = change.path.length - 1;
@@ -322,7 +324,6 @@ function revertChange(target, unused, change) {
             break;
     }
 }
-exports.revertChange = revertChange;
 function revertArrayChange(arr, index, change) {
     if (change.path && change.path.length > 0) {
         const last = change.path.length - 1;
@@ -391,7 +392,6 @@ function realTypeOf(val) {
     }
     return 'object';
 }
-exports.realTypeOf = realTypeOf;
 function getOrderIndependentHash(val) {
     let accum = 0;
     const type = realTypeOf(val);
@@ -415,7 +415,6 @@ function getOrderIndependentHash(val) {
     const stringToHash = `[ type: ${type} ; value: ${val}]`;
     return accum + hashThisString(stringToHash);
 }
-exports.getOrderIndependentHash = getOrderIndependentHash;
 function hashThisString(str) {
     let hash = 0;
     if (str.length === 0) {

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.selectPathCode = exports.deepMergeLog = exports.bypassMergePatch = exports.customMergePatch = exports.bypassMerge = exports.immutableCustomMerge = exports.customMerge = exports.fillUpdateCodes = exports.immutableDetailMerge = exports.detailMerge = exports.patchFromMerge = exports.diffFromMerge = exports.immutableDeepMerge = exports.deepMerge = exports.immutableMerge = exports.shallowMerge = exports.updateCodeInfo = exports.MC = exports.UpdateCode = exports.getPointerValue = exports.immutablePatch = exports.revertPatchLog = exports.applyPatchLog = exports.deepPatchLog = exports.diffToPatchLog = exports.unflattenObject = exports.flattenObject = exports.deepDiffFlat = exports.antiDiffTyped = exports.deepDiffTyped = exports.deepDiffLow = exports.deepClone = exports.deepEquals = void 0;
+exports.deepDiff = exports.mergeDiff = exports.merge = exports.selectPathCode = exports.deepMergeLog = exports.bypassMergePatch = exports.customMergePatch = exports.bypassMerge = exports.immutableCustomMerge = exports.customMerge = exports.fillUpdateCodes = exports.immutableDetailMerge = exports.detailMerge = exports.patchFromMerge = exports.diffFromMerge = exports.immutableDeepMerge = exports.deepMerge = exports.immutableMerge = exports.shallowMerge = exports.mergeVectors = exports.updateCodeInfo = exports.MC = exports.UpdateCode = exports.immutablePatch = exports.getPointerValue = exports.forcePatchLog = exports.revertPatchLog = exports.applyPatchLog = exports.deepPatchLog = exports.diffToPatchLog = 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");
@@ -36,14 +36,18 @@ var patch_low_2 = require("./patch-low");
 Object.defineProperty(exports, "applyPatchLog", { enumerable: true, get: function () { return patch_low_2.applyPatchLog; } });
 Object.defineProperty(exports, "revertPatchLog", { enumerable: true, get: function () { return patch_low_2.revertPatchLog; } });
 var patch_low_3 = require("./patch-low");
-Object.defineProperty(exports, "immutablePatch", { enumerable: true, get: function () { return patch_low_3.immutablePatch; } });
+Object.defineProperty(exports, "forcePatchLog", { enumerable: true, get: function () { return patch_low_3.forcePatchLog; } });
 Object.defineProperty(exports, "getPointerValue", { enumerable: true, get: function () { return patch_low_3.getPointerValue; } });
+var patch_low_4 = require("./patch-low");
+Object.defineProperty(exports, "immutablePatch", { enumerable: true, get: function () { return patch_low_4.immutablePatch; } });
 var merge_low_1 = require("./merge-low");
 Object.defineProperty(exports, "UpdateCode", { enumerable: true, get: function () { return merge_low_1.UpdateCode; } });
 var merge_low_2 = require("./merge-low");
 Object.defineProperty(exports, "MC", { enumerable: true, get: function () { return merge_low_2.UpdateCode; } });
 var merge_high_1 = require("./merge-high");
 Object.defineProperty(exports, "updateCodeInfo", { enumerable: true, get: function () { return merge_high_1.updateCodeInfo; } });
+var merge_low_3 = require("./merge-low");
+Object.defineProperty(exports, "mergeVectors", { enumerable: true, get: function () { return merge_low_3.mergeVectors; } });
 var merge_high_2 = require("./merge-high");
 Object.defineProperty(exports, "shallowMerge", { enumerable: true, get: function () { return merge_high_2.shallowMerge; } });
 Object.defineProperty(exports, "immutableMerge", { enumerable: true, get: function () { return merge_high_2.immutableMerge; } });

package/dist/cjs/merge-conf.js

@@ -1,6 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.fillUpdateCodes = exports.immutableCustomMerge = exports.bypassMerge = exports.customMerge = exports.getDetailKeys = exports.immutableDetailMerge = exports.detailMerge = void 0;
+exports.fillUpdateCodes = void 0;
+exports.detailMerge = detailMerge;
+exports.immutableDetailMerge = immutableDetailMerge;
+exports.getDetailKeys = getDetailKeys;
+exports.customMerge = customMerge;
+exports.bypassMerge = bypassMerge;
+exports.immutableCustomMerge = immutableCustomMerge;
 const type_utils_1 = require("./type-utils");
 const datum_utils_1 = require("./datum-utils");
 const diff_high_1 = require("./diff-high");
@@ -36,13 +42,11 @@ function detailMerge(target, source, mergeCodes) {
     }
     return changed;
 }
-exports.detailMerge = detailMerge;
 function immutableDetailMerge(target, source, mergeCodes) {
     const targetCopy = (0, datum_utils_1.deepClone)(target);
     detailMerge(targetCopy, source, mergeCodes);
     return targetCopy;
 }
-exports.immutableDetailMerge = immutableDetailMerge;
 function getDetailKeys(obj, mergeCodes, excludeKeys) {
     const includeKeys = [];
     if (!obj || !mergeCodes) {
@@ -57,7 +61,6 @@ function getDetailKeys(obj, mergeCodes, excludeKeys) {
     }
     return includeKeys;
 }
-exports.getDetailKeys = getDetailKeys;
 function customMerge(target, source, mergeConf, excludeKeys) {
     switch (mergeConf) {
         case merge_low_1.UpdateCode.C:
@@ -81,7 +84,6 @@ function customMerge(target, source, mergeConf, excludeKeys) {
     }
     return false;
 }
-exports.customMerge = customMerge;
 function bypassMerge(target, source) {
     if ((0, type_utils_1.emptyObject)(source)) {
         return false;
@@ -91,7 +93,6 @@ function bypassMerge(target, 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)
@@ -100,7 +101,6 @@ function immutableCustomMerge(target, source, mergeConf, skipFill = false) {
     detailMerge(targetCopy, source, mergeCodes);
     return targetCopy;
 }
-exports.immutableCustomMerge = immutableCustomMerge;
 const fillUpdateCodes = (source, mergeConf, blockUnset = false, excludeKeys) => {
     if ((0, type_utils_1.isString)(mergeConf)) {
         mergeConf = { scalar: mergeConf };

package/dist/cjs/merge-high.js

@@ -1,6 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.patchFromMerge = exports.diffFromMerge = exports.immutableDeepMerge = exports.deepMerge = exports.immutableMerge = exports.shallowMerge = exports.updateCodeInfo = void 0;
+exports.updateCodeInfo = updateCodeInfo;
+exports.shallowMerge = shallowMerge;
+exports.immutableMerge = immutableMerge;
+exports.deepMerge = deepMerge;
+exports.immutableDeepMerge = immutableDeepMerge;
+exports.diffFromMerge = diffFromMerge;
+exports.patchFromMerge = patchFromMerge;
 const type_utils_1 = require("./type-utils");
 const datum_utils_1 = require("./datum-utils");
 const merge_low_1 = require("./merge-low");
@@ -30,7 +36,6 @@ function updateCodeInfo(mergeCode) {
         enable: allowInsert || allowUpdate || allowUnset,
     };
 }
-exports.updateCodeInfo = updateCodeInfo;
 function shallowMerge(target, source, scalarCode, vectorCode, excludeKeys, includeKeys) {
     const sourceKeys = (0, datum_utils_1.getObjectKeys)(source, excludeKeys, includeKeys);
     if (!(sourceKeys === null || sourceKeys === void 0 ? void 0 : sourceKeys.length)) {
@@ -50,13 +55,11 @@ function shallowMerge(target, source, scalarCode, vectorCode, excludeKeys, inclu
     }
     return changed;
 }
-exports.shallowMerge = shallowMerge;
 function immutableMerge(target, source, scalarCode, vectorCode) {
     const targetCopy = (0, datum_utils_1.deepClone)(target);
     shallowMerge(targetCopy, source, scalarCode, vectorCode);
     return targetCopy;
 }
-exports.immutableMerge = immutableMerge;
 ;
 function deepMerge(target, source, scalarCode, vectorCode, nestedCode) {
     const sourceKeys = (0, datum_utils_1.getObjectKeys)(source);
@@ -83,23 +86,19 @@ function deepMerge(target, source, scalarCode, vectorCode, nestedCode) {
     }
     return changed;
 }
-exports.deepMerge = deepMerge;
 function immutableDeepMerge(target, source, scalarCode, vectorCode, nestedCode) {
     const targetCopy = (0, datum_utils_1.deepClone)(target);
     deepMerge(targetCopy, source, scalarCode, vectorCode !== null && vectorCode !== void 0 ? vectorCode : scalarCode, nestedCode !== null && nestedCode !== void 0 ? nestedCode : scalarCode);
     return targetCopy;
 }
-exports.immutableDeepMerge = immutableDeepMerge;
 ;
 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, orderInd);
     return (0, type_utils_1.emptyObject)(delta) ? false : delta;
 }
-exports.diffFromMerge = diffFromMerge;
 function patchFromMerge(target, source, scalarCode, vectorCode, nestedCode, orderInd = false) {
     const targetCopy = immutableDeepMerge(target, source, scalarCode, vectorCode, nestedCode);
     const patch = (0, patch_low_1.deepPatchLog)(target, targetCopy, orderInd, true);
     return !(patch === null || patch === void 0 ? void 0 : patch.length) ? false : patch;
 }
-exports.patchFromMerge = patchFromMerge;

package/dist/cjs/merge-low.js

@@ -1,6 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.mergeVectorField = exports.mergeScalarField = exports.UpdateCode = void 0;
+exports.UpdateCode = void 0;
+exports.mergeScalarField = mergeScalarField;
+exports.mergeVectorField = mergeVectorField;
+exports.mergeVectors = mergeVectors;
 const lodash_es_1 = require("lodash-es");
 const type_utils_1 = require("./type-utils");
 const datum_utils_1 = require("./datum-utils");
@@ -83,7 +86,6 @@ function mergeScalarField(target, source, label, mergeCode) {
     }
     return true;
 }
-exports.mergeScalarField = mergeScalarField;
 ;
 function mergeVectorField(target, source, label, mergeCode) {
     var _a, _b;
@@ -120,13 +122,13 @@ function mergeVectorField(target, source, label, mergeCode) {
             break;
         case exports.UpdateCode.B:
         case exports.UpdateCode.XM:
-            targetVals = (0, lodash_es_1.unionWith)(target[label], sourceVals, lodash_es_1.isEqual);
+            targetVals = (0, lodash_es_1.unionWith)(target[label], sourceVals, datum_utils_1.deepEquals);
             break;
         case exports.UpdateCode.XD:
-            targetVals = (0, lodash_es_1.differenceWith)(target[label], sourceVals, lodash_es_1.isEqual);
+            targetVals = (0, lodash_es_1.differenceWith)(target[label], sourceVals, datum_utils_1.deepEquals);
             break;
         case exports.UpdateCode.XI:
-            targetVals = (0, lodash_es_1.intersectionWith)(target[label], sourceVals, lodash_es_1.isEqual);
+            targetVals = (0, lodash_es_1.intersectionWith)(target[label], sourceVals, datum_utils_1.deepEquals);
             break;
         default:
             return false;
@@ -139,5 +141,20 @@ function mergeVectorField(target, source, label, mergeCode) {
     target[label] = !changed ? targetVals : (0, datum_utils_1.deepClone)(targetVals);
     return changed;
 }
-exports.mergeVectorField = mergeVectorField;
 ;
+function mergeVectors(mergeCode, arr1, arr2, equalsCond) {
+    if (!(arr1 === null || arr1 === void 0 ? void 0 : arr1.length) && !(arr2 === null || arr2 === void 0 ? void 0 : arr2.length))
+        return [];
+    equalsCond = equalsCond !== null && equalsCond !== void 0 ? equalsCond : datum_utils_1.deepEquals;
+    switch (mergeCode) {
+        case exports.UpdateCode.XM:
+            return (0, lodash_es_1.unionWith)(arr1, arr2, equalsCond);
+        case exports.UpdateCode.XI:
+            return (0, lodash_es_1.intersectionWith)(arr1, arr2, equalsCond);
+        case exports.UpdateCode.XD:
+            return (0, lodash_es_1.differenceWith)(arr1, arr2, equalsCond);
+        case exports.UpdateCode.XS:
+            return (0, lodash_es_1.concat)(arr1 !== null && arr1 !== void 0 ? arr1 : [], arr2 !== null && arr2 !== void 0 ? arr2 : []);
+    }
+    throw new Error("invalid merge code " + mergeCode);
+}

package/dist/cjs/merge-patch.js

@@ -1,6 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.selectPathCode = exports.deepMergeLog = exports.bypassMergePatch = exports.customMergePatch = void 0;
+exports.customMergePatch = customMergePatch;
+exports.bypassMergePatch = bypassMergePatch;
+exports.deepMergeLog = deepMergeLog;
+exports.selectPathCode = selectPathCode;
 const type_utils_1 = require("./type-utils");
 const datum_utils_1 = require("./datum-utils");
 const patch_low_1 = require("./patch-low");
@@ -29,7 +32,6 @@ function customMergePatch(target, source, mergeConf, excludeKeys) {
     }
     return false;
 }
-exports.customMergePatch = customMergePatch;
 function bypassMergePatch(target, source) {
     const sourceKeys = (0, datum_utils_1.getObjectKeys)(source !== null && source !== void 0 ? source : {});
     if (!source || !sourceKeys.length) {
@@ -41,7 +43,6 @@ function bypassMergePatch(target, source) {
     const patch = deepMergeLog(targetBkp, target, mergeCodes);
     return !(patch === null || patch === void 0 ? void 0 : patch.length) ? false : patch;
 }
-exports.bypassMergePatch = bypassMergePatch;
 function deepMergeLog(lhsObj, rhsObj, mergeCodes) {
     const mergeLog = (0, patch_low_1.deepPatchLog)(lhsObj, rhsObj, false, true);
     if (!(mergeLog === null || mergeLog === void 0 ? void 0 : mergeLog.length)) {
@@ -61,7 +62,6 @@ function deepMergeLog(lhsObj, rhsObj, mergeCodes) {
     }
     return mergeLog;
 }
-exports.deepMergeLog = deepMergeLog;
 ;
 function selectPathCode(mergeCodes, pathParts) {
     if (!mergeCodes || (0, type_utils_1.emptyObject)(mergeCodes)) {
@@ -84,4 +84,3 @@ function selectPathCode(mergeCodes, pathParts) {
     }
     return merge_low_1.UpdateCode.N;
 }
-exports.selectPathCode = selectPathCode;

package/dist/cjs/patch-low.js

@@ -1,7 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getPointerValue = exports.asLodashPath = exports.immutablePatch = exports.revertPatchLog = exports.applyPatchLog = exports.deepPatchLog = exports.diffToPatchLog = void 0;
+exports.diffToPatchLog = diffToPatchLog;
+exports.deepPatchLog = deepPatchLog;
+exports.applyPatchLog = applyPatchLog;
+exports.revertPatchLog = revertPatchLog;
+exports.forcePatchLog = forcePatchLog;
+exports.immutablePatch = immutablePatch;
+exports.asLodashPath = asLodashPath;
+exports.getPointerValue = getPointerValue;
 const lodash_es_1 = require("lodash-es");
+const type_utils_1 = require("./type-utils");
 const datum_utils_1 = require("./datum-utils");
 const diff_high_1 = require("./diff-high");
 function diffToPatchLog(differences, storePrev = false) {
@@ -35,12 +43,10 @@ function diffToPatchLog(differences, storePrev = false) {
     }
     return jsonPatch;
 }
-exports.diffToPatchLog = diffToPatchLog;
 function deepPatchLog(lhsObj, rhsObj, orderInd = false, storePrev = false) {
     const differences = (0, diff_high_1.deepDiffLow)(lhsObj, rhsObj, orderInd);
     return !differences ? [] : diffToPatchLog(differences, storePrev);
 }
-exports.deepPatchLog = deepPatchLog;
 ;
 function applyPatchLog(patchLog, target) {
     if (!target || !(patchLog === null || patchLog === void 0 ? void 0 : patchLog.length))
@@ -55,44 +61,64 @@ function applyPatchLog(patchLog, target) {
             continue;
         }
         const targetVal = (0, lodash_es_1.get)(target, difPath);
-        if (!targetVal && !patchItem.value)
+        const sourceVal = patchItem.value;
+        if ((0, type_utils_1.isNullish)(targetVal) && (0, type_utils_1.isNullish)(sourceVal))
             continue;
-        if (!targetVal || !(0, datum_utils_1.deepEquals)(targetVal, patchItem.value)) {
-            (0, lodash_es_1.set)(target, difPath, patchItem.value);
+        if ((0, type_utils_1.isNullish)(targetVal) || !(0, datum_utils_1.deepEquals)(targetVal, sourceVal)) {
+            (0, lodash_es_1.set)(target, difPath, (0, datum_utils_1.deepClone)(sourceVal));
             changed = true;
         }
     }
     return changed;
 }
-exports.applyPatchLog = applyPatchLog;
 function revertPatchLog(patchLog, target) {
     if (!target || !(patchLog === null || patchLog === void 0 ? void 0 : patchLog.length))
         return false;
     let changed = false;
     for (const patchItem of patchLog) {
         const difPath = asLodashPath(patchItem.path);
+        if (patchItem.op === "test")
+            continue;
         if (patchItem.op === "add") {
             changed = (0, lodash_es_1.unset)(target, difPath) || changed;
+            continue;
         }
-        else if (patchItem.op !== "test") {
-            (0, lodash_es_1.set)(target, difPath, patchItem.prev);
-            changed = true;
-        }
+        (0, lodash_es_1.set)(target, difPath, patchItem.prev);
+        changed = true;
     }
     return changed;
 }
-exports.revertPatchLog = revertPatchLog;
+function forcePatchLog(patchLog, target = {}) {
+    for (const patchItem of patchLog) {
+        const difPath = patchItem.path.startsWith("/")
+            ? asLodashPath(patchItem.path) : (0, lodash_es_1.toPath)(patchItem.path);
+        if (!(difPath === null || difPath === void 0 ? void 0 : difPath.length))
+            continue;
+        const value = patchItem.value;
+        if ((0, type_utils_1.isNullish)(value)) {
+            (0, lodash_es_1.unset)(target, difPath);
+        }
+        if ((0, type_utils_1.isPrimitive)(value)) {
+            (0, lodash_es_1.set)(target, difPath, value);
+        }
+        else {
+            (0, lodash_es_1.set)(target, difPath, (0, datum_utils_1.deepClone)(value));
+        }
+    }
+}
 function immutablePatch(target, patchSrc, patchDir) {
     const targetCopy = (0, datum_utils_1.deepClone)(target !== null && target !== void 0 ? target : {});
     if (patchDir === "revert") {
         revertPatchLog(patchSrc, targetCopy);
     }
+    else if (patchDir === "force") {
+        forcePatchLog(patchSrc, targetCopy);
+    }
     else {
         applyPatchLog(patchSrc, targetCopy);
     }
     return targetCopy;
 }
-exports.immutablePatch = immutablePatch;
 ;
 function escapePathPart(path) {
     if (typeof path === 'number')
@@ -117,9 +143,7 @@ function asLodashPath(pointer) {
         .map((s) => unescapePathPart(s));
     return !(parts === null || parts === void 0 ? void 0 : parts.length) ? [] : (0, lodash_es_1.toPath)(parts.join("."));
 }
-exports.asLodashPath = asLodashPath;
 function getPointerValue(document, pointer) {
     return pointer === "" ? document
         : (0, lodash_es_1.get)(document, asLodashPath(pointer));
 }
-exports.getPointerValue = getPointerValue;