@jsopen/objects 1.6.3 → 2.0.1

package/CHANGELOG.md

@@ -1,7 +1,12 @@
 ## Changelog
 
-### [v1.6.3](https://github.com/panates/jsopen-objects/compare/v1.6.2...v1.6.3) - 
+### [v2.0.1](https://github.com/panates/jsopen-objects/compare/v2.0.0...v2.0.1) - 
 
-#### 🪲 Fixes
+#### 🛠 Refactoring and Updates
 
-- fix: merge fails on null fields @Eray Hanoğlu 
+- refactor: Made default "symbolKeys" option to true @Eray Hanoğlu 
+
+#### 💬 General Changes
+
+- dev: Coveralls parallel @Eray Hanoğlu 
+- dev: Coveralls parallel @Eray Hanoğlu 

package/cjs/merge.js

@@ -1,241 +1,163 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.merge = merge;
-exports.getMergeFunction = getMergeFunction;
 const is_object_js_1 = require("./is-object.js");
 const type_guards_js_1 = require("./type-guards.js");
-function merge(target, source, options) {
-    if (!((0, is_object_js_1.isObject)(target) || typeof target === 'function')) {
-        throw new TypeError('"target" argument must be an object');
-    }
-    source = source || {};
-    if (!((0, is_object_js_1.isObject)(source) || typeof target === 'function')) {
-        throw new TypeError('"target" argument must be an object');
-    }
-    const fn = getMergeFunction(options);
-    return fn(target, source, options, '');
-}
-const functionCache = new Map();
-function getMergeFunction(options) {
-    const cacheKey = [
-        options?.deep,
-        options?.moveArrays,
-        options?.keepExisting,
-        options?.copyDescriptors,
-        options?.ignore,
-        options?.ignoreUndefined,
-        options?.ignoreNulls,
-        options?.filter,
-    ]
-        .map(option => option == null
-        ? 'n'
-        : typeof option === 'function'
-            ? 'f'
-            : typeof option === 'string'
-                ? option
-                : option
-                    ? '1'
-                    : '0')
-        .join();
-    let fn = functionCache.get(cacheKey);
-    if (!fn) {
-        fn = buildMerge(options);
-        functionCache.set(cacheKey, fn);
-    }
-    return fn;
-}
-function buildMerge(options) {
-    const scriptL0 = [
-        `
-const { merge, isObject, isPlainObject, deepTest, arrayClone } = context;
 const hasOwnProperty = Object.prototype.hasOwnProperty;
-const keys = Object.getOwnPropertyNames(source);
-keys.push(...Object.getOwnPropertySymbols(source));
-let key;
-let descriptor;
-let srcVal;
-let trgVal;
-`,
-    ];
-    // noinspection JSUnusedGlobalSymbols
-    const context = {
-        deepTest: is_object_js_1.isPlainObject,
-        isPlainObject: is_object_js_1.isPlainObject,
-        isObject: is_object_js_1.isObject,
-        arrayClone,
-        merge: null,
-    };
-    if (options?.deep) {
-        if (options.deep === 'full') {
-            context.deepTest = v => v && typeof v === 'object' && !(0, type_guards_js_1.isBuiltIn)(v);
-        }
-        scriptL0.push(`let subPath;`, `let _isArray;`);
-        if (typeof options?.deep === 'function') {
-            scriptL0.push(`const deepCallback = options.deep;`);
-        }
-    }
-    if (typeof options?.ignore === 'function') {
-        scriptL0.push('const ignoreCallback = options.ignore;');
-    }
-    if (typeof options?.filter === 'function') {
-        scriptL0.push('const filterCallback = options.filter;');
-    }
-    if (typeof options?.copyDescriptors === 'function') {
-        scriptL0.push(`const copyDescriptorsCallback = options.copyDescriptors;`);
-    }
-    if (typeof options?.moveArrays === 'function') {
-        scriptL0.push(`const moveArraysCallback = options.moveArrays;`);
-    }
-    scriptL0.push(`
-if (isPlainObject(target)) Object.setPrototypeOf(target, Object.getPrototypeOf(source));  
-let i = 0;
-const len = keys.length;
-for (i = 0; i < len; i++) {
-  key = keys[i];
-  /** Should not overwrite __proto__ and constructor properties */
-  if (key === '__proto__' || key === 'constructor') continue;
-`);
-    const scriptL1For = [];
-    scriptL0.push(scriptL1For);
-    scriptL0.push('}');
-    /** ************* filter *****************/
-    if (options?.filter) {
-        scriptL1For.push(`
-if (!filterCallback(key, source, target, curPath)) {
-  delete target[key];
-  continue;
-}`);
-    }
-    /** ************* ignore *****************/
-    if (typeof options?.ignore === 'function') {
-        scriptL1For.push(`
-if (
-      hasOwnProperty.call(target, key) && 
-      ignoreCallback(key, source, target, curPath)
-   ) continue;
-`);
-    }
-    /** ************* copyDescriptors *****************/
-    if (options?.copyDescriptors) {
-        let scriptL2Descriptors = scriptL1For;
-        if (typeof options?.copyDescriptors === 'function') {
-            scriptL1For.push('if (copyDescriptorsCallback(key, source, target, curPath)) {');
-            scriptL2Descriptors = [];
-            scriptL1For.push(scriptL2Descriptors);
-            scriptL1For.push(`} else`);
-            scriptL1For.push(`  descriptor = {enumerable: true, configurable: true, writable: true}`);
-        }
-        scriptL2Descriptors.push(`
-  descriptor = { ...Object.getOwnPropertyDescriptor(source, key) }
-  if ((descriptor.get || descriptor.set)) {
-    Object.defineProperty(target, key, descriptor);
-    continue;
-  }
-  srcVal = source[key];`);
-    }
-    else {
-        scriptL1For.push(`descriptor = {enumerable: true, configurable: true, writable: true}`, `srcVal = source[key];`);
-    }
-    /** ************* keepExisting *****************/
-    if (options?.keepExisting) {
-        scriptL1For.push(`if (hasOwnProperty.call(target, key)) continue;`);
-    }
-    /** ************* ignoreUndefined *****************/
-    if (options?.ignoreUndefined ?? true) {
-        scriptL1For.push(`if (srcVal === undefined) continue;`);
-    }
-    /** ************* ignoreNulls *****************/
-    if (options?.ignoreNulls) {
-        scriptL1For.push(`if (srcVal === null) continue;`);
+function merge(targetObject, sourceObject, options) {
+    if (!((0, is_object_js_1.isObject)(targetObject) || typeof targetObject === 'function')) {
+        throw new TypeError('"target" argument must be an object');
     }
-    const deepArray = !options?.moveArrays || typeof options?.moveArrays === 'function';
-    /** ************* deep *****************/
-    if (options?.deep) {
-        if (deepArray) {
-            scriptL1For.push(`
-_isArray = Array.isArray(srcVal);
-if (typeof key !== 'symbol' && (_isArray || deepTest(srcVal))) {`);
-        }
-        else {
-            scriptL1For.push(`
-if (typeof key !== 'symbol' && deepTest(srcVal)) {
-  subPath = curPath + (curPath ? '.' : '') + key;`);
-        }
-        scriptL1For.push(`subPath = curPath + (curPath ? '.' : '') + key;`);
-        const scriptL2Deep = [];
-        scriptL1For.push(scriptL2Deep);
-        scriptL1For.push('}');
-        let scriptL3Deep = scriptL2Deep;
-        if (typeof options?.deep === 'function') {
-            scriptL2Deep.push(`
-if (deepCallback(key, subPath, target, source)) {`);
-            scriptL3Deep = [];
-            scriptL2Deep.push(scriptL3Deep);
-            scriptL2Deep.push('}');
-        }
-        /** ************* Array *****************/
-        if (!options?.moveArrays || typeof options?.moveArrays === 'function') {
-            scriptL3Deep.push(`if (_isArray) {`);
-            const scriptL4IsArray = [];
-            scriptL3Deep.push(scriptL4IsArray);
-            scriptL3Deep.push('}');
-            let scriptL5CloneArrays = scriptL4IsArray;
-            if (typeof options?.moveArrays === 'function') {
-                scriptL4IsArray.push(`
-if (moveArraysCallback(key, subPath, target, source)) {
-  descriptor.value = srcVal;
-  Object.defineProperty(target, key, descriptor);
-  continue;
-} else {`);
-                scriptL5CloneArrays = [];
-                scriptL4IsArray.push(scriptL5CloneArrays);
-                scriptL4IsArray.push('}');
+    if (sourceObject == null)
+        return targetObject;
+    if (!((0, is_object_js_1.isObject)(sourceObject) ||
+        typeof sourceObject === 'function' ||
+        Array.isArray(sourceObject))) {
+        throw new TypeError('"target" argument must be an object or array of objects');
+    }
+    const keepExisting = options?.keepExisting;
+    const keepExistingFn = typeof options?.keepExisting === 'function'
+        ? options?.keepExisting
+        : undefined;
+    const filterFn = options?.filter;
+    const ignoreUndefined = options?.ignoreUndefined ?? true;
+    const ignoreNulls = options?.ignoreNulls;
+    const deep = options?.deep;
+    const deepFull = deep === 'full';
+    const deepFn = typeof options?.deep === 'function' ? options?.deep : undefined;
+    const copyDescriptors = options?.copyDescriptors;
+    const mergeArrays = options?.mergeArrays;
+    const mergeArraysUnique = options?.mergeArrays === 'unique';
+    const mergeArraysFn = typeof options?.mergeArrays === 'function'
+        ? options?.mergeArrays
+        : undefined;
+    const _merge = (target, source, parentPath = '') => {
+        if (!(0, is_object_js_1.isObject)(source))
+            return;
+        const keys = Object.getOwnPropertyNames(source);
+        if (options?.symbolKeys ?? true)
+            keys.push(...Object.getOwnPropertySymbols(source));
+        let key;
+        let descriptor;
+        let srcVal;
+        let _goDeep = false;
+        if ((0, is_object_js_1.isPlainObject)(target))
+            Object.setPrototypeOf(target, Object.getPrototypeOf(source));
+        const ignoreFn = options?.ignoreSource;
+        let i = 0;
+        const len = keys.length;
+        for (i = 0; i < len; i++) {
+            key = keys[i];
+            /** Should not overwrite __proto__ and constructor properties */
+            if (key === '__proto__' || key === 'constructor')
+                continue;
+            if (copyDescriptors) {
+                descriptor = Object.getOwnPropertyDescriptor(source, key);
+                if (descriptor?.get || descriptor?.set) {
+                    Object.defineProperty(target, key, descriptor);
+                    continue;
+                }
+            }
+            srcVal = source[key];
+            if (ignoreFn?.(srcVal, {
+                key,
+                source,
+                target,
+                path: parentPath + (parentPath ? '.' : '') + String(key),
+            })) {
+                continue;
+            }
+            if (keepExisting && hasOwnProperty.call(target, key)) {
+                if (!keepExistingFn)
+                    continue;
+                if (keepExistingFn(srcVal, {
+                    key,
+                    source,
+                    target,
+                    path: parentPath + (parentPath ? '.' : '') + String(key),
+                })) {
+                    continue;
+                }
+            }
+            if (filterFn &&
+                !filterFn(srcVal, {
+                    key,
+                    source,
+                    target,
+                    path: parentPath + (parentPath ? '.' : '') + String(key),
+                })) {
+                continue;
             }
-            scriptL5CloneArrays.push(`
-descriptor.value = arrayClone(srcVal, options, merge, subPath);
-Object.defineProperty(target, key, descriptor);
-continue;
-`);
+            if (ignoreUndefined && srcVal === undefined) {
+                continue;
+            }
+            if (ignoreNulls && srcVal === null) {
+                continue;
+            }
+            if (deep &&
+                typeof srcVal === 'object' &&
+                (!(0, type_guards_js_1.isBuiltIn)(srcVal) || Array.isArray(srcVal))) {
+                _goDeep =
+                    (deepFn &&
+                        deepFn(srcVal, {
+                            key,
+                            source,
+                            target,
+                            path: parentPath + (parentPath ? '.' : '') + String(key),
+                        })) ||
+                        (!deepFn &&
+                            (deepFull || (0, is_object_js_1.isPlainObject)(srcVal) || Array.isArray(srcVal)));
+                if (_goDeep) {
+                    /** Array */
+                    if (Array.isArray(srcVal)) {
+                        if (Array.isArray(target[key]) &&
+                            (mergeArrays ||
+                                mergeArraysFn?.(srcVal, {
+                                    key,
+                                    source,
+                                    target,
+                                    path: parentPath + (parentPath ? '.' : '') + String(key),
+                                }))) {
+                            target[key] = _arrayClone(target[key], parentPath + (parentPath ? '.' : '') + String(key));
+                        }
+                        else
+                            target[key] = [];
+                        target[key].push(..._arrayClone(srcVal, parentPath + (parentPath ? '.' : '') + String(key)));
+                        if (mergeArraysUnique)
+                            target[key] = Array.from(new Set(target[key]));
+                        continue;
+                    }
+                    else {
+                        /** Object */
+                        if (!(0, is_object_js_1.isObject)(target[key]))
+                            target[key] = {};
+                        _merge(target[key], srcVal, parentPath + (parentPath ? '.' : '') + String(key));
+                        continue;
+                    }
+                }
+            }
+            if (copyDescriptors) {
+                descriptor = { ...Object.getOwnPropertyDescriptor(source, key) };
+                descriptor.value = srcVal;
+                Object.defineProperty(target, key, descriptor);
+                continue;
+            }
+            target[key] = srcVal;
         }
-        /** ************* object *****************/
-        scriptL3Deep.push(`
-trgVal = target[key];
-if (!isObject(trgVal)) {
-  descriptor.value = trgVal = {};  
-  Object.defineProperty(target, key, descriptor);
-}
-merge(trgVal, srcVal, options, subPath);
-continue;`);
+        return target;
+    };
+    const _arrayClone = (arr, curPath) => {
+        return arr.map((x, index) => {
+            if (Array.isArray(x))
+                return _arrayClone(x, curPath + '[' + index + ']');
+            if (typeof x === 'object' && !(0, type_guards_js_1.isBuiltIn)(x))
+                return _merge({}, x, curPath + '[' + index + ']');
+            return x;
+        });
+    };
+    const sources = Array.isArray(sourceObject) ? sourceObject : [sourceObject];
+    for (const src of sources) {
+        _merge(targetObject, src);
     }
-    /** ************* finalize *****************/
-    scriptL1For.push(`
-descriptor.value = srcVal;
-Object.defineProperty(target, key, descriptor);`);
-    scriptL0.push('return target;');
-    const script = _flattenText(scriptL0);
-    const fn = Function('target', 'source', 'options', 'curPath', 'context', script);
-    context.merge = (target, source, opts, curPath) => fn(target, source, opts, curPath, context);
-    return context.merge;
-}
-function arrayClone(arr, options, _merge, curPath) {
-    return arr.map((x) => {
-        if (Array.isArray(x))
-            return arrayClone(x, options, _merge, curPath);
-        if (typeof x === 'object' && !(0, type_guards_js_1.isBuiltIn)(x))
-            return _merge({}, x, options, curPath);
-        return x;
-    });
-}
-function _flattenText(arr, level = 0) {
-    const indent = '  '.repeat(level);
-    return arr
-        .map(v => {
-        if (Array.isArray(v))
-            return _flattenText(v, level + 1);
-        return (indent +
-            String(v)
-                .trim()
-                .replace(/\n/g, '\n' + indent));
-    })
-        .join('\n');
+    return targetObject;
 }

package/cjs/omit.js

@@ -9,7 +9,7 @@ function omit(obj, keys) {
     const keysSet = new Set(keys);
     return (0, merge_js_1.merge)({}, obj, {
         deep: false,
-        filter(key) {
+        filter(_, { key }) {
             return !keysSet.has(key);
         },
     });

package/cjs/tsconfig-build-cjs.tsbuildinfo

@@ -1 +1 @@
-{"root":["../../src/clone.ts","../../src/index.ts","../../src/is-object.ts","../../src/merge.ts","../../src/omit.ts","../../src/type-guards.ts"],"version":"5.8.3"}
+{"root":["../../src/clone.ts","../../src/index.ts","../../src/is-object.ts","../../src/merge.ts","../../src/omit.ts","../../src/type-guards.ts"],"version":"5.9.2"}

package/esm/merge.js

@@ -1,237 +1,160 @@
 import { isObject, isPlainObject } from './is-object.js';
 import { isBuiltIn } from './type-guards.js';
-export function merge(target, source, options) {
-    if (!(isObject(target) || typeof target === 'function')) {
-        throw new TypeError('"target" argument must be an object');
-    }
-    source = source || {};
-    if (!(isObject(source) || typeof target === 'function')) {
-        throw new TypeError('"target" argument must be an object');
-    }
-    const fn = getMergeFunction(options);
-    return fn(target, source, options, '');
-}
-const functionCache = new Map();
-export function getMergeFunction(options) {
-    const cacheKey = [
-        options?.deep,
-        options?.moveArrays,
-        options?.keepExisting,
-        options?.copyDescriptors,
-        options?.ignore,
-        options?.ignoreUndefined,
-        options?.ignoreNulls,
-        options?.filter,
-    ]
-        .map(option => option == null
-        ? 'n'
-        : typeof option === 'function'
-            ? 'f'
-            : typeof option === 'string'
-                ? option
-                : option
-                    ? '1'
-                    : '0')
-        .join();
-    let fn = functionCache.get(cacheKey);
-    if (!fn) {
-        fn = buildMerge(options);
-        functionCache.set(cacheKey, fn);
-    }
-    return fn;
-}
-function buildMerge(options) {
-    const scriptL0 = [
-        `
-const { merge, isObject, isPlainObject, deepTest, arrayClone } = context;
 const hasOwnProperty = Object.prototype.hasOwnProperty;
-const keys = Object.getOwnPropertyNames(source);
-keys.push(...Object.getOwnPropertySymbols(source));
-let key;
-let descriptor;
-let srcVal;
-let trgVal;
-`,
-    ];
-    // noinspection JSUnusedGlobalSymbols
-    const context = {
-        deepTest: isPlainObject,
-        isPlainObject,
-        isObject,
-        arrayClone,
-        merge: null,
-    };
-    if (options?.deep) {
-        if (options.deep === 'full') {
-            context.deepTest = v => v && typeof v === 'object' && !isBuiltIn(v);
-        }
-        scriptL0.push(`let subPath;`, `let _isArray;`);
-        if (typeof options?.deep === 'function') {
-            scriptL0.push(`const deepCallback = options.deep;`);
-        }
-    }
-    if (typeof options?.ignore === 'function') {
-        scriptL0.push('const ignoreCallback = options.ignore;');
-    }
-    if (typeof options?.filter === 'function') {
-        scriptL0.push('const filterCallback = options.filter;');
-    }
-    if (typeof options?.copyDescriptors === 'function') {
-        scriptL0.push(`const copyDescriptorsCallback = options.copyDescriptors;`);
-    }
-    if (typeof options?.moveArrays === 'function') {
-        scriptL0.push(`const moveArraysCallback = options.moveArrays;`);
-    }
-    scriptL0.push(`
-if (isPlainObject(target)) Object.setPrototypeOf(target, Object.getPrototypeOf(source));  
-let i = 0;
-const len = keys.length;
-for (i = 0; i < len; i++) {
-  key = keys[i];
-  /** Should not overwrite __proto__ and constructor properties */
-  if (key === '__proto__' || key === 'constructor') continue;
-`);
-    const scriptL1For = [];
-    scriptL0.push(scriptL1For);
-    scriptL0.push('}');
-    /** ************* filter *****************/
-    if (options?.filter) {
-        scriptL1For.push(`
-if (!filterCallback(key, source, target, curPath)) {
-  delete target[key];
-  continue;
-}`);
-    }
-    /** ************* ignore *****************/
-    if (typeof options?.ignore === 'function') {
-        scriptL1For.push(`
-if (
-      hasOwnProperty.call(target, key) && 
-      ignoreCallback(key, source, target, curPath)
-   ) continue;
-`);
-    }
-    /** ************* copyDescriptors *****************/
-    if (options?.copyDescriptors) {
-        let scriptL2Descriptors = scriptL1For;
-        if (typeof options?.copyDescriptors === 'function') {
-            scriptL1For.push('if (copyDescriptorsCallback(key, source, target, curPath)) {');
-            scriptL2Descriptors = [];
-            scriptL1For.push(scriptL2Descriptors);
-            scriptL1For.push(`} else`);
-            scriptL1For.push(`  descriptor = {enumerable: true, configurable: true, writable: true}`);
-        }
-        scriptL2Descriptors.push(`
-  descriptor = { ...Object.getOwnPropertyDescriptor(source, key) }
-  if ((descriptor.get || descriptor.set)) {
-    Object.defineProperty(target, key, descriptor);
-    continue;
-  }
-  srcVal = source[key];`);
-    }
-    else {
-        scriptL1For.push(`descriptor = {enumerable: true, configurable: true, writable: true}`, `srcVal = source[key];`);
-    }
-    /** ************* keepExisting *****************/
-    if (options?.keepExisting) {
-        scriptL1For.push(`if (hasOwnProperty.call(target, key)) continue;`);
-    }
-    /** ************* ignoreUndefined *****************/
-    if (options?.ignoreUndefined ?? true) {
-        scriptL1For.push(`if (srcVal === undefined) continue;`);
-    }
-    /** ************* ignoreNulls *****************/
-    if (options?.ignoreNulls) {
-        scriptL1For.push(`if (srcVal === null) continue;`);
+export function merge(targetObject, sourceObject, options) {
+    if (!(isObject(targetObject) || typeof targetObject === 'function')) {
+        throw new TypeError('"target" argument must be an object');
     }
-    const deepArray = !options?.moveArrays || typeof options?.moveArrays === 'function';
-    /** ************* deep *****************/
-    if (options?.deep) {
-        if (deepArray) {
-            scriptL1For.push(`
-_isArray = Array.isArray(srcVal);
-if (typeof key !== 'symbol' && (_isArray || deepTest(srcVal))) {`);
-        }
-        else {
-            scriptL1For.push(`
-if (typeof key !== 'symbol' && deepTest(srcVal)) {
-  subPath = curPath + (curPath ? '.' : '') + key;`);
-        }
-        scriptL1For.push(`subPath = curPath + (curPath ? '.' : '') + key;`);
-        const scriptL2Deep = [];
-        scriptL1For.push(scriptL2Deep);
-        scriptL1For.push('}');
-        let scriptL3Deep = scriptL2Deep;
-        if (typeof options?.deep === 'function') {
-            scriptL2Deep.push(`
-if (deepCallback(key, subPath, target, source)) {`);
-            scriptL3Deep = [];
-            scriptL2Deep.push(scriptL3Deep);
-            scriptL2Deep.push('}');
-        }
-        /** ************* Array *****************/
-        if (!options?.moveArrays || typeof options?.moveArrays === 'function') {
-            scriptL3Deep.push(`if (_isArray) {`);
-            const scriptL4IsArray = [];
-            scriptL3Deep.push(scriptL4IsArray);
-            scriptL3Deep.push('}');
-            let scriptL5CloneArrays = scriptL4IsArray;
-            if (typeof options?.moveArrays === 'function') {
-                scriptL4IsArray.push(`
-if (moveArraysCallback(key, subPath, target, source)) {
-  descriptor.value = srcVal;
-  Object.defineProperty(target, key, descriptor);
-  continue;
-} else {`);
-                scriptL5CloneArrays = [];
-                scriptL4IsArray.push(scriptL5CloneArrays);
-                scriptL4IsArray.push('}');
+    if (sourceObject == null)
+        return targetObject;
+    if (!(isObject(sourceObject) ||
+        typeof sourceObject === 'function' ||
+        Array.isArray(sourceObject))) {
+        throw new TypeError('"target" argument must be an object or array of objects');
+    }
+    const keepExisting = options?.keepExisting;
+    const keepExistingFn = typeof options?.keepExisting === 'function'
+        ? options?.keepExisting
+        : undefined;
+    const filterFn = options?.filter;
+    const ignoreUndefined = options?.ignoreUndefined ?? true;
+    const ignoreNulls = options?.ignoreNulls;
+    const deep = options?.deep;
+    const deepFull = deep === 'full';
+    const deepFn = typeof options?.deep === 'function' ? options?.deep : undefined;
+    const copyDescriptors = options?.copyDescriptors;
+    const mergeArrays = options?.mergeArrays;
+    const mergeArraysUnique = options?.mergeArrays === 'unique';
+    const mergeArraysFn = typeof options?.mergeArrays === 'function'
+        ? options?.mergeArrays
+        : undefined;
+    const _merge = (target, source, parentPath = '') => {
+        if (!isObject(source))
+            return;
+        const keys = Object.getOwnPropertyNames(source);
+        if (options?.symbolKeys ?? true)
+            keys.push(...Object.getOwnPropertySymbols(source));
+        let key;
+        let descriptor;
+        let srcVal;
+        let _goDeep = false;
+        if (isPlainObject(target))
+            Object.setPrototypeOf(target, Object.getPrototypeOf(source));
+        const ignoreFn = options?.ignoreSource;
+        let i = 0;
+        const len = keys.length;
+        for (i = 0; i < len; i++) {
+            key = keys[i];
+            /** Should not overwrite __proto__ and constructor properties */
+            if (key === '__proto__' || key === 'constructor')
+                continue;
+            if (copyDescriptors) {
+                descriptor = Object.getOwnPropertyDescriptor(source, key);
+                if (descriptor?.get || descriptor?.set) {
+                    Object.defineProperty(target, key, descriptor);
+                    continue;
+                }
+            }
+            srcVal = source[key];
+            if (ignoreFn?.(srcVal, {
+                key,
+                source,
+                target,
+                path: parentPath + (parentPath ? '.' : '') + String(key),
+            })) {
+                continue;
+            }
+            if (keepExisting && hasOwnProperty.call(target, key)) {
+                if (!keepExistingFn)
+                    continue;
+                if (keepExistingFn(srcVal, {
+                    key,
+                    source,
+                    target,
+                    path: parentPath + (parentPath ? '.' : '') + String(key),
+                })) {
+                    continue;
+                }
+            }
+            if (filterFn &&
+                !filterFn(srcVal, {
+                    key,
+                    source,
+                    target,
+                    path: parentPath + (parentPath ? '.' : '') + String(key),
+                })) {
+                continue;
             }
-            scriptL5CloneArrays.push(`
-descriptor.value = arrayClone(srcVal, options, merge, subPath);
-Object.defineProperty(target, key, descriptor);
-continue;
-`);
+            if (ignoreUndefined && srcVal === undefined) {
+                continue;
+            }
+            if (ignoreNulls && srcVal === null) {
+                continue;
+            }
+            if (deep &&
+                typeof srcVal === 'object' &&
+                (!isBuiltIn(srcVal) || Array.isArray(srcVal))) {
+                _goDeep =
+                    (deepFn &&
+                        deepFn(srcVal, {
+                            key,
+                            source,
+                            target,
+                            path: parentPath + (parentPath ? '.' : '') + String(key),
+                        })) ||
+                        (!deepFn &&
+                            (deepFull || isPlainObject(srcVal) || Array.isArray(srcVal)));
+                if (_goDeep) {
+                    /** Array */
+                    if (Array.isArray(srcVal)) {
+                        if (Array.isArray(target[key]) &&
+                            (mergeArrays ||
+                                mergeArraysFn?.(srcVal, {
+                                    key,
+                                    source,
+                                    target,
+                                    path: parentPath + (parentPath ? '.' : '') + String(key),
+                                }))) {
+                            target[key] = _arrayClone(target[key], parentPath + (parentPath ? '.' : '') + String(key));
+                        }
+                        else
+                            target[key] = [];
+                        target[key].push(..._arrayClone(srcVal, parentPath + (parentPath ? '.' : '') + String(key)));
+                        if (mergeArraysUnique)
+                            target[key] = Array.from(new Set(target[key]));
+                        continue;
+                    }
+                    else {
+                        /** Object */
+                        if (!isObject(target[key]))
+                            target[key] = {};
+                        _merge(target[key], srcVal, parentPath + (parentPath ? '.' : '') + String(key));
+                        continue;
+                    }
+                }
+            }
+            if (copyDescriptors) {
+                descriptor = { ...Object.getOwnPropertyDescriptor(source, key) };
+                descriptor.value = srcVal;
+                Object.defineProperty(target, key, descriptor);
+                continue;
+            }
+            target[key] = srcVal;
         }
-        /** ************* object *****************/
-        scriptL3Deep.push(`
-trgVal = target[key];
-if (!isObject(trgVal)) {
-  descriptor.value = trgVal = {};  
-  Object.defineProperty(target, key, descriptor);
-}
-merge(trgVal, srcVal, options, subPath);
-continue;`);
+        return target;
+    };
+    const _arrayClone = (arr, curPath) => {
+        return arr.map((x, index) => {
+            if (Array.isArray(x))
+                return _arrayClone(x, curPath + '[' + index + ']');
+            if (typeof x === 'object' && !isBuiltIn(x))
+                return _merge({}, x, curPath + '[' + index + ']');
+            return x;
+        });
+    };
+    const sources = Array.isArray(sourceObject) ? sourceObject : [sourceObject];
+    for (const src of sources) {
+        _merge(targetObject, src);
     }
-    /** ************* finalize *****************/
-    scriptL1For.push(`
-descriptor.value = srcVal;
-Object.defineProperty(target, key, descriptor);`);
-    scriptL0.push('return target;');
-    const script = _flattenText(scriptL0);
-    const fn = Function('target', 'source', 'options', 'curPath', 'context', script);
-    context.merge = (target, source, opts, curPath) => fn(target, source, opts, curPath, context);
-    return context.merge;
-}
-function arrayClone(arr, options, _merge, curPath) {
-    return arr.map((x) => {
-        if (Array.isArray(x))
-            return arrayClone(x, options, _merge, curPath);
-        if (typeof x === 'object' && !isBuiltIn(x))
-            return _merge({}, x, options, curPath);
-        return x;
-    });
-}
-function _flattenText(arr, level = 0) {
-    const indent = '  '.repeat(level);
-    return arr
-        .map(v => {
-        if (Array.isArray(v))
-            return _flattenText(v, level + 1);
-        return (indent +
-            String(v)
-                .trim()
-                .replace(/\n/g, '\n' + indent));
-    })
-        .join('\n');
+    return targetObject;
 }

package/esm/omit.js

@@ -3,7 +3,7 @@ export function omit(obj, keys) {
     const keysSet = new Set(keys);
     return merge({}, obj, {
         deep: false,
-        filter(key) {
+        filter(_, { key }) {
             return !keysSet.has(key);
         },
     });

package/esm/tsconfig-build-esm.tsbuildinfo

@@ -1 +1 @@
-{"root":["../../src/clone.ts","../../src/index.ts","../../src/is-object.ts","../../src/merge.ts","../../src/omit.ts","../../src/type-guards.ts"],"version":"5.8.3"}
+{"root":["../../src/clone.ts","../../src/index.ts","../../src/is-object.ts","../../src/merge.ts","../../src/omit.ts","../../src/type-guards.ts"],"version":"5.9.2"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@jsopen/objects",
   "description": "Helper utilities for working with JavaScript objects and arrays",
-  "version": "1.6.3",
+  "version": "2.0.1",
   "author": "Panates",
   "license": "MIT",
   "dependencies": {

package/types/merge.d.ts

@@ -1,26 +1,72 @@
 export declare function merge<A, B>(target: A, source: B, options?: merge.Options): A & B;
-export declare function getMergeFunction(options?: merge.Options): Function;
+export declare function merge<A, B, C>(target: A, source: [B, C], options?: merge.Options): A & B & C;
+export declare function merge<A, B, C, D>(target: A, source: [B, C, D], options?: merge.Options): A & B & C & D;
+export declare function merge<A, B, C, D, E>(target: A, source: [B, C, D, E], options?: merge.Options): A & B & C & D & E;
+export declare function merge<A, B, C, D, F>(target: A, source: [B, C, D, F], options?: merge.Options): A & B & C & D & F;
+/**
+ * @namespace
+ */
 export declare namespace merge {
-    type NodeCallback = (key: string | symbol, source: any, target: any, path: string) => boolean;
+    type CallbackFn = (value: any, ctx: CallbackContext) => boolean;
+    interface CallbackContext {
+        source: any;
+        target: any;
+        key: string | symbol | number;
+        path: string;
+    }
     interface Options {
-        deep?: boolean | 'full' | NodeCallback;
         /**
+         * Optional variable that determines the depth of an operation or inclusion behavior.
+         *
+         * - If set to `true`, it enables a deep operation for only native js objects, excluding classes.
+         * - If set to `'full'`, it enables a deep operation for all objects, including classes, excluding built-in objects
+         * - If assigned a `NodeCallback` function, it provides a custom callback mechanism for handling the operation.
+         *
+         * This variable can be used to define the level of depth or customization for a given process.
+         * @default false
          */
-        moveArrays?: boolean | NodeCallback;
+        deep?: boolean | 'full' | CallbackFn;
         /**
-         * Do not overwrite existing properties if set true
-         * @default false
+         * Indicates whether symbol keys should be included.
+         * If set to `true`, properties with symbol keys will be considered.
+         * If `false` or `undefined`, symbol keys will be ignored.
+         * @default true
          */
-        keepExisting?: boolean;
+        symbolKeys?: boolean;
         /**
-         * Copy property descriptors
-         * @default false
+         * Specifies the behavior for merging arrays during a particular operation.
+         *
+         * When set to `true`, all array elements will be deeply merged, preserving all duplicates.
+         * When set to `'unique'`, only unique elements will be preserved in the merged array.
+         * If a callback function (`CallbackFn`) is provided, it determines the custom merging logic for the arrays.
          */
-        copyDescriptors?: boolean | NodeCallback;
+        mergeArrays?: boolean | 'unique' | CallbackFn;
         /**
-         * Do not copy source field if callback returns true
+         * Determines whether to retain pre-existing values.
+         * If set to `true`, existing entities are preserved without modification.
+         * If set to `false`, existing entities may be replaced or overridden by new ones.
+         * Alternatively, can be assigned a callback function (`CallbackFn`) that dynamically resolves whether to keep existing entities based on custom logic.
          */
-        ignore?: NodeCallback;
+        keepExisting?: boolean | CallbackFn;
+        /**
+         * A boolean flag that determines whether property descriptors
+         * should be copied when transferring properties from one object
+         * to another.
+         *
+         * If set to true, both the value and descriptor metadata
+         * (e.g., writable, configurable, enumerable) of a property
+         * will be copied. If set to false or undefined, only the
+         * property values will be copied, without preserving descriptor
+         * details.
+         *
+         * This is typically used when needing to retain detailed control
+         * over property attributes during object manipulation.
+         */
+        copyDescriptors?: boolean;
+        /**
+         * Ignores the source field if callback returns true
+         */
+        ignoreSource?: CallbackFn;
         /**
          * Ignore fields which values are "undefined"
          * @default true
@@ -32,8 +78,8 @@ export declare namespace merge {
          */
         ignoreNulls?: boolean;
         /**
-         *
+         * Ignores both target and source field if callback returns true
          */
-        filter?: NodeCallback;
+        filter?: CallbackFn;
     }
 }