@jsopen/objects 1.4.0 → 1.4.2

package/CHANGELOG.md

@@ -1,6 +1,6 @@
-# v1.4.0
-[2024-11-22]
+# v1.4.2
+[2024-11-23]
 
 ### Changes
 
-* feat: Added "full" option to "deep" config ([`3d2a51a`](https://github.com/panates/jsopen-objects/commit/3d2a51adff14d2ac67f3ec0c8760ae167febc4d7))
+* refactor: Optimized typing ([`52b8f3a`](https://github.com/panates/jsopen-objects/commit/52b8f3a9ec0584c5afc77277b9b3269828cc7866))

package/cjs/merge.js

@@ -13,7 +13,7 @@ function merge(target, source, options) {
         throw new TypeError('"target" argument must be an object');
     }
     const fn = getMergeFunction(options);
-    return fn(target, source, '', options, fn, type_guards_js_1.isBuiltIn, is_object_js_1.isObject, is_object_js_1.isPlainObject, arrayClone);
+    return fn(target, source, '', options, fn, is_object_js_1.isObject, is_object_js_1.isPlainObject, arrayClone);
 }
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
 const functionCache = new Map();
@@ -46,21 +46,10 @@ function getMergeFunction(options) {
     return fn;
 }
 function buildMerge(options) {
-    const args = [
-        'target',
-        'source',
-        'curPath',
-        'options',
-        'mergeFunction',
-        'isBuiltIn',
-        'isObject',
-        'isPlainObject',
-        'arrayClone',
-    ];
     const scriptL0 = [
         `
-const _merge = (_trgVal, _srcVal, _curPath) => 
-    mergeFunction(_trgVal, _srcVal, _curPath, options, mergeFunction, isBuiltIn, isObject, isPlainObject, arrayClone);
+const { options, merge, isObject, isPlainObject, deepTest, arrayClone } = context;
+const hasOwnProperty = Object.prototype.hasOwnProperty;
 const keys = Object.getOwnPropertyNames(source);
 keys.push(...Object.getOwnPropertySymbols(source));
 let key;
@@ -69,7 +58,19 @@ let srcVal;
 let trgVal;
 `,
     ];
+    // noinspection JSUnusedGlobalSymbols
+    const context = {
+        options,
+        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 => 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;`);
@@ -111,14 +112,11 @@ if (!filterCallback(key, source, target, curPath)) {
     if (typeof options?.ignore === 'function') {
         scriptL1For.push(`
 if (
-      Object.prototype.hasOwnProperty.call(target, key) && 
+      hasOwnProperty.call(target, key) && 
       ignoreCallback(key, source, target, curPath)
    ) continue;
 `);
     }
-    // scriptL1For.push(
-    //   `descriptor = { ...Object.getOwnPropertyDescriptor(source, key) };`,
-    // );
     /** ************* copyDescriptors *****************/
     if (options?.copyDescriptors) {
         let scriptL2Descriptors = scriptL1For;
@@ -155,17 +153,14 @@ if (
     const deepArray = !options?.moveArrays || typeof options?.moveArrays === 'function';
     /** ************* deep *****************/
     if (options?.deep) {
-        const deepCondition = options.deep === 'full'
-            ? `typeof srcVal === 'object' && !isBuiltIn(srcVal)`
-            : `isPlainObject(srcVal)`;
         if (deepArray) {
             scriptL1For.push(`
 _isArray = Array.isArray(srcVal);
-if (typeof key !== 'symbol' && (_isArray || (${deepCondition}))) {`);
+if (typeof key !== 'symbol' && (_isArray || deepTest(srcVal))) {`);
         }
         else {
             scriptL1For.push(`
-if (typeof key !== 'symbol' && ${deepCondition}) {
+if (typeof key !== 'symbol' && deepTest(srcVal)) {
   subPath = curPath + (curPath ? '.' : '') + key;`);
         }
         scriptL1For.push(`subPath = curPath + (curPath ? '.' : '') + key;`);
@@ -199,7 +194,7 @@ if (moveArraysCallback(key, subPath, target, source)) {
                 scriptL4IsArray.push('}');
             }
             scriptL5CloneArrays.push(`
-descriptor.value = arrayClone(srcVal, _merge, subPath);
+descriptor.value = arrayClone(srcVal, merge, subPath);
 Object.defineProperty(target, key, descriptor);
 continue;
 `);
@@ -211,7 +206,7 @@ if (!isObject(trgVal)) {
   descriptor.value = trgVal = {};  
   Object.defineProperty(target, key, descriptor);
 }
-_merge(trgVal, srcVal, subPath, options);
+merge(trgVal, srcVal, subPath, options);
 continue;`);
     }
     /** ************* finalize *****************/
@@ -221,7 +216,9 @@ Object.defineProperty(target, key, descriptor);`);
     scriptL0.push('return target;');
     const script = _flattenText(scriptL0);
     // eslint-disable-next-line @typescript-eslint/no-implied-eval,prefer-const
-    return Function(...args, script);
+    const fn = Function('target', 'source', 'curPath', 'context', script);
+    context.merge = (target, source, curPath) => fn(target, source, curPath, context);
+    return context.merge;
 }
 function arrayClone(arr, _merge, curPath) {
     return arr.map((x) => {

package/esm/merge.js

@@ -9,7 +9,7 @@ export function merge(target, source, options) {
         throw new TypeError('"target" argument must be an object');
     }
     const fn = getMergeFunction(options);
-    return fn(target, source, '', options, fn, isBuiltIn, isObject, isPlainObject, arrayClone);
+    return fn(target, source, '', options, fn, isObject, isPlainObject, arrayClone);
 }
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
 const functionCache = new Map();
@@ -42,21 +42,10 @@ export function getMergeFunction(options) {
     return fn;
 }
 function buildMerge(options) {
-    const args = [
-        'target',
-        'source',
-        'curPath',
-        'options',
-        'mergeFunction',
-        'isBuiltIn',
-        'isObject',
-        'isPlainObject',
-        'arrayClone',
-    ];
     const scriptL0 = [
         `
-const _merge = (_trgVal, _srcVal, _curPath) => 
-    mergeFunction(_trgVal, _srcVal, _curPath, options, mergeFunction, isBuiltIn, isObject, isPlainObject, arrayClone);
+const { options, merge, isObject, isPlainObject, deepTest, arrayClone } = context;
+const hasOwnProperty = Object.prototype.hasOwnProperty;
 const keys = Object.getOwnPropertyNames(source);
 keys.push(...Object.getOwnPropertySymbols(source));
 let key;
@@ -65,7 +54,19 @@ let srcVal;
 let trgVal;
 `,
     ];
+    // noinspection JSUnusedGlobalSymbols
+    const context = {
+        options,
+        deepTest: isPlainObject,
+        isPlainObject,
+        isObject,
+        arrayClone,
+        merge: null,
+    };
     if (options?.deep) {
+        if (options.deep === 'full') {
+            context.deepTest = v => typeof v === 'object' && !isBuiltIn(v);
+        }
         scriptL0.push(`let subPath;`, `let _isArray;`);
         if (typeof options?.deep === 'function') {
             scriptL0.push(`const deepCallback = options.deep;`);
@@ -107,14 +108,11 @@ if (!filterCallback(key, source, target, curPath)) {
     if (typeof options?.ignore === 'function') {
         scriptL1For.push(`
 if (
-      Object.prototype.hasOwnProperty.call(target, key) && 
+      hasOwnProperty.call(target, key) && 
       ignoreCallback(key, source, target, curPath)
    ) continue;
 `);
     }
-    // scriptL1For.push(
-    //   `descriptor = { ...Object.getOwnPropertyDescriptor(source, key) };`,
-    // );
     /** ************* copyDescriptors *****************/
     if (options?.copyDescriptors) {
         let scriptL2Descriptors = scriptL1For;
@@ -151,17 +149,14 @@ if (
     const deepArray = !options?.moveArrays || typeof options?.moveArrays === 'function';
     /** ************* deep *****************/
     if (options?.deep) {
-        const deepCondition = options.deep === 'full'
-            ? `typeof srcVal === 'object' && !isBuiltIn(srcVal)`
-            : `isPlainObject(srcVal)`;
         if (deepArray) {
             scriptL1For.push(`
 _isArray = Array.isArray(srcVal);
-if (typeof key !== 'symbol' && (_isArray || (${deepCondition}))) {`);
+if (typeof key !== 'symbol' && (_isArray || deepTest(srcVal))) {`);
         }
         else {
             scriptL1For.push(`
-if (typeof key !== 'symbol' && ${deepCondition}) {
+if (typeof key !== 'symbol' && deepTest(srcVal)) {
   subPath = curPath + (curPath ? '.' : '') + key;`);
         }
         scriptL1For.push(`subPath = curPath + (curPath ? '.' : '') + key;`);
@@ -195,7 +190,7 @@ if (moveArraysCallback(key, subPath, target, source)) {
                 scriptL4IsArray.push('}');
             }
             scriptL5CloneArrays.push(`
-descriptor.value = arrayClone(srcVal, _merge, subPath);
+descriptor.value = arrayClone(srcVal, merge, subPath);
 Object.defineProperty(target, key, descriptor);
 continue;
 `);
@@ -207,7 +202,7 @@ if (!isObject(trgVal)) {
   descriptor.value = trgVal = {};  
   Object.defineProperty(target, key, descriptor);
 }
-_merge(trgVal, srcVal, subPath, options);
+merge(trgVal, srcVal, subPath, options);
 continue;`);
     }
     /** ************* finalize *****************/
@@ -217,7 +212,9 @@ Object.defineProperty(target, key, descriptor);`);
     scriptL0.push('return target;');
     const script = _flattenText(scriptL0);
     // eslint-disable-next-line @typescript-eslint/no-implied-eval,prefer-const
-    return Function(...args, script);
+    const fn = Function('target', 'source', 'curPath', 'context', script);
+    context.merge = (target, source, curPath) => fn(target, source, curPath, context);
+    return context.merge;
 }
 function arrayClone(arr, _merge, curPath) {
     return arr.map((x) => {

package/package.json

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

package/types/merge.d.ts

@@ -1,3 +1,5 @@
+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 namespace merge {
     type NodeCallback = (key: string | symbol, source: any, target: any, path: string) => boolean;
     interface Options {
@@ -35,5 +37,3 @@ export declare namespace merge {
         filter?: NodeCallback;
     }
 }
-export declare function merge<A, B>(target: A, source: B, options?: merge.Options): A & B;
-export declare function getMergeFunction(options?: merge.Options): Function;