datum-merge 1.1.0 → 1.3.0

package/README.md

@@ -52,13 +52,22 @@ const conf: MergeConfig = {
         vector: UpdateCode.XM,
     },
 };
-const diff = customMerge(target, source, conf);
+const diff: Partial<T> = customMerge<T>(target, source, conf);
+```
+
+Reversible deep merge with changelog in json-patch format:
+```
+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);
 ```
 ---
 
 ## Upcoming Features
 
-1. publish [deep-diff](https://github.com/flitbit/diff) library as a standalone package. ([available](/src/diff-lib/README.md))
+1. publish diff module as a standalone package ([available](/src/diff-lib/README.md)).
 
 2. formalize config schema for deeply nested objects (for v1).
 
@@ -68,6 +77,8 @@ const diff = customMerge(target, source, conf);
 
 5. support merging for top level arrays or primitives.
 
+6. better anti-diff function that retains deep similarities.
+
 Code contributions are welcome via issues and pull requests.
 
 ---
@@ -110,6 +121,6 @@ Applying the merge results in one of these transitions per primitive value in th
 | `add`     | new / insert   | I | `null <-- non-null` |
 | `replace` | edit / update  | H | `non-null <-- non-null` |
 | `remove`  | unset / delete | D | `non-null <-- null` |
-| `test`    | noop / skip / ignore (tbd) | N | `null <-- null` or `non-null == non-null` |
+| `test`    | noop / skip / ignore | N | `null <-- null` or `non-null == non-null` |
 
 ---

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.selectObjKeys = exports.getGlobKeys = exports.createGlobRegex = exports.areArraysEqual = exports.toUniqueArray = exports.deepClone = exports.deepEqualsPath = exports.deepEquals = exports.createValueKeys = exports.getObjectKeys = void 0;
+exports.selectObjKeys = exports.getGlobKeys = exports.fastGlobMatch = 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) {
@@ -27,6 +27,8 @@ function createValueKeys(keys, value) {
 }
 exports.createValueKeys = createValueKeys;
 function deepEquals(lhs, rhs) {
+    if (lhs === rhs)
+        return true;
     return (0, fast_deep_equal_1.default)(lhs, rhs);
 }
 exports.deepEquals = deepEquals;
@@ -57,31 +59,37 @@ function areArraysEqual(arr1, arr2) {
     return true;
 }
 exports.areArraysEqual = areArraysEqual;
-function createGlobRegex(search) {
-    const pattern = search.replace(/\*/g, ".+");
-    return new RegExp(`^${pattern}$`);
-}
-exports.createGlobRegex = createGlobRegex;
-function getGlobKeys(obj, includePats = ["*"], excludeKeys) {
-    const includeKeys = [];
-    if (!obj || !(includePats === null || includePats === void 0 ? void 0 : includePats.length)) {
-        return includeKeys;
-    }
-    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);
+function fastGlobMatch(glob, text) {
+    if (!glob.includes("*"))
+        return text === glob;
+    if (glob === "*")
+        return typeof text === "string";
+    const globParts = glob.split(/\*+/g, -1);
+    const partsLen = globParts.length;
+    if (partsLen === 0)
+        return !text;
+    if (partsLen === 1)
+        return text === globParts[0];
+    if (!text.startsWith(globParts[0]))
+        return false;
+    let textIdx = globParts[0].length;
+    for (let i = 1; i < partsLen - 1; i++) {
+        const nextIdx = text.indexOf(globParts[i], textIdx);
+        if (nextIdx < 0) {
+            return false;
         }
+        textIdx = nextIdx + globParts[i].length;
+        continue;
     }
-    return includeKeys;
+    if (!text.endsWith(globParts[partsLen - 1]))
+        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) {

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.asLodashPath = 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.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;
 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");
@@ -35,7 +35,9 @@ Object.defineProperty(exports, "deepPatchLog", { enumerable: true, get: function
 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; } });
-Object.defineProperty(exports, "asLodashPath", { enumerable: true, get: function () { return patch_low_2.asLodashPath; } });
+var patch_low_3 = require("./patch-low");
+Object.defineProperty(exports, "immutablePatch", { enumerable: true, get: function () { return patch_low_3.immutablePatch; } });
+Object.defineProperty(exports, "getPointerValue", { enumerable: true, get: function () { return patch_low_3.getPointerValue; } });
 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");

package/dist/cjs/merge-conf.js

@@ -113,7 +113,6 @@ const fillUpdateCodes = (source, mergeConf, blockUnset = false, excludeKeys) =>
     const globKeys = (0, datum_utils_1.getObjectKeys)(mergeConf)
         .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);
     for (const srcLabel of sourceKeys) {
@@ -135,7 +134,7 @@ const fillUpdateCodes = (source, mergeConf, blockUnset = false, excludeKeys) =>
             mergeCodes[srcLabel] = (0, exports.fillUpdateCodes)(srcValue, Object.assign(Object.assign({}, deepConf), labelConf), blockUnset);
             continue;
         }
-        const globIndex = globPats.findIndex((r) => r.test(srcLabel));
+        const globIndex = globKeys.findIndex((g) => (0, datum_utils_1.fastGlobMatch)(g, srcLabel));
         if (globIndex >= 0) {
             const globConf = mergeConf[globKeys[globIndex]];
             if ((0, type_utils_1.isString)(globConf)) {

package/dist/cjs/patch-low.js

@@ -1,7 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getValueByPointer = exports.asLodashPath = exports.revertPatchLog = exports.applyPatchLog = exports.deepPatchLog = exports.diffToPatchLog = void 0;
+exports.getPointerValue = exports.asLodashPath = exports.immutablePatch = exports.revertPatchLog = exports.applyPatchLog = exports.deepPatchLog = exports.diffToPatchLog = void 0;
 const lodash_es_1 = require("lodash-es");
+const datum_utils_1 = require("./datum-utils");
 const diff_high_1 = require("./diff-high");
 function diffToPatchLog(differences, storePrev = false) {
     var _a, _b, _c;
@@ -41,36 +42,58 @@ function deepPatchLog(lhsObj, rhsObj, orderInd = false, storePrev = false) {
 }
 exports.deepPatchLog = deepPatchLog;
 ;
-function applyPatchLog(patchLog, target = {}) {
-    if (!patchLog)
-        return target;
+function applyPatchLog(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 === "remove") {
-            (0, lodash_es_1.unset)(target, difPath);
+            changed = (0, lodash_es_1.unset)(target, difPath) || changed;
+            continue;
         }
-        else {
+        const targetVal = (0, lodash_es_1.get)(target, difPath);
+        if (!targetVal && !patchItem.value)
+            continue;
+        if (!targetVal || !(0, datum_utils_1.deepEquals)(targetVal, patchItem.value)) {
             (0, lodash_es_1.set)(target, difPath, patchItem.value);
+            changed = true;
         }
     }
-    return target;
+    return changed;
 }
 exports.applyPatchLog = applyPatchLog;
 function revertPatchLog(patchLog, target) {
-    if (!patchLog)
-        return 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 === "add") {
-            (0, lodash_es_1.unset)(target, difPath);
+            changed = (0, lodash_es_1.unset)(target, difPath) || changed;
         }
-        else {
+        else if (patchItem.op !== "test") {
             (0, lodash_es_1.set)(target, difPath, patchItem.prev);
+            changed = true;
         }
     }
-    return target;
+    return changed;
 }
 exports.revertPatchLog = revertPatchLog;
+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 {
+        applyPatchLog(patchSrc, targetCopy);
+    }
+    return targetCopy;
+}
+exports.immutablePatch = immutablePatch;
+;
 function escapePathPart(path) {
     if (typeof path === 'number')
         return path.toString();
@@ -95,8 +118,8 @@ function asLodashPath(pointer) {
     return !(parts === null || parts === void 0 ? void 0 : parts.length) ? [] : (0, lodash_es_1.toPath)(parts.join("."));
 }
 exports.asLodashPath = asLodashPath;
-function getValueByPointer(document, pointer) {
+function getPointerValue(document, pointer) {
     return pointer === "" ? document
         : (0, lodash_es_1.get)(document, asLodashPath(pointer));
 }
-exports.getValueByPointer = getValueByPointer;
+exports.getPointerValue = getPointerValue;

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

@@ -7,7 +7,7 @@ export declare function deepEqualsPath(lhs: any, rhs: any, atPath: string): bool
 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 getGlobKeys(obj: any, includePats?: string[], excludeKeys?: string[]): string[];
+export declare function fastGlobMatch(glob: string, text: string): boolean;
+export declare function getGlobKeys(obj: any, inclPats?: string[], exclPats?: 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

@@ -1 +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"}
+{"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,CAItD;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,aAAa,CACzB,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,GACb,OAAO,CAyBT;AAED,wBAAgB,WAAW,CACvB,GAAG,EAAE,GAAG,EACR,QAAQ,GAAE,MAAM,EAAU,EAC1B,QAAQ,CAAC,EAAE,MAAM,EAAE,GACpB,MAAM,EAAE,CAIV;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/index.d.ts

@@ -6,7 +6,8 @@ export { deepDiffFlat } from "./diff-high";
 export { flattenObject, unflattenObject } from "./diff-high";
 export { type PatchResult } from "./patch-low";
 export { diffToPatchLog, deepPatchLog } from "./patch-low";
-export { applyPatchLog, revertPatchLog, asLodashPath } from "./patch-low";
+export { applyPatchLog, revertPatchLog } from "./patch-low";
+export { immutablePatch, getPointerValue } from "./patch-low";
 export { UpdateCode } from "./merge-low";
 export { UpdateCode as MC } from "./merge-low";
 export { type MergeCode } from "./merge-low";

package/dist/dts/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAC3C,OAAO,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAE1C,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC3D,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAC3C,OAAO,EAAE,aAAa,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAE7D,OAAO,EAAE,KAAK,WAAW,EAAE,MAAM,aAAa,CAAC;AAC/C,OAAO,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAC3D,OAAO,EAAE,aAAa,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAE1E,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,UAAU,IAAI,EAAE,EAAE,MAAM,aAAa,CAAC;AAC/C,OAAO,EAAE,KAAK,SAAS,EAAE,MAAM,aAAa,CAAC;AAC7C,OAAO,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAE9C,OAAO,EAAE,YAAY,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAC5D,OAAO,EAAE,SAAS,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAC;AAC7D,OAAO,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAE7D,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,cAAc,CAAC;AACjD,OAAO,EAAE,WAAW,EAAE,oBAAoB,EAAE,MAAM,cAAc,CAAC;AACjE,OAAO,EAAE,KAAK,WAAW,EAAE,MAAM,cAAc,CAAC;AAChD,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAC/C,OAAO,EAAE,WAAW,EAAE,oBAAoB,EAAE,MAAM,cAAc,CAAC;AACjE,OAAO,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAE3C,OAAO,EAAE,KAAK,WAAW,EAAE,MAAM,eAAe,CAAC;AACjD,OAAO,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AACnE,OAAO,EAAE,YAAY,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAG7D,OAAO,EAAE,SAAS,IAAI,KAAK,EAAE,MAAM,cAAc,CAAC;AAClD,OAAO,EAAE,WAAW,IAAI,SAAS,EAAE,MAAM,cAAc,CAAC;AACxD,cAAc,sBAAsB,CAAC;AACrC,OAAO,EAAE,WAAW,IAAI,QAAQ,EAAE,MAAM,aAAa,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAC3C,OAAO,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAE1C,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC3D,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAC3C,OAAO,EAAE,aAAa,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAE7D,OAAO,EAAE,KAAK,WAAW,EAAE,MAAM,aAAa,CAAC;AAC/C,OAAO,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAC3D,OAAO,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAC5D,OAAO,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAE9D,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,UAAU,IAAI,EAAE,EAAE,MAAM,aAAa,CAAC;AAC/C,OAAO,EAAE,KAAK,SAAS,EAAE,MAAM,aAAa,CAAC;AAC7C,OAAO,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAE9C,OAAO,EAAE,YAAY,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAC5D,OAAO,EAAE,SAAS,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAC;AAC7D,OAAO,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAE7D,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,cAAc,CAAC;AACjD,OAAO,EAAE,WAAW,EAAE,oBAAoB,EAAE,MAAM,cAAc,CAAC;AACjE,OAAO,EAAE,KAAK,WAAW,EAAE,MAAM,cAAc,CAAC;AAChD,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAC/C,OAAO,EAAE,WAAW,EAAE,oBAAoB,EAAE,MAAM,cAAc,CAAC;AACjE,OAAO,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAE3C,OAAO,EAAE,KAAK,WAAW,EAAE,MAAM,eAAe,CAAC;AACjD,OAAO,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AACnE,OAAO,EAAE,YAAY,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAG7D,OAAO,EAAE,SAAS,IAAI,KAAK,EAAE,MAAM,cAAc,CAAC;AAClD,OAAO,EAAE,WAAW,IAAI,SAAS,EAAE,MAAM,cAAc,CAAC;AACxD,cAAc,sBAAsB,CAAC;AACrC,OAAO,EAAE,WAAW,IAAI,QAAQ,EAAE,MAAM,aAAa,CAAC"}

package/dist/dts/merge-conf.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"merge-conf.d.ts","sourceRoot":"","sources":["../../src/merge-conf.ts"],"names":[],"mappings":"AAGA,OAAO,EAAc,SAAS,EAAsC,MAAM,aAAa,CAAC;AAGxF,MAAM,MAAM,YAAY,GAAG;IACvB,CAAC,GAAG,EAAE,MAAM,GAAG,SAAS,GAAG,YAAY,CAAC;CAC3C,CAAC;AAEF,MAAM,MAAM,WAAW,GAAG;IACtB,MAAM,CAAC,EAAE,SAAS,CAAC;IACnB,MAAM,CAAC,EAAE,SAAS,CAAC;IACnB,MAAM,CAAC,EAAE,SAAS,CAAC;IACnB,CAAC,IAAI,EAAE,MAAM,GAAG,SAAS,GAAG,WAAW,GAAG,SAAS,CAAC;CACvD,CAAC;AAUF,wBAAgB,WAAW,CACvB,MAAM,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;CAAE,EAC9B,MAAM,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;CAAE,EAC9B,UAAU,EAAE,YAAY,GACzB,OAAO,CAgCT;AAMD,wBAAgB,oBAAoB,CAChC,MAAM,EAAE,GAAG,EACX,MAAM,EAAE,GAAG,EACX,UAAU,EAAE,YAAY,GACzB,GAAG,CAIL;AAKD,wBAAgB,aAAa,CACzB,GAAG,EAAE,GAAG,EACR,UAAU,EAAE,YAAY,EACxB,WAAW,CAAC,EAAE,MAAM,EAAE,GACvB,MAAM,EAAE,CAaV;AAQD,wBAAgB,WAAW,CAAC,CAAC,SAAS,MAAM,EACxC,MAAM,EAAE,CAAC,EACT,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC,EAClB,SAAS,EAAE,WAAW,GAAG,SAAS,EAClC,WAAW,CAAC,EAAE,MAAM,EAAE,GACvB,OAAO,CAAC,CAAC,CAAC,GAAG,KAAK,CAuBpB;AAOD,wBAAgB,WAAW,CAAC,CAAC,SAAS,MAAM,EACxC,MAAM,EAAE,CAAC,EACT,MAAM,EAAE,MAAM,GACf,OAAO,CAAC,CAAC,CAAC,GAAG,KAAK,CASpB;AAMD,wBAAgB,oBAAoB,CAChC,MAAM,EAAE,GAAG,EACX,MAAM,EAAE,GAAG,EACX,SAAS,EAAE,WAAW,EACtB,QAAQ,GAAE,OAAe,GAC1B,GAAG,CAOL;AAWD,eAAO,MAAM,eAAe,WAChB,GAAG,aACA,WAAW,GAAG,SAAS,eACtB,OAAO,gBACL,MAAM,EAAE,KACvB,YAoEF,CAAA"}
+{"version":3,"file":"merge-conf.d.ts","sourceRoot":"","sources":["../../src/merge-conf.ts"],"names":[],"mappings":"AAGA,OAAO,EAAc,SAAS,EAAsC,MAAM,aAAa,CAAC;AAGxF,MAAM,MAAM,YAAY,GAAG;IACvB,CAAC,GAAG,EAAE,MAAM,GAAG,SAAS,GAAG,YAAY,CAAC;CAC3C,CAAC;AAEF,MAAM,MAAM,WAAW,GAAG;IACtB,MAAM,CAAC,EAAE,SAAS,CAAC;IACnB,MAAM,CAAC,EAAE,SAAS,CAAC;IACnB,MAAM,CAAC,EAAE,SAAS,CAAC;IACnB,CAAC,IAAI,EAAE,MAAM,GAAG,SAAS,GAAG,WAAW,GAAG,SAAS,CAAC;CACvD,CAAC;AAUF,wBAAgB,WAAW,CACvB,MAAM,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;CAAE,EAC9B,MAAM,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;CAAE,EAC9B,UAAU,EAAE,YAAY,GACzB,OAAO,CAgCT;AAMD,wBAAgB,oBAAoB,CAChC,MAAM,EAAE,GAAG,EACX,MAAM,EAAE,GAAG,EACX,UAAU,EAAE,YAAY,GACzB,GAAG,CAIL;AAKD,wBAAgB,aAAa,CACzB,GAAG,EAAE,GAAG,EACR,UAAU,EAAE,YAAY,EACxB,WAAW,CAAC,EAAE,MAAM,EAAE,GACvB,MAAM,EAAE,CAaV;AAQD,wBAAgB,WAAW,CAAC,CAAC,SAAS,MAAM,EACxC,MAAM,EAAE,CAAC,EACT,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC,EAClB,SAAS,EAAE,WAAW,GAAG,SAAS,EAClC,WAAW,CAAC,EAAE,MAAM,EAAE,GACvB,OAAO,CAAC,CAAC,CAAC,GAAG,KAAK,CAuBpB;AAOD,wBAAgB,WAAW,CAAC,CAAC,SAAS,MAAM,EACxC,MAAM,EAAE,CAAC,EACT,MAAM,EAAE,MAAM,GACf,OAAO,CAAC,CAAC,CAAC,GAAG,KAAK,CASpB;AAMD,wBAAgB,oBAAoB,CAChC,MAAM,EAAE,GAAG,EACX,MAAM,EAAE,GAAG,EACX,SAAS,EAAE,WAAW,EACtB,QAAQ,GAAE,OAAe,GAC1B,GAAG,CAOL;AAWD,eAAO,MAAM,eAAe,WAChB,GAAG,aACA,WAAW,GAAG,SAAS,eACtB,OAAO,gBACL,MAAM,EAAE,KACvB,YAmEF,CAAA"}

package/dist/dts/patch-low.d.ts

@@ -1,7 +1,7 @@
 import { Diff } from "./diff-lib/deep-diff";
 export type PatchResult<T = any> = {
     path: string;
-    op: "add" | "remove" | "replace";
+    op: "add" | "remove" | "replace" | "test";
     value?: Readonly<T>;
     prev?: any;
 };
@@ -11,8 +11,9 @@ export declare function deepPatchLog(lhsObj: {
 }, rhsObj: {
     [key: string]: any;
 }, orderInd?: boolean, storePrev?: boolean): PatchResult[];
-export declare function applyPatchLog(patchLog: PatchResult[], target?: object): object;
-export declare function revertPatchLog(patchLog: PatchResult[], target: object): object;
+export declare function applyPatchLog(patchLog: PatchResult[], target: object): boolean;
+export declare function revertPatchLog(patchLog: PatchResult[], target: object): boolean;
+export declare function immutablePatch(target: object, patchSrc: PatchResult[], patchDir?: "apply" | "revert"): object;
 export declare function asLodashPath(pointer: string): string[];
-export declare function getValueByPointer(document: any, pointer: string): any;
+export declare function getPointerValue(document: any, pointer: string): any;
 //# sourceMappingURL=patch-low.d.ts.map

package/dist/dts/patch-low.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"patch-low.d.ts","sourceRoot":"","sources":["../../src/patch-low.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAAE,MAAM,sBAAsB,CAAC;AAG5C,MAAM,MAAM,WAAW,CAAC,CAAC,GAAG,GAAG,IAAI;IAC/B,IAAI,EAAE,MAAM,CAAC;IACb,EAAE,EAAE,KAAK,GAAG,QAAQ,GAAG,SAAS,CAAC;IACjC,KAAK,CAAC,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC;IACpB,IAAI,CAAC,EAAE,GAAG,CAAC;CACd,CAAC;AAOF,wBAAgB,cAAc,CAC1B,WAAW,EAAE,SAAS,IAAI,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,EACtC,SAAS,GAAE,OAAe,GAC3B,WAAW,EAAE,CA6Bf;AAED,wBAAgB,YAAY,CACxB,MAAM,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;CAAE,EAC9B,MAAM,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;CAAE,EAC9B,QAAQ,GAAE,OAAe,EACzB,SAAS,GAAE,OAAe,GAC3B,WAAW,EAAE,CAGf;AAKD,wBAAgB,aAAa,CACzB,QAAQ,EAAE,WAAW,EAAE,EACvB,MAAM,GAAE,MAAW,GACpB,MAAM,CAYR;AAKD,wBAAgB,cAAc,CAC1B,QAAQ,EAAE,WAAW,EAAE,EACvB,MAAM,EAAE,MAAM,GACf,MAAM,CAYR;AAuBD,wBAAgB,YAAY,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,EAAE,CAMtD;AAED,wBAAgB,iBAAiB,CAAC,QAAQ,EAAE,GAAG,EAAE,OAAO,EAAE,MAAM,GAAG,GAAG,CAGrE"}
+{"version":3,"file":"patch-low.d.ts","sourceRoot":"","sources":["../../src/patch-low.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,IAAI,EAAE,MAAM,sBAAsB,CAAC;AAG5C,MAAM,MAAM,WAAW,CAAC,CAAC,GAAG,GAAG,IAAI;IAC/B,IAAI,EAAE,MAAM,CAAC;IACb,EAAE,EAAE,KAAK,GAAG,QAAQ,GAAG,SAAS,GAAG,MAAM,CAAC;IAC1C,KAAK,CAAC,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC;IACpB,IAAI,CAAC,EAAE,GAAG,CAAC;CACd,CAAC;AAOF,wBAAgB,cAAc,CAC1B,WAAW,EAAE,SAAS,IAAI,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,EACtC,SAAS,GAAE,OAAe,GAC3B,WAAW,EAAE,CA6Bf;AAED,wBAAgB,YAAY,CACxB,MAAM,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;CAAE,EAC9B,MAAM,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;CAAE,EAC9B,QAAQ,GAAE,OAAe,EACzB,SAAS,GAAE,OAAe,GAC3B,WAAW,EAAE,CAGf;AAKD,wBAAgB,aAAa,CACzB,QAAQ,EAAE,WAAW,EAAE,EACvB,MAAM,EAAE,MAAM,GACf,OAAO,CAqBT;AAKD,wBAAgB,cAAc,CAC1B,QAAQ,EAAE,WAAW,EAAE,EACvB,MAAM,EAAE,MAAM,GACf,OAAO,CAcT;AAED,wBAAgB,cAAc,CAC1B,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,WAAW,EAAE,EACvB,QAAQ,CAAC,EAAE,OAAO,GAAG,QAAQ,GAC9B,MAAM,CAQR;AAuBD,wBAAgB,YAAY,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,EAAE,CAMtD;AAED,wBAAgB,eAAe,CAAC,QAAQ,EAAE,GAAG,EAAE,OAAO,EAAE,MAAM,GAAG,GAAG,CAGnE"}

package/dist/esm/datum-utils.js

@@ -19,6 +19,8 @@ export function createValueKeys(keys, value) {
     return Object.fromEntries(keys.map((k) => [k, value]));
 }
 export function deepEquals(lhs, rhs) {
+    if (lhs === rhs)
+        return true;
     return equal(lhs, rhs);
 }
 export function deepEqualsPath(lhs, rhs, atPath) {
@@ -44,30 +46,36 @@ export function areArraysEqual(arr1, arr2) {
     }
     return true;
 }
-export function createGlobRegex(search) {
-    const pattern = search.replace(/\*/g, ".+");
-    return new RegExp(`^${pattern}$`);
-}
-export function getGlobKeys(obj, includePats = ["*"], excludeKeys) {
-    const includeKeys = [];
-    if (!obj || !(includePats === null || includePats === void 0 ? void 0 : includePats.length)) {
-        return includeKeys;
-    }
-    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);
+export function fastGlobMatch(glob, text) {
+    if (!glob.includes("*"))
+        return text === glob;
+    if (glob === "*")
+        return typeof text === "string";
+    const globParts = glob.split(/\*+/g, -1);
+    const partsLen = globParts.length;
+    if (partsLen === 0)
+        return !text;
+    if (partsLen === 1)
+        return text === globParts[0];
+    if (!text.startsWith(globParts[0]))
+        return false;
+    let textIdx = globParts[0].length;
+    for (let i = 1; i < partsLen - 1; i++) {
+        const nextIdx = text.indexOf(globParts[i], textIdx);
+        if (nextIdx < 0) {
+            return false;
         }
+        textIdx = nextIdx + globParts[i].length;
+        continue;
     }
-    return includeKeys;
+    if (!text.endsWith(globParts[partsLen - 1]))
+        return false;
+    return true;
+}
+export 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)));
 }
 export function selectObjKeys(obj, includeKeys) {
     if (!(includeKeys === null || includeKeys === void 0 ? void 0 : includeKeys.length))

package/dist/esm/index.js

@@ -5,7 +5,8 @@ export { deepDiffTyped, antiDiffTyped } from "./diff-high";
 export { deepDiffFlat } from "./diff-high";
 export { flattenObject, unflattenObject } from "./diff-high";
 export { diffToPatchLog, deepPatchLog } from "./patch-low";
-export { applyPatchLog, revertPatchLog, asLodashPath } from "./patch-low";
+export { applyPatchLog, revertPatchLog } from "./patch-low";
+export { immutablePatch, getPointerValue } from "./patch-low";
 export { UpdateCode } from "./merge-low";
 export { UpdateCode as MC } from "./merge-low";
 export { updateCodeInfo } from "./merge-high";

package/dist/esm/merge-conf.js

@@ -1,5 +1,5 @@
 import { isArrayOfAny, emptyObject, isNullish, isObject, isString } from "./type-utils";
-import { createGlobRegex, deepClone, getObjectKeys, selectObjKeys } from "./datum-utils";
+import { deepClone, fastGlobMatch, getObjectKeys, selectObjKeys } from "./datum-utils";
 import { deepDiffTyped } from "./diff-high";
 import { UpdateCode, mergeScalarField, mergeVectorField } from "./merge-low";
 import { updateCodeInfo } from "./merge-high";
@@ -104,7 +104,6 @@ export const fillUpdateCodes = (source, mergeConf, blockUnset = false, excludeKe
     const globKeys = getObjectKeys(mergeConf)
         .filter((s) => s.includes("*"))
         .sort((s1, s2) => s2.length - s1.length);
-    const globPats = globKeys.map((g) => createGlobRegex(g));
     const mergeCodes = {};
     const sourceKeys = getObjectKeys(source);
     for (const srcLabel of sourceKeys) {
@@ -126,7 +125,7 @@ export const fillUpdateCodes = (source, mergeConf, blockUnset = false, excludeKe
             mergeCodes[srcLabel] = fillUpdateCodes(srcValue, Object.assign(Object.assign({}, deepConf), labelConf), blockUnset);
             continue;
         }
-        const globIndex = globPats.findIndex((r) => r.test(srcLabel));
+        const globIndex = globKeys.findIndex((g) => fastGlobMatch(g, srcLabel));
         if (globIndex >= 0) {
             const globConf = mergeConf[globKeys[globIndex]];
             if (isString(globConf)) {

package/dist/esm/patch-low.js

@@ -1,4 +1,5 @@
 import { get, set, toPath, unset } from "lodash-es";
+import { deepClone, deepEquals } from "./datum-utils";
 import { deepDiffLow } from "./diff-high";
 export function diffToPatchLog(differences, storePrev = false) {
     var _a, _b, _c;
@@ -36,34 +37,55 @@ export function deepPatchLog(lhsObj, rhsObj, orderInd = false, storePrev = false
     return !differences ? [] : diffToPatchLog(differences, storePrev);
 }
 ;
-export function applyPatchLog(patchLog, target = {}) {
-    if (!patchLog)
-        return target;
+export function applyPatchLog(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 === "remove") {
-            unset(target, difPath);
+            changed = unset(target, difPath) || changed;
+            continue;
         }
-        else {
+        const targetVal = get(target, difPath);
+        if (!targetVal && !patchItem.value)
+            continue;
+        if (!targetVal || !deepEquals(targetVal, patchItem.value)) {
             set(target, difPath, patchItem.value);
+            changed = true;
         }
     }
-    return target;
+    return changed;
 }
 export function revertPatchLog(patchLog, target) {
-    if (!patchLog)
-        return 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 === "add") {
-            unset(target, difPath);
+            changed = unset(target, difPath) || changed;
         }
-        else {
+        else if (patchItem.op !== "test") {
             set(target, difPath, patchItem.prev);
+            changed = true;
         }
     }
-    return target;
+    return changed;
 }
+export function immutablePatch(target, patchSrc, patchDir) {
+    const targetCopy = deepClone(target !== null && target !== void 0 ? target : {});
+    if (patchDir === "revert") {
+        revertPatchLog(patchSrc, targetCopy);
+    }
+    else {
+        applyPatchLog(patchSrc, targetCopy);
+    }
+    return targetCopy;
+}
+;
 function escapePathPart(path) {
     if (typeof path === 'number')
         return path.toString();
@@ -87,7 +109,7 @@ export function asLodashPath(pointer) {
         .map((s) => unescapePathPart(s));
     return !(parts === null || parts === void 0 ? void 0 : parts.length) ? [] : toPath(parts.join("."));
 }
-export function getValueByPointer(document, pointer) {
+export function getPointerValue(document, pointer) {
     return pointer === "" ? document
         : get(document, asLodashPath(pointer));
 }