datum-merge 0.3.1-alpha → 0.5.1

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

@@ -0,0 +1,425 @@
+export { diff };
+export { orderIndependentDiff };
+export { accumulateDiff };
+export { observableDiff };
+export { orderIndependentObservableDiff };
+export { applyChange, revertChange };
+export { applyDiff };
+export { realTypeOf };
+export { getOrderIndependentHash };
+const typeNormalizer = {
+    normalize: function (currentPath, key, lhs, rhs) {
+        if (realTypeOf(lhs) === 'regexp' && realTypeOf(rhs) === 'regexp') {
+            lhs = lhs.toString();
+            rhs = rhs.toString();
+        }
+        if (realTypeOf(lhs) === 'date' && realTypeOf(rhs) === 'date') {
+            lhs = lhs.valueOf();
+            rhs = rhs.valueOf();
+        }
+        return [lhs, rhs];
+    }
+};
+function diff(lhs, rhs, prefilter) {
+    const changes = [];
+    deepDiff(lhs, rhs, changes, prefilter);
+    return (changes === null || changes === void 0 ? void 0 : changes.length) ? changes : undefined;
+}
+function orderIndependentDiff(lhs, rhs, prefilter) {
+    const changes = [];
+    deepDiff(lhs, rhs, changes, prefilter, null, null, null, true);
+    return (changes === null || changes === void 0 ? void 0 : changes.length) ? changes : undefined;
+}
+function observableDiff(lhs, rhs, observer, prefilter, orderIndependent) {
+    const changes = [];
+    deepDiff(lhs, rhs, changes, prefilter, null, null, null, orderIndependent);
+    if (observer) {
+        changes.forEach((c) => observer(c));
+    }
+    return changes;
+}
+function accumulateDiff(lhs, rhs, prefilter, accum, orderIndependent) {
+    const observer = (accum) ?
+        function (difference) {
+            if (difference) {
+                accum.push(difference);
+            }
+        } : undefined;
+    const changes = observableDiff(lhs, rhs, observer, prefilter, orderIndependent);
+    return accum ? accum : (changes.length) ? changes : undefined;
+}
+function orderIndependentObservableDiff(lhs, rhs, changes, prefilter, path, key, stack) {
+    deepDiff(lhs, rhs, changes, prefilter, path, key, stack, true);
+}
+function deepDiff(lhs, rhs, changes, prefilter, path, key, stack, orderIndependent = false) {
+    changes = changes || [];
+    path = path || [];
+    stack = stack || [];
+    const currentPath = path.slice(0);
+    if (typeof key !== 'undefined' && key !== null) {
+        if (prefilter) {
+            if (typeof (prefilter) === 'function' && prefilter(currentPath, key)) {
+                return;
+            }
+            else if (typeof (prefilter) === 'object') {
+                if (prefilter.prefilter && prefilter.prefilter(currentPath, key)) {
+                    return;
+                }
+                if (prefilter.normalize) {
+                    const alt = prefilter.normalize(currentPath, key, lhs, rhs);
+                    if (alt) {
+                        lhs = alt[0];
+                        rhs = alt[1];
+                    }
+                }
+            }
+        }
+        currentPath.push(key);
+    }
+    if (realTypeOf(lhs) === 'regexp' && realTypeOf(rhs) === 'regexp') {
+        lhs = lhs.toString();
+        rhs = rhs.toString();
+    }
+    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));
+    const rdefined = rtype !== 'undefined' ||
+        (stack && (stack.length > 0) && stack[stack.length - 1].rhs &&
+            Object.getOwnPropertyDescriptor(stack[stack.length - 1].rhs, key));
+    if (!ldefined && rdefined) {
+        changes.push({
+            kind: 'N',
+            path: currentPath,
+            rhs
+        });
+        return;
+    }
+    else if (!rdefined && ldefined) {
+        changes.push({
+            kind: 'D',
+            path: currentPath,
+            lhs
+        });
+        return;
+    }
+    else if (realTypeOf(lhs) !== realTypeOf(rhs)) {
+        changes.push({
+            kind: 'E',
+            path: currentPath,
+            lhs,
+            rhs
+        });
+        return;
+    }
+    if (realTypeOf(lhs) === 'date'
+        && (lhs.valueOf() - rhs.valueOf()) !== 0) {
+        changes.push({
+            kind: 'E',
+            path: currentPath,
+            lhs,
+            rhs
+        });
+        new Date();
+    }
+    else if (ltype === 'object' && lhs !== null && rhs !== null) {
+        let i, j;
+        let other = false;
+        for (i = stack.length - 1; i > -1; --i) {
+            if (stack[i].lhs === lhs) {
+                other = true;
+                break;
+            }
+        }
+        if (!other) {
+            stack.push({ lhs: lhs, rhs: rhs });
+            if (Array.isArray(lhs) && Array.isArray(rhs)) {
+                i = rhs.length - 1;
+                j = lhs.length - 1;
+                if (orderIndependent) {
+                    lhs = lhs.slice().sort(function (a, b) {
+                        return getOrderIndependentHash(a) - getOrderIndependentHash(b);
+                    });
+                    rhs = rhs.slice().sort(function (a, b) {
+                        return getOrderIndependentHash(a) - getOrderIndependentHash(b);
+                    });
+                }
+                while (i > j) {
+                    changes.push({
+                        kind: 'A',
+                        path: currentPath,
+                        index: i,
+                        item: { kind: 'N', rhs: rhs[i--] },
+                    });
+                }
+                while (j > i) {
+                    changes.push({
+                        kind: 'A',
+                        path: currentPath,
+                        index: j,
+                        item: { kind: 'D', lhs: lhs[j--] },
+                    });
+                }
+                for (; i >= 0; --i) {
+                    deepDiff(lhs[i], rhs[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 k = akeys[i];
+                    const ki = pkeys.indexOf(k);
+                    if (ki >= 0) {
+                        deepDiff(lhs[k], rhs[k], changes, prefilter, currentPath, k, stack, orderIndependent);
+                        pkeys[ki] = null;
+                    }
+                    else {
+                        deepDiff(lhs[k], undefined, changes, prefilter, currentPath, k, stack, orderIndependent);
+                    }
+                }
+                for (i = 0; i < pkeys.length; ++i) {
+                    const k = pkeys[i];
+                    if (k) {
+                        deepDiff(undefined, rhs[k], changes, prefilter, currentPath, k, stack, orderIndependent);
+                    }
+                }
+            }
+            stack.length = stack.length - 1;
+        }
+        else if (lhs !== rhs) {
+            changes.push({
+                kind: 'E',
+                path: currentPath,
+                lhs,
+                rhs
+            });
+        }
+    }
+    else if (lhs !== rhs) {
+        if (!(ltype === 'number' && isNaN(lhs) && isNaN(rhs))) {
+            changes.push({
+                kind: 'E',
+                path: currentPath,
+                lhs,
+                rhs
+            });
+        }
+    }
+}
+function applyDiff(target, source, filter) {
+    if (!target || !source) {
+        return;
+    }
+    const onChange = function (change) {
+        if (!filter || filter(target, source, change)) {
+            applyChange(target, source, change);
+        }
+    };
+    observableDiff(target, source, onChange);
+    return target;
+}
+function applyChange(target, source, change) {
+    var _a;
+    if (!target || !change || !change.kind) {
+        return;
+    }
+    let it = target;
+    const rootPath = !((_a = change.path) === null || _a === void 0 ? void 0 : _a.length);
+    const last = rootPath ? 0 : change.path.length - 1;
+    let i = -1;
+    while (++i < last) {
+        if (typeof it[change.path[i]] === 'undefined') {
+            it[change.path[i]] = (typeof change.path[i + 1] !== 'undefined'
+                && typeof change.path[i + 1] === 'number') ? [] : {};
+        }
+        it = it[change.path[i]];
+    }
+    switch (change.kind) {
+        case 'A':
+            if (!rootPath && typeof it[change.path[i]] === 'undefined') {
+                it[change.path[i]] = [];
+            }
+            applyArrayChange(rootPath ? it : it[change.path[i]], change.index, change.item);
+            break;
+        case 'D':
+            delete it[change.path[i]];
+            break;
+        case 'E':
+        case 'N':
+            it[change.path[i]] = change.rhs;
+            break;
+    }
+}
+function applyArrayChange(arr, index, change) {
+    if (change.path && change.path.length > 0) {
+        const u = change.path.length - 1;
+        let it = arr[index];
+        let i;
+        for (i = 0; i < u; i++) {
+            it = it[change.path[i]];
+        }
+        switch (change.kind) {
+            case 'A':
+                applyArrayChange(it[change.path[i]], change.index, change.item);
+                break;
+            case 'D':
+                delete it[change.path[i]];
+                break;
+            case 'E':
+            case 'N':
+                it[change.path[i]] = change.rhs;
+                break;
+        }
+    }
+    else {
+        switch (change.kind) {
+            case 'A':
+                applyArrayChange(arr[index], change.index, change.item);
+                break;
+            case 'D':
+                arr = arrayRemove(arr, index);
+                break;
+            case 'E':
+            case 'N':
+                arr[index] = change.rhs;
+                break;
+        }
+    }
+    return arr;
+}
+function revertChange(target, source, change) {
+    var _a;
+    if (!target || !change || !change.kind) {
+        return;
+    }
+    let it = target;
+    const rootPath = !((_a = change.path) === null || _a === void 0 ? void 0 : _a.length);
+    const last = rootPath ? 0 : change.path.length - 1;
+    let i;
+    for (i = 0; i < last; i++) {
+        if (typeof it[change.path[i]] === 'undefined') {
+            it[change.path[i]] = {};
+        }
+        it = it[change.path[i]];
+    }
+    switch (change.kind) {
+        case 'A':
+            revertArrayChange(rootPath ? it : it[change.path[i]], change.index, change.item);
+            break;
+        case 'D':
+            it[change.path[i]] = change.lhs;
+            break;
+        case 'E':
+            it[change.path[i]] = change.lhs;
+            break;
+        case 'N':
+            delete it[change.path[i]];
+            break;
+    }
+}
+function revertArrayChange(arr, index, change) {
+    if (change.path && change.path.length > 0) {
+        const u = change.path.length - 1;
+        let it = arr[index];
+        let i;
+        for (i = 0; i < u; i++) {
+            it = it[change.path[i]];
+        }
+        switch (change.kind) {
+            case 'A':
+                revertArrayChange(it[change.path[i]], change.index, change.item);
+                break;
+            case 'D':
+                it[change.path[i]] = change.lhs;
+                break;
+            case 'E':
+                it[change.path[i]] = change.lhs;
+                break;
+            case 'N':
+                delete it[change.path[i]];
+                break;
+        }
+    }
+    else {
+        switch (change.kind) {
+            case 'A':
+                revertArrayChange(arr[index], change.index, change.item);
+                break;
+            case 'D':
+                arr[index] = change.lhs;
+                break;
+            case 'E':
+                arr[index] = change.lhs;
+                break;
+            case 'N':
+                arr = arrayRemove(arr, index);
+                break;
+        }
+    }
+    return arr;
+}
+function arrayRemove(arr, index) {
+    index = index < 0 ? arr.length + index : index;
+    arr.splice(index, 1);
+    return arr;
+}
+function realTypeOf(val) {
+    const type = typeof val;
+    if (type !== 'object') {
+        return type;
+    }
+    if (val === Math) {
+        return 'math';
+    }
+    else if (val === null) {
+        return 'null';
+    }
+    else if (Array.isArray(val)) {
+        return 'array';
+    }
+    else if (Object.prototype.toString.call(val) === '[object Date]') {
+        return 'date';
+    }
+    else if (typeof val.toString === 'function' && /^\/.*\//.test(val.toString())) {
+        return 'regexp';
+    }
+    return 'object';
+}
+function getOrderIndependentHash(val) {
+    let accum = 0;
+    const type = realTypeOf(val);
+    if (type === 'array') {
+        val.forEach(function (item) {
+            accum += getOrderIndependentHash(item);
+        });
+        const arrayString = `[type: array, hash: ${accum}]`;
+        return accum + hashThisString(arrayString);
+    }
+    if (type === 'object') {
+        for (let key in val) {
+            if (val.hasOwnProperty(key)) {
+                const keyValueHash = getOrderIndependentHash(val[key]);
+                const keyValueString = `[ type: object, key: ${key}, value hash: ${keyValueHash}]`;
+                accum += hashThisString(keyValueString);
+            }
+        }
+        return accum;
+    }
+    const stringToHash = `[ type: ${type} ; value: ${val}]`;
+    return accum + hashThisString(stringToHash);
+}
+function hashThisString(str) {
+    let hash = 0;
+    if (str.length === 0) {
+        return hash;
+    }
+    for (let i = 0; i < str.length; i++) {
+        const char = str.charCodeAt(i);
+        hash = ((hash << 5) - hash) + char;
+        hash = hash & hash;
+    }
+    return hash;
+}
+//# sourceMappingURL=deep-diff.js.map

package/dist/esm/diff-lib/deep-diff.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"deep-diff.js","sourceRoot":"","sources":["../../../src/diff-lib/deep-diff.ts"],"names":[],"mappings":"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"}

package/dist/esm/index.d.ts

@@ -1,13 +1,17 @@
-export { deepEquals } from "./data-utils";
-export { flattenObject, unflattenObject } from "./data-utils";
+export { deepEquals } from "./datum-utils";
+export { deepClone } from "./datum-utils";
+export { flattenObject, unflattenObject } from "./datum-utils";
 export { deepDiffLow } from "./diff-high";
 export { deepDiffFlat } from "./diff-high";
 export { deepDiffTyped } from "./diff-high";
 export { UpdateCode } from "./merge-low";
-export { updateCodeInfo } from "./merge-low";
+export { updateCodeInfo } from "./merge-high";
 export { MergeError } from "./merge-high";
 export { shallowMerge, immutableMerge } from "./merge-high";
-export { type DetailConfig, detailMerge } from "./merge-high";
 export { diffFromMerge } from "./merge-high";
-export { shallowMerge as merge } from "./merge-high";
-export { deepDiffTyped as diff } from "./diff-high";
+export { deepMerge, immutableDeepMerge } from "./merge-high";
+export { type DetailConfig, } from "./merge-conf";
+export { detailMerge, immutableDetailMerge } from "./merge-conf";
+export { deepMerge as merge } from "./merge-high";
+export * from "./diff-lib/deep-diff";
+export { deepDiffLow as deepDiff } from "./diff-high";

package/dist/esm/index.js

@@ -1,14 +1,17 @@
-export { deepEquals } from "./data-utils";
-export { flattenObject, unflattenObject } from "./data-utils";
+export { deepEquals } from "./datum-utils";
+export { deepClone } from "./datum-utils";
+export { flattenObject, unflattenObject } from "./datum-utils";
 export { deepDiffLow } from "./diff-high";
 export { deepDiffFlat } from "./diff-high";
 export { deepDiffTyped } from "./diff-high";
 export { UpdateCode } from "./merge-low";
-export { updateCodeInfo } from "./merge-low";
+export { updateCodeInfo } from "./merge-high";
 export { MergeError } from "./merge-high";
 export { shallowMerge, immutableMerge } from "./merge-high";
-export { detailMerge } from "./merge-high";
 export { diffFromMerge } from "./merge-high";
-export { shallowMerge as merge } from "./merge-high";
-export { deepDiffTyped as diff } from "./diff-high";
+export { deepMerge, immutableDeepMerge } from "./merge-high";
+export { detailMerge, immutableDetailMerge } from "./merge-conf";
+export { deepMerge as merge } from "./merge-high";
+export * from "./diff-lib/deep-diff";
+export { deepDiffLow as deepDiff } from "./diff-high";
 //# sourceMappingURL=index.js.map

package/dist/esm/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC1C,OAAO,EAAE,aAAa,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAE9D,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAC3C,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAE5C,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAC7C,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAE1C,OAAO,EAAE,YAAY,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAC5D,OAAO,EAAqB,WAAW,EAAE,MAAM,cAAc,CAAC;AAC9D,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAG7C,OAAO,EAAE,YAAY,IAAI,KAAK,EAAE,MAAM,cAAc,CAAC;AACrD,OAAO,EAAE,aAAa,IAAI,IAAI,EAAE,MAAM,aAAa,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAC3C,OAAO,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAC1C,OAAO,EAAE,aAAa,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AAE/D,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAC3C,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAE5C,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAC9C,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAE1C,OAAO,EAAE,YAAY,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAC5D,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAC7C,OAAO,EAAE,SAAS,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAC;AAG7D,OAAO,EAAE,WAAW,EAAE,oBAAoB,EAAE,MAAM,cAAc,CAAC;AAGjE,OAAO,EAAE,SAAS,IAAI,KAAK,EAAE,MAAM,cAAc,CAAC;AAClD,cAAc,sBAAsB,CAAC;AACrC,OAAO,EAAE,WAAW,IAAI,QAAQ,EAAE,MAAM,aAAa,CAAC"}

package/dist/esm/merge-conf.d.ts

@@ -0,0 +1,10 @@
+import { UpdateCode } from "./merge-low";
+export type DetailConfig = {
+    [key: string]: UpdateCode | DetailConfig;
+};
+export declare function detailMerge(target: {
+    [key: string]: any;
+}, source: {
+    [key: string]: any;
+}, mergeCodes: DetailConfig): boolean;
+export declare function immutableDetailMerge(target: any, source: any, mergeCodes: DetailConfig): any;

package/dist/esm/merge-conf.js

@@ -0,0 +1,33 @@
+import { emptyObject, isObject, isString } from "./type-utils";
+import { deepClone, getObjectKeys } from "./datum-utils";
+import { UpdateCode, mergeScalarField, mergeVectorField } from "./merge-low";
+export function detailMerge(target, source, mergeCodes) {
+    if (!isObject(mergeCodes) || emptyObject(mergeCodes)) {
+        return false;
+    }
+    let changed = false;
+    const mergeKeys = getObjectKeys(mergeCodes);
+    for (const label of mergeKeys) {
+        const mergeCode = mergeCodes[label];
+        if (!isString(mergeCode)) {
+            if ((isObject(target[label]) && isObject(source[label]))
+                ? detailMerge(target[label], source[label], mergeCode)
+                : mergeScalarField(target, source, label, UpdateCode.I)) {
+                changed = true;
+            }
+            continue;
+        }
+        if (mergeCode.toString().startsWith("X")
+            ? mergeVectorField(target, source, label, mergeCode)
+            : mergeScalarField(target, source, label, mergeCode)) {
+            changed = true;
+        }
+    }
+    return changed;
+}
+export function immutableDetailMerge(target, source, mergeCodes) {
+    const targetCopy = deepClone(target);
+    detailMerge(targetCopy, source, mergeCodes);
+    return targetCopy;
+}
+//# sourceMappingURL=merge-conf.js.map

package/dist/esm/merge-conf.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"merge-conf.js","sourceRoot":"","sources":["../../src/merge-conf.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAC;AAC/D,OAAO,EAAE,SAAS,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AACzD,OAAO,EAAE,UAAU,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAY7E,MAAM,UAAU,WAAW,CACvB,MAA8B,EAC9B,MAA8B,EAC9B,UAAwB;IAExB,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,IAAI,WAAW,CAAC,UAAU,CAAC,EAAE,CAAC;QACnD,OAAO,KAAK,CAAC;IACjB,CAAC;IACD,IAAI,OAAO,GAAG,KAAK,CAAC;IACpB,MAAM,SAAS,GAAG,aAAa,CAAC,UAAU,CAAC,CAAC;IAC5C,KAAK,MAAM,KAAK,IAAI,SAAS,EAAE,CAAC;QAC5B,MAAM,SAAS,GAAG,UAAU,CAAC,KAAK,CAAE,CAAC;QACrC,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE,CAAC;YACvB,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,IAAI,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;gBACpD,CAAC,CAAC,WAAW,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,MAAM,CAAC,KAAK,CAAC,EAAE,SAAS,CAAC;gBACtD,CAAC,CAAC,gBAAgB,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,UAAU,CAAC,CAAC,CAAC,EACzD,CAAC;gBACC,OAAO,GAAG,IAAI,CAAC;YACnB,CAAC;YACD,SAAS;QACb,CAAC;QACD,IAAI,SAAS,CAAC,QAAQ,EAAE,CAAC,UAAU,CAAC,GAAG,CAAC;YACpC,CAAC,CAAC,gBAAgB,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,SAAS,CAAC;YACpD,CAAC,CAAC,gBAAgB,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,SAAS,CAAC,EACtD,CAAC;YACC,OAAO,GAAG,IAAI,CAAC;QACnB,CAAC;IACL,CAAC;IACD,OAAO,OAAO,CAAC;AACnB,CAAC;AAMD,MAAM,UAAU,oBAAoB,CAChC,MAAW,EACX,MAAW,EACX,UAAwB;IAExB,MAAM,UAAU,GAAG,SAAS,CAAC,MAAM,CAAC,CAAC;IACrC,WAAW,CAAC,UAAU,EAAE,MAAM,EAAE,UAAU,CAAC,CAAC;IAC5C,OAAO,UAAU,CAAC;AACtB,CAAC"}

package/dist/esm/merge-high.d.ts

@@ -7,8 +7,11 @@ export type MergeTuple = {
     [label: string]: any;
 };
 export type MergeCode = `${UpdateCode}`;
-export type DetailConfig = {
-    [path: string]: UpdateCode;
+export type MergePerms = {
+    enable: boolean;
+    insert?: boolean;
+    update?: boolean;
+    unset?: boolean;
 };
 export declare class MergeError extends Error {
     readonly data: {
@@ -27,11 +30,17 @@ export declare class MergeError extends Error {
         t?: any;
     });
 }
-export declare function detailMerge(target: {
-    [key: string]: any;
-}, source: {
-    [key: string]: any;
-}, mergeCodes: DetailConfig): boolean;
+export declare function updateCodeInfo(mergeCode: UpdateCode | MergeCode): MergePerms;
 export declare function shallowMerge(target: any, source: any, scalarCode: UpdateCode, vectorCode?: UpdateCode, excludeKeys?: string[], includeKeys?: string[]): boolean;
 export declare function immutableMerge(target: any, source: any, scalarCode: UpdateCode, vectorCode?: UpdateCode): any;
 export declare function diffFromMerge(target: any, source: any, scalarCode: UpdateCode, vectorCode?: UpdateCode): any | false;
+export declare function deepMerge(target: {
+    [key: string]: any;
+}, source: {
+    [key: string]: any;
+}, scalarCode: UpdateCode, vectorCode: UpdateCode, nestedCode: UpdateCode): boolean;
+export declare function immutableDeepMerge(target: {
+    [key: string]: any;
+}, source: {
+    [key: string]: any;
+}, scalarCode: UpdateCode, vectorCode?: UpdateCode, nestedCode?: UpdateCode): any;