@domql/utils 2.5.113 → 2.5.116

package/dist/cjs/object.js

@@ -467,30 +467,35 @@ const isEqualDeep = (param, element, visited = /* @__PURE__ */ new Set()) => {
   }
   return true;
 };
-const deepContains = (obj1, obj2) => {
-  if (typeof obj1 !== typeof obj2) {
+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_types.isObjectLike)(obj1)) {
-    if (Array.isArray(obj1) && Array.isArray(obj2)) {
-      if (obj1.length !== obj2.length) {
+  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;
+    for (const key of keys1) {
+      if (!Object.prototype.hasOwnProperty.call(current2, key))
         return false;
-      }
-      for (let i = 0; i < obj1.length; i++) {
-        if (!deepContains(obj1[i], obj2[i])) {
-          return false;
-        }
-      }
-    } else if ((0, import_types.isObjectLike)(obj1) && obj2 !== null) {
-      for (const key in obj1) {
-        const hasOwnProperty2 = Object.prototype.hasOwnProperty.call(obj2, key);
-        if (!hasOwnProperty2 || !deepContains(obj1[key], obj2[key])) {
-          return false;
+      const value1 = current1[key];
+      const value2 = current2[key];
+      if ((0, import_types.isObjectLike)(value1) && (0, import_types.isObjectLike)(value2)) {
+        if (value1 !== value2) {
+          stack.push([value1, value2]);
         }
+      } else if (value1 !== value2) {
+        return false;
       }
     }
-  } else {
-    return obj2 === obj1;
   }
   return true;
 };

package/object.js

@@ -538,35 +538,42 @@ export const isEqualDeep = (param, element, visited = new Set()) => {
   return true
 }
 
-export const deepContains = (obj1, obj2) => {
-  if (typeof obj1 !== typeof obj2) {
-    return false
-  }
+export const deepContains = (obj1, obj2, ignoredKeys = ['node', '__ref']) => {
+  if (obj1 === obj2) return true
+  if (!isObjectLike(obj1) || !isObjectLike(obj2)) return false
 
-  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++) {
-        if (!deepContains(obj1[i], obj2[i])) {
-          return false
-        }
-      }
-    } else if (isObjectLike(obj1) && obj2 !== null) {
-      for (const key in obj1) {
-        const hasOwnProperty = Object.prototype.hasOwnProperty.call(obj2, key)
-        if (!hasOwnProperty || !deepContains(obj1[key], obj2[key])) {
-          return false
+  const stack = [[obj1, obj2]]
+  const visited = 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
+
+    for (const key of keys1) {
+      if (!Object.prototype.hasOwnProperty.call(current2, key)) return false
+
+      const value1 = current1[key]
+      const value2 = current2[key]
+
+      if (isObjectLike(value1) && isObjectLike(value2)) {
+        if (value1 !== value2) {
+          stack.push([value1, value2])
         }
+      } else if (value1 !== value2) {
+        return false
       }
     }
-  } else {
-    return obj2 === obj1
   }
 
   return true
-}
+};
 
 export const removeFromObject = (obj, props) => {
   if (props === undefined || props === null) return obj

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@domql/utils",
-  "version": "2.5.113",
+  "version": "2.5.116",
   "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": "8436abbfa2752c4659982516ff9ad1db80862e42",
+  "gitHead": "cff7d465161d804f31e3b350081bb751da209eeb",
   "devDependencies": {
     "@babel/core": "^7.12.0"
   }