@domql/utils 2.5.143 → 2.5.147

package/array.js

@@ -110,6 +110,7 @@ export const reorderArrayByValues = (array, valueToMove, insertBeforeValue) => {
   }
   return newArray
 }
+
 export const arraysEqual = (arr1, arr2) => {
   if (arr1.length !== arr2.length) {
     return false
@@ -123,3 +124,14 @@ export const arraysEqual = (arr1, arr2) => {
 
   return true
 }
+
+// Using filter and includes
+export const filterArrays = (sourceArr, excludeArr) => {
+  return sourceArr.filter(item => !excludeArr.includes(item))
+}
+
+// Using Set for better performance with large arrays
+export const filterArraysFast = (sourceArr, excludeArr) => {
+  const excludeSet = new Set(excludeArr)
+  return sourceArr.filter(item => !excludeSet.has(item))
+}

package/dist/cjs/array.js

@@ -23,6 +23,8 @@ __export(array_exports, {
   arraysEqual: () => arraysEqual,
   cutArrayAfterValue: () => cutArrayAfterValue,
   cutArrayBeforeValue: () => cutArrayBeforeValue,
+  filterArrays: () => filterArrays,
+  filterArraysFast: () => filterArraysFast,
   getFrequencyInArray: () => getFrequencyInArray,
   joinArrays: () => joinArrays,
   mergeAndCloneIfArray: () => mergeAndCloneIfArray,
@@ -131,3 +133,10 @@ const arraysEqual = (arr1, arr2) => {
   }
   return true;
 };
+const filterArrays = (sourceArr, excludeArr) => {
+  return sourceArr.filter((item) => !excludeArr.includes(item));
+};
+const filterArraysFast = (sourceArr, excludeArr) => {
+  const excludeSet = new Set(excludeArr);
+  return sourceArr.filter((item) => !excludeSet.has(item));
+};

package/dist/cjs/object.js

@@ -35,9 +35,11 @@ __export(object_exports, {
   diff: () => diff,
   diffArrays: () => diffArrays,
   diffObjects: () => diffObjects,
+  excludeKeysFromObject: () => excludeKeysFromObject,
   exec: () => exec,
   flattenRecursive: () => flattenRecursive,
   hasOwnProperty: () => hasOwnProperty,
+  isCyclic: () => isCyclic,
   isEmpty: () => isEmpty,
   isEmptyObject: () => isEmptyObject,
   isEqualDeep: () => isEqualDeep,
@@ -441,20 +443,27 @@ const deepDiff = (lhs, rhs) => {
     return acc;
   }, deletedValues);
 };
-const overwrite = (element, params, excludeFrom = []) => {
-  const { ref } = element;
-  const changes = {};
+const overwrite = (element, params, opts = {}) => {
+  const { __ref: ref } = element;
+  const excl = opts.exclude || [];
+  const allowUnderscore = opts.preventUnderscore;
+  const preventCaching = opts.preventCaching;
   for (const e in params) {
-    if (excludeFrom.includes(e) || e.startsWith("__"))
+    if (excl.includes(e) || !allowUnderscore && e.startsWith("__"))
       continue;
     const elementProp = element[e];
     const paramsProp = params[e];
-    if (paramsProp) {
-      ref.__cache[e] = changes[e] = elementProp;
-      ref[e] = paramsProp;
+    if (paramsProp !== void 0) {
+      element[e] = paramsProp;
+      if (ref && !preventCaching) {
+        ref.__cache[e] = elementProp;
+      }
+      if ((0, import_types.isObject)(opts.diff)) {
+        diff[e] = elementProp;
+      }
     }
   }
-  return changes;
+  return element;
 };
 const overwriteShallow = (obj, params, excludeFrom = []) => {
   for (const e in params) {
@@ -464,23 +473,26 @@ const overwriteShallow = (obj, params, excludeFrom = []) => {
   }
   return obj;
 };
-const overwriteDeep = (obj, params, excludeFrom = [], visited = /* @__PURE__ */ new WeakMap()) => {
+const overwriteDeep = (obj, params, opts = {}, visited = /* @__PURE__ */ new WeakMap()) => {
+  const excl = opts.exclude || [];
+  const forcedExclude = opts.preventForce ? [] : ["node", "window"];
   if (!(0, import_types.isObjectLike)(obj) || !(0, import_types.isObjectLike)(params) || (0, import_node.isDOMNode)(obj) || (0, import_node.isDOMNode)(params)) {
     return params;
   }
-  if (visited.has(obj)) {
+  if (visited.has(obj))
     return visited.get(obj);
-  }
   visited.set(obj, obj);
   for (const e in params) {
-    if (e === "__ref" || excludeFrom.includes(e) || e.startsWith("__"))
+    if (!Object.hasOwnProperty.call(params, e))
+      continue;
+    if (excl.includes(e) || forcedExclude && e.startsWith("__"))
       continue;
     const objProp = obj[e];
     const paramsProp = params[e];
     if ((0, import_node.isDOMNode)(paramsProp)) {
       obj[e] = paramsProp;
     } else if ((0, import_types.isObjectLike)(objProp) && (0, import_types.isObjectLike)(paramsProp)) {
-      obj[e] = overwriteDeep(objProp, paramsProp, excludeFrom, visited);
+      obj[e] = overwriteDeep(objProp, paramsProp, opts, visited);
     } else if (paramsProp !== void 0) {
       obj[e] = paramsProp;
     }
@@ -643,3 +655,27 @@ const detectInfiniteLoop = (arr) => {
     }
   }
 };
+const isCyclic = (obj) => {
+  const seenObjects = [];
+  function detect(obj2) {
+    if (obj2 && typeof obj2 === "object") {
+      if (seenObjects.indexOf(obj2) !== -1) {
+        return true;
+      }
+      seenObjects.push(obj2);
+      for (const key in obj2) {
+        if (Object.hasOwnProperty.call(obj2, key) && detect(obj2[key])) {
+          console.log(obj2, "cycle at " + key);
+          return true;
+        }
+      }
+    }
+    return false;
+  }
+  return detect(obj);
+};
+const excludeKeysFromObject = (obj, excludedKeys) => {
+  const result = { ...obj };
+  excludedKeys.forEach((key) => delete result[key]);
+  return result;
+};

package/object.js

@@ -502,23 +502,30 @@ export const deepDiff = (lhs, rhs) => {
 /**
  * Overwrites object properties with another
  */
-export const overwrite = (element, params, excludeFrom = []) => {
-  const { ref } = element
-  const changes = {}
+export const overwrite = (element, params, opts = {}) => {
+  const { __ref: ref } = element
+  const excl = opts.exclude || []
+  const allowUnderscore = opts.preventUnderscore
+  const preventCaching = opts.preventCaching
 
   for (const e in params) {
-    if (excludeFrom.includes(e) || e.startsWith('__')) continue
+    if (excl.includes(e) || (!allowUnderscore && e.startsWith('__'))) continue
 
     const elementProp = element[e]
     const paramsProp = params[e]
 
-    if (paramsProp) {
-      ref.__cache[e] = changes[e] = elementProp
-      ref[e] = paramsProp
+    if (paramsProp !== undefined) {
+      element[e] = paramsProp
+      if (ref && !preventCaching) {
+        ref.__cache[e] = elementProp
+      }
+      if (isObject(opts.diff)) {
+        diff[e] = elementProp
+      }
     }
   }
 
-  return changes
+  return element
 }
 
 export const overwriteShallow = (obj, params, excludeFrom = []) => {
@@ -532,19 +539,20 @@ export const overwriteShallow = (obj, params, excludeFrom = []) => {
 /**
  * Overwrites DEEPLY object properties with another
  */
-export const overwriteDeep = (obj, params, excludeFrom = [], visited = new WeakMap()) => {
+export const overwriteDeep = (obj, params, opts = {}, visited = new WeakMap()) => {
+  const excl = opts.exclude || []
+  const forcedExclude = opts.preventForce ? [] : ['node', 'window']
+
   if (!isObjectLike(obj) || !isObjectLike(params) || isDOMNode(obj) || isDOMNode(params)) {
     return params
   }
 
-  if (visited.has(obj)) {
-    return visited.get(obj)
-  }
-
+  if (visited.has(obj)) return visited.get(obj)
   visited.set(obj, obj)
 
   for (const e in params) {
-    if (e === '__ref' || excludeFrom.includes(e) || e.startsWith('__')) continue
+    if (!Object.hasOwnProperty.call(params, e)) continue
+    if (excl.includes(e) || (forcedExclude && e.startsWith('__'))) continue
 
     const objProp = obj[e]
     const paramsProp = params[e]
@@ -552,7 +560,7 @@ export const overwriteDeep = (obj, params, excludeFrom = [], visited = new WeakM
     if (isDOMNode(paramsProp)) {
       obj[e] = paramsProp
     } else if (isObjectLike(objProp) && isObjectLike(paramsProp)) {
-      obj[e] = overwriteDeep(objProp, paramsProp, excludeFrom, visited)
+      obj[e] = overwriteDeep(objProp, paramsProp, opts, visited)
     } else if (paramsProp !== undefined) {
       obj[e] = paramsProp
     }
@@ -795,3 +803,31 @@ export const detectInfiniteLoop = arr => {
     }
   }
 }
+
+export const isCyclic = (obj) => {
+  const seenObjects = []
+
+  function detect (obj) {
+    if (obj && typeof obj === 'object') {
+      if (seenObjects.indexOf(obj) !== -1) {
+        return true
+      }
+      seenObjects.push(obj)
+      for (const key in obj) {
+        if (Object.hasOwnProperty.call(obj, key) && detect(obj[key])) {
+          console.log(obj, 'cycle at ' + key)
+          return true
+        }
+      }
+    }
+    return false
+  }
+
+  return detect(obj)
+}
+
+export const excludeKeysFromObject = (obj, excludedKeys) => {
+  const result = { ...obj }
+  excludedKeys.forEach(key => delete result[key])
+  return result
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@domql/utils",
-  "version": "2.5.143",
+  "version": "2.5.147",
   "license": "MIT",
   "type": "module",
   "module": "index.js",
@@ -25,7 +25,7 @@
     "build": "yarn build:cjs",
     "prepublish": "rimraf -I dist && yarn build && yarn copy:package:cjs"
   },
-  "gitHead": "46440d5034244c18657bf272df1bdc3e8ff666c5",
+  "gitHead": "51d1a003e3d4eae96daa9eeed10e63bde2152f9d",
   "devDependencies": {
     "@babel/core": "^7.12.0"
   }