@domql/utils 2.3.118 → 2.3.120

package/dist/cjs/object.js

@@ -33,6 +33,7 @@ __export(object_exports, {
   isEqualDeep: () => isEqualDeep,
   map: () => map,
   merge: () => merge,
+  mergeArrayExclude: () => mergeArrayExclude,
   mergeIfExisted: () => mergeIfExisted,
   overwrite: () => overwrite,
   overwriteDeep: () => overwriteDeep,
@@ -55,30 +56,30 @@ const exec = (param, element, state, context) => {
   return param;
 };
 const map = (obj, extention, element) => {
-  for (const e2 in extention) {
-    obj[e2] = exec(extention[e2], element);
+  for (const e in extention) {
+    obj[e] = exec(extention[e], element);
   }
 };
 const merge = (element, obj) => {
-  for (const e2 in obj) {
-    const elementProp = element[e2];
-    const objProp = obj[e2];
+  for (const e in obj) {
+    const elementProp = element[e];
+    const objProp = obj[e];
     if (elementProp === void 0) {
-      element[e2] = objProp;
+      element[e] = objProp;
     }
   }
   return element;
 };
 const deepMerge = (element, extend, excludeFrom = []) => {
-  for (const e2 in extend) {
-    if (excludeFrom.includes(e2) || e2.includes("__"))
+  for (const e in extend) {
+    if (excludeFrom.includes(e) || e.includes("__"))
       continue;
-    const elementProp = element[e2];
-    const extendProp = extend[e2];
+    const elementProp = element[e];
+    const extendProp = extend[e];
     if ((0, import_types.isObjectLike)(elementProp) && (0, import_types.isObjectLike)(extendProp)) {
       deepMerge(elementProp, extendProp);
     } else if (elementProp === void 0) {
-      element[e2] = extendProp;
+      element[e] = extendProp;
     }
   }
   return element;
@@ -86,7 +87,7 @@ const deepMerge = (element, extend, excludeFrom = []) => {
 const clone = (obj, excludeFrom = []) => {
   const o = {};
   for (const prop in obj) {
-    if (excludeFrom.includes(e) || e.includes("__"))
+    if (excludeFrom.includes(prop) || prop.includes("__"))
       continue;
     o[prop] = obj[prop];
   }
@@ -113,6 +114,9 @@ const deepCloneExclude = (obj, excludeFrom = []) => {
   }
   return o;
 };
+const mergeArrayExclude = (arr, excl = []) => {
+  return arr.reduce((acc, curr) => deepMerge(acc, deepCloneExclude(curr, excl)), {});
+};
 const deepClone = (obj, excludeFrom = []) => {
   const o = (0, import_types.isArray)(obj) ? [] : {};
   for (const prop in obj) {
@@ -189,8 +193,8 @@ const deepDestringify = (obj, stringified = {}) => {
         try {
           const evalProp = import_globals.window.eval(`(${objProp})`);
           stringified[prop] = evalProp;
-        } catch (e2) {
-          if (e2)
+        } catch (e) {
+          if (e)
             stringified[prop] = objProp;
         }
       } else {
@@ -204,8 +208,8 @@ const deepDestringify = (obj, stringified = {}) => {
             try {
               const evalProp = import_globals.window.eval(`(${arrProp})`);
               stringified[prop].push(evalProp);
-            } catch (e2) {
-              if (e2)
+            } catch (e) {
+              if (e)
                 stringified[prop].push(arrProp);
             }
           } else {
@@ -228,29 +232,29 @@ const deepDestringify = (obj, stringified = {}) => {
 const overwrite = (element, params, excludeFrom = []) => {
   const { ref } = element;
   const changes = {};
-  for (const e2 in params) {
-    if (excludeFrom.includes(e2) || e2.includes("__"))
+  for (const e in params) {
+    if (excludeFrom.includes(e) || e.includes("__"))
       continue;
-    const elementProp = element[e2];
-    const paramsProp = params[e2];
+    const elementProp = element[e];
+    const paramsProp = params[e];
     if (paramsProp) {
-      ref.__cache[e2] = changes[e2] = elementProp;
-      ref[e2] = paramsProp;
+      ref.__cache[e] = changes[e] = elementProp;
+      ref[e] = paramsProp;
     }
   }
   return changes;
 };
 const diffObjects = (original, objToDiff, cache) => {
-  for (const e2 in objToDiff) {
-    if (e2 === "ref")
+  for (const e in objToDiff) {
+    if (e === "ref")
       continue;
-    const originalProp = original[e2];
-    const objToDiffProp = objToDiff[e2];
+    const originalProp = original[e];
+    const objToDiffProp = objToDiff[e];
     if ((0, import_types.isObject)(originalProp) && (0, import_types.isObject)(objToDiffProp)) {
-      cache[e2] = {};
-      diff(originalProp, objToDiffProp, cache[e2]);
+      cache[e] = {};
+      diff(originalProp, objToDiffProp, cache[e]);
     } else if (objToDiffProp !== void 0) {
-      cache[e2] = objToDiffProp;
+      cache[e] = objToDiffProp;
     }
   }
   return cache;
@@ -283,33 +287,33 @@ const diff = (original, objToDiff, cache = {}) => {
 };
 const overwriteObj = (params, obj) => {
   const changes = {};
-  for (const e2 in params) {
-    const objProp = obj[e2];
-    const paramsProp = params[e2];
+  for (const e in params) {
+    const objProp = obj[e];
+    const paramsProp = params[e];
     if (paramsProp) {
-      obj[e2] = changes[e2] = objProp;
+      obj[e] = changes[e] = objProp;
     }
   }
   return changes;
 };
 const overwriteShallow = (obj, params, excludeFrom = []) => {
-  for (const e2 in params) {
-    if (excludeFrom.includes(e2) || e2.includes("__"))
+  for (const e in params) {
+    if (excludeFrom.includes(e) || e.includes("__"))
       continue;
-    obj[e2] = params[e2];
+    obj[e] = params[e];
   }
   return obj;
 };
-const overwriteDeep = (params, obj, excludeFrom = []) => {
-  for (const e2 in params) {
-    if (excludeFrom.includes(e2) || e2.includes("__"))
+const overwriteDeep = (obj, params, excludeFrom = []) => {
+  for (const e in params) {
+    if (excludeFrom.includes(e) || e.includes("__"))
       continue;
-    const objProp = obj[e2];
-    const paramsProp = params[e2];
+    const objProp = obj[e];
+    const paramsProp = params[e];
     if ((0, import_types.isObjectLike)(objProp) && (0, import_types.isObjectLike)(paramsProp)) {
-      overwriteDeep(paramsProp, objProp);
+      overwriteDeep(objProp, paramsProp);
     } else if (paramsProp !== void 0) {
-      obj[e2] = paramsProp;
+      obj[e] = paramsProp;
     }
   }
   return obj;
@@ -320,7 +324,7 @@ const mergeIfExisted = (a, b) => {
   return a || b;
 };
 const flattenRecursive = (param, prop, stack = []) => {
-  const objectized = mergeAndCloneIfArray(param);
+  const objectized = (0, import_array.mergeAndCloneIfArray)(param);
   stack.push(objectized);
   const extendOfExtend = objectized[prop];
   if (extendOfExtend)

package/object.js

@@ -2,8 +2,7 @@
 
 import { window } from '@domql/globals'
 import { isFunction, isObjectLike, isObject, isArray, isString, is } from './types.js'
-import { mergeArray } from './array.js'
-
+import { mergeAndCloneIfArray, mergeArray } from './array.js'
 
 export const exec = (param, element, state, context) => {
   if (isFunction(param)) {
@@ -50,7 +49,7 @@ export const deepMerge = (element, extend, excludeFrom = []) => {
 export const clone = (obj, excludeFrom = []) => {
   const o = {}
   for (const prop in obj) {
-    if (excludeFrom.includes(e) || e.includes('__')) continue
+    if (excludeFrom.includes(prop) || prop.includes('__')) continue
     o[prop] = obj[prop]
   }
   return o
@@ -82,6 +81,11 @@ export const deepCloneExclude = (obj, excludeFrom = []) => {
   return o
 }
 
+// Merge array, but exclude keys listed in 'excl'
+export const mergeArrayExclude = (arr, excl = []) => {
+  return arr.reduce((acc, curr) => deepMerge(acc, deepCloneExclude(curr, excl)), {})
+}
+
 /**
  * Deep cloning of object
  */
@@ -297,13 +301,13 @@ export const overwriteShallow = (obj, params, excludeFrom = []) => {
 /**
  * Overwrites DEEPLY object properties with another
  */
-export const overwriteDeep = (params, obj, excludeFrom = []) => {
+export const overwriteDeep = (obj, params, excludeFrom = []) => {
   for (const e in params) {
     if (excludeFrom.includes(e) || e.includes('__')) continue
     const objProp = obj[e]
     const paramsProp = params[e]
     if (isObjectLike(objProp) && isObjectLike(paramsProp)) {
-      overwriteDeep(paramsProp, objProp)
+      overwriteDeep(objProp, paramsProp)
     } else if (paramsProp !== undefined) {
       obj[e] = paramsProp
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@domql/utils",
-  "version": "2.3.118",
+  "version": "2.3.120",
   "license": "MIT",
   "type": "module",
   "module": "index.js",
@@ -23,7 +23,7 @@
     "@domql/key": "latest",
     "@domql/tags": "latest"
   },
-  "gitHead": "51d72040aa837fc2b93e7699277750797af276f1",
+  "gitHead": "6e932a813b8e6ee0a57a40ebc6dc757cc44e6427",
   "devDependencies": {
     "@babel/core": "^7.12.0"
   }