@domql/utils 2.5.114 → 2.5.117

package/dist/cjs/node.js

@@ -18,6 +18,7 @@ var __copyProps = (to, from, except, desc) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var node_exports = {};
 __export(node_exports, {
+  isDOMNode: () => isDOMNode,
   isHtmlElement: () => isHtmlElement,
   isNode: () => isNode
 });
@@ -29,3 +30,6 @@ const isNode = (obj) => {
 const isHtmlElement = (obj) => {
   return (typeof HTMLElement === "object" ? obj instanceof import_globals.window.HTMLElement : obj && typeof obj === "object" && obj !== null && obj.nodeType === 1 && typeof obj.nodeName === "string") || false;
 };
+const isDOMNode = (obj) => {
+  return typeof import_globals.window !== "undefined" && (obj instanceof import_globals.window.Node || obj instanceof import_globals.window.Window || obj === import_globals.window || obj === document);
+};

package/dist/cjs/object.js

@@ -58,6 +58,7 @@ var import_globals = require("./globals.js");
 var import_types = require("./types.js");
 var import_array = require("./array.js");
 var import_string = require("./string.js");
+var import_node = require("./node.js");
 const exec = (param, element, state, context) => {
   if ((0, import_types.isFunction)(param)) {
     return param(
@@ -136,27 +137,28 @@ const deepCloneExclude = (obj, excludeFrom = []) => {
 const mergeArrayExclude = (arr, excl = []) => {
   return arr.reduce((acc, curr) => deepMerge(acc, deepCloneExclude(curr, excl)), {});
 };
-const deepClone = (obj, excludeFrom = [], cleanUndefined = false) => {
-  const o = (0, import_types.isArray)(obj) ? [] : {};
-  for (const prop in obj) {
-    if (!Object.prototype.hasOwnProperty.call(obj, prop))
-      continue;
-    if (prop === "__proto__")
-      continue;
-    if (excludeFrom.includes(prop) || prop.startsWith("__"))
-      continue;
-    let objProp = obj[prop];
-    if (cleanUndefined && (0, import_types.isUndefined)(objProp))
-      continue;
-    if (prop === "extend" && (0, import_types.isArray)(objProp)) {
-      objProp = (0, import_array.mergeArray)(objProp);
+const deepClone = (obj, exclude = [], cleanUndefined = false, visited = /* @__PURE__ */ new WeakMap()) => {
+  if (!(0, import_types.isObjectLike)(obj) || (0, import_node.isDOMNode)(obj))
+    return obj;
+  if (visited.has(obj))
+    return visited.get(obj);
+  const clone2 = (0, import_types.isArray)(obj) ? [] : {};
+  visited.set(obj, clone2);
+  for (const key in obj) {
+    if (Object.prototype.hasOwnProperty.call(obj, key) && !exclude.includes(key)) {
+      const value = obj[key];
+      if ((0, import_node.isDOMNode)(value)) {
+        clone2[key] = value;
+      } else if (key === "extend" && (0, import_types.isArray)(value)) {
+        clone2[key] = (0, import_array.mergeArray)(value, exclude);
+      } else if ((0, import_types.isObjectLike)(value)) {
+        clone2[key] = deepClone(value, exclude, cleanUndefined, visited);
+      } else {
+        clone2[key] = value;
+      }
     }
-    if ((0, import_types.isObjectLike)(objProp)) {
-      o[prop] = deepClone(objProp, excludeFrom, cleanUndefined);
-    } else
-      o[prop] = objProp;
   }
-  return o;
+  return clone2;
 };
 const deepCloneWithExtend = (obj, excludeFrom = ["node"], options = {}) => {
   const o = options.window ? (0, import_types.isArray)(obj) ? new options.window.Array([]) : new options.window.Object({}) : (0, import_types.isArray)(obj) ? [] : {};
@@ -467,33 +469,37 @@ const isEqualDeep = (param, element, visited = /* @__PURE__ */ new Set()) => {
   }
   return true;
 };
-const deepContains = (obj1, obj2) => {
-  const stack = [{ obj1, obj2 }];
-  while (stack.length) {
-    const { obj1: obj12, obj2: obj22 } = stack.pop();
-    if (typeof obj12 !== typeof obj22) {
+const deepContains = (obj1, obj2, ignoredKeys = ["node", "__ref"]) => {
+  if (obj1 === obj2)
+    return true;
+  if (!(0, import_types.isObjectLike)(obj1) || !(0, import_types.isObjectLike)(obj2))
+    return false;
+  if ((0, import_node.isDOMNode)(obj1) || (0, import_node.isDOMNode)(obj2))
+    return obj1 === obj2;
+  const stack = [[obj1, obj2]];
+  const visited = /* @__PURE__ */ new WeakSet();
+  while (stack.length > 0) {
+    const [current1, current2] = stack.pop();
+    if (visited.has(current1))
+      continue;
+    visited.add(current1);
+    const keys1 = Object.keys(current1).filter((key) => !ignoredKeys.includes(key));
+    const keys2 = Object.keys(current2).filter((key) => !ignoredKeys.includes(key));
+    if (keys1.length !== keys2.length)
       return false;
-    }
-    if ((0, import_types.isObjectLike)(obj12)) {
-      if (Array.isArray(obj12) && Array.isArray(obj22)) {
-        if (obj12.length !== obj22.length) {
+    for (const key of keys1) {
+      if (!Object.prototype.hasOwnProperty.call(current2, key))
+        return false;
+      const value1 = current1[key];
+      const value2 = current2[key];
+      if ((0, import_node.isDOMNode)(value1) || (0, import_node.isDOMNode)(value2)) {
+        if (value1 !== value2)
           return false;
+      } else if ((0, import_types.isObjectLike)(value1) && (0, import_types.isObjectLike)(value2)) {
+        if (value1 !== value2) {
+          stack.push([value1, value2]);
         }
-        for (let i = 0; i < obj12.length; i++) {
-          stack.push({ obj1: obj12[i], obj2: obj22[i] });
-        }
-      } else if ((0, import_types.isObjectLike)(obj12) && obj22 !== null) {
-        for (const key in obj12) {
-          if (Object.prototype.hasOwnProperty.call(obj12, key)) {
-            if (!Object.prototype.hasOwnProperty.call(obj22, key)) {
-              return false;
-            }
-            stack.push({ obj1: obj12[key], obj2: obj22[key] });
-          }
-        }
-      }
-    } else {
-      if (obj12 !== obj22) {
+      } else if (value1 !== value2) {
         return false;
       }
     }

package/node.js

@@ -18,3 +18,12 @@ export const isHtmlElement = obj => {
       : obj && typeof obj === 'object' && obj !== null && obj.nodeType === 1 && typeof obj.nodeName === 'string'
   ) || false
 }
+
+export const isDOMNode = (obj) => {
+  return typeof window !== 'undefined' && (
+    obj instanceof window.Node ||
+    obj instanceof window.Window ||
+    obj === window ||
+    obj === document
+  )
+}

package/object.js

@@ -4,6 +4,7 @@ import { window } from './globals.js'
 import { isFunction, isObjectLike, isObject, isArray, isString, is, isUndefined, isDate, isNull } from './types.js'
 import { mergeAndCloneIfArray, mergeArray } from './array.js'
 import { stringIncludesAny } from './string.js'
+import { isDOMNode } from './node.js'
 
 export const exec = (param, element, state, context) => {
   if (isFunction(param)) {
@@ -95,29 +96,62 @@ export const mergeArrayExclude = (arr, excl = []) => {
 /**
  * Deep cloning of object
  */
-export const deepClone = (obj, excludeFrom = [], cleanUndefined = false) => {
-  const o = isArray(obj) ? [] : {}
-  for (const prop in obj) {
-    if (!Object.prototype.hasOwnProperty.call(obj, prop)) continue
-    // if (prop === 'node' || prop === 'parent' || prop === 'root' || prop === '__element') {
-    //   console.warn('recursive clonning is called', obj)
-    //   continue
-    // }
-    if (prop === '__proto__') continue
-    if (excludeFrom.includes(prop) || prop.startsWith('__')) continue
-    let objProp = obj[prop]
-    if (cleanUndefined && isUndefined(objProp)) continue
-    if (prop === 'extend' && isArray(objProp)) {
-      objProp = mergeArray(objProp)
+export const deepClone = (obj, exclude = [], cleanUndefined = false, visited = new WeakMap()) => {
+  // Handle non-object types, null, and ignored types
+  if (!isObjectLike(obj) || isDOMNode(obj)) return obj
+
+  // Check for circular references
+  if (visited.has(obj)) return visited.get(obj)
+
+  // Create a new object or array
+  const clone = isArray(obj) ? [] : {}
+
+  // Store the clone in the WeakMap to handle circular references
+  visited.set(obj, clone)
+
+  // Iterate over the properties of the object
+  for (const key in obj) {
+    if (Object.prototype.hasOwnProperty.call(obj, key) && !exclude.includes(key)) {
+      const value = obj[key]
+
+      if (isDOMNode(value)) {
+        // Skip cloning for DOM nodes
+        clone[key] = value
+      } else if (key === 'extend' && isArray(value)) {
+        clone[key] = mergeArray(value, exclude)
+      } else if (isObjectLike(value)) {
+        clone[key] = deepClone(value, exclude, cleanUndefined, visited)
+      } else {
+        clone[key] = value
+      }
     }
-    if (isObjectLike(objProp)) {
-      // queueMicrotask(() => {
-      o[prop] = deepClone(objProp, excludeFrom, cleanUndefined)
-      // })
-    } else o[prop] = objProp
   }
-  return o
+
+  return clone
 }
+// export const deepClone = (obj, excludeFrom = [], cleanUndefined = false) => {
+//   const o = isArray(obj) ? [] : {}
+//   for (const prop in obj) {
+//     if (!Object.prototype.hasOwnProperty.call(obj, prop)) continue
+//     // if (prop === 'node' || prop === 'parent' || prop === 'root' || prop === '__element') {
+//     //   console.warn('recursive clonning is called', obj)
+//     //   continue
+//     // }
+//     if (prop === '__proto__') continue
+//     if (excludeFrom.includes(prop) || prop.startsWith('__')) continue
+//     let objProp = obj[prop]
+//     if (cleanUndefined && isUndefined(objProp)) continue
+//     if (prop === 'extend' && isArray(objProp)) {
+//       objProp = mergeArray(objProp)
+//     }
+//     if (isObjectLike(objProp)) {
+//       // queueMicrotask(() => {
+//       o[prop] = deepClone(objProp, excludeFrom, cleanUndefined)
+//       // })
+//     } else o[prop] = objProp
+//   }
+//   return o
+// }
 
 /**
  * Deep cloning of object
@@ -538,36 +572,38 @@ export const isEqualDeep = (param, element, visited = new Set()) => {
   return true
 }
 
-export const deepContains = (obj1, obj2) => {
-  const stack = [{ obj1, obj2 }]
+export const deepContains = (obj1, obj2, ignoredKeys = ['node', '__ref']) => {
+  if (obj1 === obj2) return true
+  if (!isObjectLike(obj1) || !isObjectLike(obj2)) return false
+  if (isDOMNode(obj1) || isDOMNode(obj2)) return obj1 === obj2
 
-  while (stack.length) {
-    const { obj1, obj2 } = stack.pop()
+  const stack = [[obj1, obj2]]
+  const visited = new WeakSet()
 
-    if (typeof obj1 !== typeof obj2) {
-      return false
-    }
+  while (stack.length > 0) {
+    const [current1, current2] = stack.pop()
 
-    if (isObjectLike(obj1)) {
-      if (Array.isArray(obj1) && Array.isArray(obj2)) {
-        if (obj1.length !== obj2.length) {
-          return false
-        }
-        for (let i = 0; i < obj1.length; i++) {
-          stack.push({ obj1: obj1[i], obj2: obj2[i] })
-        }
-      } else if (isObjectLike(obj1) && obj2 !== null) {
-        for (const key in obj1) {
-          if (Object.prototype.hasOwnProperty.call(obj1, key)) {
-            if (!Object.prototype.hasOwnProperty.call(obj2, key)) {
-              return false
-            }
-            stack.push({ obj1: obj1[key], obj2: obj2[key] })
-          }
+    if (visited.has(current1)) continue
+    visited.add(current1)
+
+    const keys1 = Object.keys(current1).filter(key => !ignoredKeys.includes(key))
+    const keys2 = Object.keys(current2).filter(key => !ignoredKeys.includes(key))
+
+    if (keys1.length !== keys2.length) return false
+
+    for (const key of keys1) {
+      if (!Object.prototype.hasOwnProperty.call(current2, key)) return false
+
+      const value1 = current1[key]
+      const value2 = current2[key]
+
+      if (isDOMNode(value1) || isDOMNode(value2)) {
+        if (value1 !== value2) return false
+      } else if (isObjectLike(value1) && isObjectLike(value2)) {
+        if (value1 !== value2) {
+          stack.push([value1, value2])
         }
-      }
-    } else {
-      if (obj1 !== obj2) {
+      } else if (value1 !== value2) {
         return false
       }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@domql/utils",
-  "version": "2.5.114",
+  "version": "2.5.117",
   "license": "MIT",
   "type": "module",
   "module": "index.js",
@@ -23,7 +23,7 @@
     "build": "yarn build:cjs",
     "prepublish": "rimraf -I dist && yarn build && yarn copy:package:cjs"
   },
-  "gitHead": "61b7ecee05aaf0d6682e5f3cdb11f0091e880f3d",
+  "gitHead": "56be344ba28e3cb51c146c1b74fe3c0e21341879",
   "devDependencies": {
     "@babel/core": "^7.12.0"
   }