@domql/utils 2.5.142 → 2.5.144

package/dist/cjs/object.js

@@ -38,6 +38,7 @@ __export(object_exports, {
   exec: () => exec,
   flattenRecursive: () => flattenRecursive,
   hasOwnProperty: () => hasOwnProperty,
+  isCyclic: () => isCyclic,
   isEmpty: () => isEmpty,
   isEmptyObject: () => isEmptyObject,
   isEqualDeep: () => isEqualDeep,
@@ -163,20 +164,28 @@ const deepClone = (obj, exclude = [], cleanUndefined = false, visited = /* @__PU
   }
   return clone2;
 };
-const deepCloneWithExtend = (obj, excludeFrom = ["node"], options = {}) => {
+const deepCloneWithExtend = (obj, excludeFrom = ["node"], options = {}, visited = /* @__PURE__ */ new WeakSet()) => {
+  if ((0, import_types.isObjectLike)(obj)) {
+    if (visited.has(obj)) {
+      return obj;
+    }
+    visited.add(obj);
+  }
   const o = options.window ? (0, import_types.isArray)(obj) ? new options.window.Array([]) : new options.window.Object({}) : (0, import_types.isArray)(obj) ? [] : {};
   for (const prop in obj) {
     if (!Object.prototype.hasOwnProperty.call(obj, prop))
       continue;
     const objProp = obj[prop];
-    if (excludeFrom.includes(prop) || prop.startsWith("__") || options.cleanUndefined && (0, import_types.isUndefined)(objProp) || options.cleanNull && (0, import_types.isNull)(objProp))
+    if (excludeFrom.includes(prop) || prop.startsWith("__") || options.cleanUndefined && (0, import_types.isUndefined)(objProp) || options.cleanNull && (0, import_types.isNull)(objProp)) {
       continue;
+    }
     if ((0, import_types.isObjectLike)(objProp)) {
-      o[prop] = deepCloneWithExtend(objProp, excludeFrom, options);
+      o[prop] = deepCloneWithExtend(objProp, excludeFrom, options, visited);
     } else if ((0, import_types.isFunction)(objProp) && options.window) {
       o[prop] = (options.window || import_globals.window).eval("(" + objProp.toString() + ")");
-    } else
+    } else {
       o[prop] = objProp;
+    }
   }
   return o;
 };
@@ -635,3 +644,22 @@ 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);
+};

package/object.js

@@ -169,30 +169,46 @@ export const deepClone = (obj, exclude = [], cleanUndefined = false, visited = n
 /**
  * Deep cloning of object
  */
-export const deepCloneWithExtend = (obj, excludeFrom = ['node'], options = {}) => {
+export const deepCloneWithExtend = (obj, excludeFrom = ['node'], options = {}, visited = new WeakSet()) => {
+  // Check if the value is object-like before trying to track it in visited
+  if (isObjectLike(obj)) {
+    if (visited.has(obj)) {
+      return obj // Return the object if it was already cloned
+    }
+    visited.add(obj) // Add to visited set only if it's an object
+  }
+
   const o = options.window
-    ? isArray(obj) ? new options.window.Array([]) : new options.window.Object({})
-    : isArray(obj) ? [] : {}
+    ? isArray(obj)
+      ? new options.window.Array([])
+      : new options.window.Object({})
+    : 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
-    // }
+
     const objProp = obj[prop]
+
     if (
-      excludeFrom.includes(prop) || prop.startsWith('__') ||
+      excludeFrom.includes(prop) ||
+      prop.startsWith('__') ||
       (options.cleanUndefined && isUndefined(objProp)) ||
       (options.cleanNull && isNull(objProp))
-    ) continue
+    ) {
+      continue
+    }
+
     if (isObjectLike(objProp)) {
-      // queueMicrotask(() => {
-      o[prop] = deepCloneWithExtend(objProp, excludeFrom, options)
-      // })
+      o[prop] = deepCloneWithExtend(objProp, excludeFrom, options, visited)
     } else if (isFunction(objProp) && options.window) {
       o[prop] = (options.window || window).eval('(' + objProp.toString() + ')')
-    } else o[prop] = objProp
+    } else {
+      o[prop] = objProp
+    }
   }
+
   return o
 }
 
@@ -779,3 +795,25 @@ 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)
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@domql/utils",
-  "version": "2.5.142",
+  "version": "2.5.144",
   "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": "65537c9b9a818948e1835b75a5c8a3e79bffdecd",
+  "gitHead": "9026efab1932521ec5eec3e88261eadb81f2e3cb",
   "devDependencies": {
     "@babel/core": "^7.12.0"
   }