@domql/utils 2.3.110 → 2.3.113

package/array.js

@@ -1,5 +1,6 @@
 'use strict'
 
+import { deepClone, deepMerge } from './object'
 import { isArray, isNumber, isString } from './types'
 
 export const arrayContainsOtherArray = (arr1, arr2) => {
@@ -28,3 +29,17 @@ export const swapItemsInArray = (arr, i, j) => {
 export const joinArrays = (...arrays) => {
   return [].concat(...arrays)
 }
+
+/**
+ * Merges array extendtypes
+ */
+export const mergeArray = (arr) => {
+  return arr.reduce((a, c) => deepMerge(a, deepClone(c)), {})
+}
+
+/**
+ * Merges array extends
+ */
+export const mergeAndCloneIfArray = obj => {
+  return isArray(obj) ? mergeArray(obj) : deepClone(obj)
+}

package/dist/cjs/array.js

@@ -20,10 +20,13 @@ var array_exports = {};
 __export(array_exports, {
   arrayContainsOtherArray: () => arrayContainsOtherArray,
   joinArrays: () => joinArrays,
+  mergeAndCloneIfArray: () => mergeAndCloneIfArray,
+  mergeArray: () => mergeArray,
   removeFromArray: () => removeFromArray,
   swapItemsInArray: () => swapItemsInArray
 });
 module.exports = __toCommonJS(array_exports);
+var import_object = require("./object");
 var import_types = require("./types");
 const arrayContainsOtherArray = (arr1, arr2) => {
   return arr2.every((val) => arr1.includes(val));
@@ -49,3 +52,9 @@ const swapItemsInArray = (arr, i, j) => {
 const joinArrays = (...arrays) => {
   return [].concat(...arrays);
 };
+const mergeArray = (arr) => {
+  return arr.reduce((a, c) => (0, import_object.deepMerge)(a, (0, import_object.deepClone)(c)), {});
+};
+const mergeAndCloneIfArray = (obj) => {
+  return (0, import_types.isArray)(obj) ? mergeArray(obj) : (0, import_object.deepClone)(obj);
+};

package/dist/cjs/object.js

@@ -34,12 +34,12 @@ __export(object_exports, {
   map: () => map,
   merge: () => merge,
   mergeAndCloneIfArray: () => mergeAndCloneIfArray,
-  mergeArray: () => mergeArray,
   mergeArrayExclude: () => mergeArrayExclude,
   mergeIfExisted: () => mergeIfExisted,
   overwrite: () => overwrite,
   overwriteDeep: () => overwriteDeep,
   overwriteObj: () => overwriteObj,
+  overwriteShallow: () => overwriteShallow,
   removeFromObject: () => removeFromObject
 });
 module.exports = __toCommonJS(object_exports);
@@ -56,59 +56,59 @@ const exec = (param, element, state, context) => {
   return param;
 };
 const map = (obj, extention, element) => {
-  for (const e in extention) {
-    obj[e] = exec(extention[e], element);
+  for (const e2 in extention) {
+    obj[e2] = exec(extention[e2], element);
   }
 };
 const merge = (element, obj) => {
-  for (const e in obj) {
-    const elementProp = element[e];
-    const objProp = obj[e];
+  for (const e2 in obj) {
+    const elementProp = element[e2];
+    const objProp = obj[e2];
     if (elementProp === void 0) {
-      element[e] = objProp;
+      element[e2] = objProp;
     }
   }
   return element;
 };
-const deepMerge = (element, extend) => {
-  for (const e in extend) {
-    const elementProp = element[e];
-    const extendProp = extend[e];
-    if (e === "parent" || e === "props")
+const deepMerge = (element, extend, excludeFrom = []) => {
+  for (const e2 in extend) {
+    if (excludeFrom.includes(e2) || e2.includes("__"))
       continue;
+    const elementProp = element[e2];
+    const extendProp = extend[e2];
     if ((0, import_types.isObjectLike)(elementProp) && (0, import_types.isObjectLike)(extendProp)) {
       deepMerge(elementProp, extendProp);
     } else if (elementProp === void 0) {
-      element[e] = extendProp;
+      element[e2] = extendProp;
     }
   }
   return element;
 };
-const clone = (obj) => {
+const clone = (obj, excludeFrom = []) => {
   const o = {};
   for (const prop in obj) {
-    if (prop === "node")
+    if (excludeFrom.includes(e) || e.includes("__"))
       continue;
     o[prop] = obj[prop];
   }
   return o;
 };
-const deepCloneExclude = (obj, exclude = []) => {
+const deepCloneExclude = (obj, excludeFrom = []) => {
   if ((0, import_types.isArray)(obj)) {
-    return obj.map((x) => deepCloneExclude(x, exclude));
+    return obj.map((x) => deepCloneExclude(x, excludeFrom));
   }
   const o = {};
   for (const k in obj) {
-    if (exclude.indexOf(k) > -1)
+    if (excludeFrom.includes(k) || k.includes("__"))
       continue;
     let v = obj[k];
     if (k === "extend" && (0, import_types.isArray)(v)) {
-      v = mergeArrayExclude(v, exclude);
+      v = mergeArrayExclude(v, excludeFrom);
     }
     if ((0, import_types.isArray)(v)) {
-      o[k] = v.map((x) => deepCloneExclude(x, exclude));
+      o[k] = v.map((x) => deepCloneExclude(x, excludeFrom));
     } else if ((0, import_types.isObject)(v)) {
-      o[k] = deepCloneExclude(v, exclude);
+      o[k] = deepCloneExclude(v, excludeFrom);
     } else
       o[k] = v;
   }
@@ -117,20 +117,17 @@ const deepCloneExclude = (obj, exclude = []) => {
 const mergeArrayExclude = (arr, excl = []) => {
   return arr.reduce((acc, curr) => deepMerge(acc, deepCloneExclude(curr, excl)), {});
 };
-const deepClone = (obj) => {
-  if ((0, import_types.isArray)(obj)) {
-    return obj.map(deepClone);
-  }
-  const o = {};
+const deepClone = (obj, excludeFrom = []) => {
+  const o = (0, import_types.isArray)(obj) ? [] : {};
   for (const prop in obj) {
+    if (excludeFrom.includes(prop) || prop.includes("__"))
+      continue;
     let objProp = obj[prop];
     if (prop === "extend" && (0, import_types.isArray)(objProp)) {
       objProp = mergeArray(objProp);
     }
-    if ((0, import_types.isArray)(objProp)) {
-      o[prop] = objProp.map((v) => (0, import_types.isObject)(v) ? deepClone(v) : v);
-    } else if ((0, import_types.isObject)(objProp)) {
-      o[prop] = deepClone(objProp);
+    if ((0, import_types.isObjectLike)(objProp)) {
+      o[prop] = deepClone(objProp, excludeFrom);
     } else
       o[prop] = objProp;
   }
@@ -196,8 +193,8 @@ const deepDestringify = (obj, stringified = {}) => {
         try {
           const evalProp = import_globals.window.eval(`(${objProp})`);
           stringified[prop] = evalProp;
-        } catch (e) {
-          if (e)
+        } catch (e2) {
+          if (e2)
             stringified[prop] = objProp;
         }
       } else {
@@ -211,8 +208,8 @@ const deepDestringify = (obj, stringified = {}) => {
             try {
               const evalProp = import_globals.window.eval(`(${arrProp})`);
               stringified[prop].push(evalProp);
-            } catch (e) {
-              if (e)
+            } catch (e2) {
+              if (e2)
                 stringified[prop].push(arrProp);
             }
           } else {
@@ -232,32 +229,32 @@ const deepDestringify = (obj, stringified = {}) => {
   }
   return stringified;
 };
-const overwrite = (element, params, options) => {
+const overwrite = (element, params, excludeFrom = []) => {
   const { ref } = element;
   const changes = {};
-  for (const e in params) {
-    if (e === "props")
+  for (const e2 in params) {
+    if (excludeFrom.includes(e2) || e2.includes("__"))
       continue;
-    const elementProp = element[e];
-    const paramsProp = params[e];
+    const elementProp = element[e2];
+    const paramsProp = params[e2];
     if (paramsProp) {
-      ref.__cache[e] = changes[e] = elementProp;
-      ref[e] = paramsProp;
+      ref.__cache[e2] = changes[e2] = elementProp;
+      ref[e2] = paramsProp;
     }
   }
   return changes;
 };
 const diffObjects = (original, objToDiff, cache) => {
-  for (const e in objToDiff) {
-    if (e === "ref")
+  for (const e2 in objToDiff) {
+    if (e2 === "ref")
       continue;
-    const originalProp = original[e];
-    const objToDiffProp = objToDiff[e];
+    const originalProp = original[e2];
+    const objToDiffProp = objToDiff[e2];
     if ((0, import_types.isObject)(originalProp) && (0, import_types.isObject)(objToDiffProp)) {
-      cache[e] = {};
-      diff(originalProp, objToDiffProp, cache[e]);
+      cache[e2] = {};
+      diff(originalProp, objToDiffProp, cache[e2]);
     } else if (objToDiffProp !== void 0) {
-      cache[e] = objToDiffProp;
+      cache[e2] = objToDiffProp;
     }
   }
   return cache;
@@ -290,23 +287,33 @@ const diff = (original, objToDiff, cache = {}) => {
 };
 const overwriteObj = (params, obj) => {
   const changes = {};
-  for (const e in params) {
-    const objProp = obj[e];
-    const paramsProp = params[e];
+  for (const e2 in params) {
+    const objProp = obj[e2];
+    const paramsProp = params[e2];
     if (paramsProp) {
-      obj[e] = changes[e] = objProp;
+      obj[e2] = changes[e2] = objProp;
     }
   }
   return changes;
 };
-const overwriteDeep = (params, obj) => {
-  for (const e in params) {
-    const objProp = obj[e];
-    const paramsProp = params[e];
+const overwriteShallow = (obj, params, excludeFrom = []) => {
+  for (const e2 in params) {
+    if (excludeFrom.includes(e2) || e2.includes("__"))
+      continue;
+    obj[e2] = params[e2];
+  }
+  return obj;
+};
+const overwriteDeep = (params, obj, excludeFrom = []) => {
+  for (const e2 in params) {
+    if (excludeFrom.includes(e2) || e2.includes("__"))
+      continue;
+    const objProp = obj[e2];
+    const paramsProp = params[e2];
     if ((0, import_types.isObjectLike)(objProp) && (0, import_types.isObjectLike)(paramsProp)) {
       overwriteDeep(paramsProp, objProp);
     } else if (paramsProp !== void 0) {
-      obj[e] = paramsProp;
+      obj[e2] = paramsProp;
     }
   }
   return obj;
@@ -316,9 +323,6 @@ const mergeIfExisted = (a, b) => {
     return deepMerge(a, b);
   return a || b;
 };
-const mergeArray = (arr) => {
-  return arr.reduce((a, c) => deepMerge(a, deepClone(c)), {});
-};
 const mergeAndCloneIfArray = (obj) => {
   return (0, import_types.isArray)(obj) ? mergeArray(obj) : deepClone(obj);
 };

package/object.js

@@ -3,6 +3,7 @@
 import { window } from '@domql/globals'
 import { isFunction, isObjectLike, isObject, isArray, isString, is } from './types.js'
 
+
 export const exec = (param, element, state, context) => {
   if (isFunction(param)) {
     return param(
@@ -31,11 +32,11 @@ export const merge = (element, obj) => {
   return element
 }
 
-export const deepMerge = (element, extend) => {
+export const deepMerge = (element, extend, excludeFrom = []) => {
   for (const e in extend) {
+    if (excludeFrom.includes(e) || e.includes('__')) continue
     const elementProp = element[e]
     const extendProp = extend[e]
-    if (e === 'parent' || e === 'props') continue
     if (isObjectLike(elementProp) && isObjectLike(extendProp)) {
       deepMerge(elementProp, extendProp)
     } else if (elementProp === undefined) {
@@ -45,42 +46,42 @@ export const deepMerge = (element, extend) => {
   return element
 }
 
-export const clone = obj => {
+export const clone = (obj, excludeFrom = []) => {
   const o = {}
   for (const prop in obj) {
-    if (prop === 'node') continue
+    if (excludeFrom.includes(e) || e.includes('__')) continue
     o[prop] = obj[prop]
   }
   return o
 }
 
-// Clone anything deeply but exclude keys given in 'exclude'
-export const deepCloneExclude = (obj, exclude = []) => {
+// Clone anything deeply but excludeFrom keys given in 'excludeFrom'
+export const deepCloneExclude = (obj, excludeFrom = []) => {
   if (isArray(obj)) {
-    return obj.map(x => deepCloneExclude(x, exclude))
+    return obj.map(x => deepCloneExclude(x, excludeFrom))
   }
 
   const o = {}
   for (const k in obj) {
-    if (exclude.indexOf(k) > -1) continue
+    if (excludeFrom.includes(k) || k.includes('__')) continue
 
     let v = obj[k]
 
     if (k === 'extend' && isArray(v)) {
-      v = mergeArrayExclude(v, exclude)
+      v = mergeArrayExclude(v, excludeFrom)
     }
 
     if (isArray(v)) {
-      o[k] = v.map(x => deepCloneExclude(x, exclude))
+      o[k] = v.map(x => deepCloneExclude(x, excludeFrom))
     } else if (isObject(v)) {
-      o[k] = deepCloneExclude(v, exclude)
+      o[k] = deepCloneExclude(v, excludeFrom)
     } else o[k] = v
   }
 
   return o
 }
 
-// Merge array, but exclude keys listed in 'excl'
+// Merge array, but excludeFrom keys listed in 'excl'
 export const mergeArrayExclude = (arr, excl = []) => {
   return arr.reduce((acc, curr) => deepMerge(acc, deepCloneExclude(curr, excl)), {})
 }
@@ -88,20 +89,16 @@ export const mergeArrayExclude = (arr, excl = []) => {
 /**
  * Deep cloning of object
  */
-export const deepClone = (obj) => {
-  if (isArray(obj)) {
-    return obj.map(deepClone)
-  }
-  const o = {}
+export const deepClone = (obj, excludeFrom = []) => {
+  const o = isArray(obj) ? [] : {}
   for (const prop in obj) {
+    if (excludeFrom.includes(prop) || prop.includes('__')) continue
     let objProp = obj[prop]
     if (prop === 'extend' && isArray(objProp)) {
       objProp = mergeArray(objProp)
     }
-    if (isArray(objProp)) {
-      o[prop] = objProp.map(v => isObject(v) ? deepClone(v) : v)
-    } else if (isObject(objProp)) {
-      o[prop] = deepClone(objProp)
+    if (isObjectLike(objProp)) {
+      o[prop] = deepClone(objProp, excludeFrom)
     } else o[prop] = objProp
   }
   return o
@@ -210,12 +207,12 @@ export const deepDestringify = (obj, stringified = {}) => {
 /**
  * Overwrites object properties with another
  */
-export const overwrite = (element, params, options) => {
+export const overwrite = (element, params, excludeFrom = []) => {
   const { ref } = element
   const changes = {}
 
   for (const e in params) {
-    if (e === 'props') continue
+    if (excludeFrom.includes(e) || e.includes('__')) continue
 
     const elementProp = element[e]
     const paramsProp = params[e]
@@ -293,11 +290,20 @@ export const overwriteObj = (params, obj) => {
   return changes
 }
 
+export const overwriteShallow = (obj, params, excludeFrom = []) => {
+  for (const e in params) {
+    if (excludeFrom.includes(e) || e.includes('__')) continue
+    obj[e] = params[e]
+  }
+  return obj
+}
+
 /**
  * Overwrites DEEPLY object properties with another
  */
-export const overwriteDeep = (params, obj) => {
+export const overwriteDeep = (params, obj, 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)) {
@@ -317,13 +323,6 @@ export const mergeIfExisted = (a, b) => {
   return a || b
 }
 
-/**
- * Merges array extendtypes
- */
-export const mergeArray = (arr) => {
-  return arr.reduce((a, c) => deepMerge(a, deepClone(c)), {})
-}
-
 /**
  * Merges array extendtypes
  */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@domql/utils",
-  "version": "2.3.110",
+  "version": "2.3.113",
   "license": "MIT",
   "type": "module",
   "module": "index.js",
@@ -13,7 +13,7 @@
   ],
   "scripts": {
     "copy:package:cjs": "cp ../../.build/package-cjs.json dist/cjs/package.json",
-    "build:esm": "npx esbuild *.js --target=es2020 --format=esm --outdir=dist/esm",
+    "build:esm": "npx esbuild *.js --target=es2019 --format=esm --outdir=dist/esm",
     "build:cjs": "npx esbuild *.js --target=node16 --format=cjs --outdir=dist/cjs",
     "build": "yarn build:cjs",
     "prepublish": "rimraf -I dist && yarn build && yarn copy:package:cjs"
@@ -23,7 +23,7 @@
     "@domql/key": "latest",
     "@domql/tags": "latest"
   },
-  "gitHead": "7b3ccf7d24188c27067e88610f4d246070ccffd9",
+  "gitHead": "55a450c7abd477de577044072e705cc1363961b5",
   "devDependencies": {
     "@babel/core": "^7.12.0"
   }