@domql/utils 2.5.116 → 2.5.119

package/array.js

@@ -67,26 +67,6 @@ export const cutArrayAfterValue = (arr, value) => {
   return arr
 }
 
-export const createNestedObject = (arr, lastValue) => {
-  const nestedObject = {}
-
-  if (arr.length === 0) {
-    return lastValue
-  }
-
-  arr.reduce((obj, value, index) => {
-    if (!obj[value]) {
-      obj[value] = {}
-    }
-    if (index === arr.length - 1 && lastValue) {
-      obj[value] = lastValue
-    }
-    return obj[value]
-  }, nestedObject)
-
-  return nestedObject
-}
-
 export const removeValueFromArray = (arr, value) => {
   const index = arr.indexOf(value)
   if (index > -1) {

package/dist/cjs/array.js

@@ -21,7 +21,6 @@ __export(array_exports, {
   addItemAfterEveryElement: () => addItemAfterEveryElement,
   arrayContainsOtherArray: () => arrayContainsOtherArray,
   arraysEqual: () => arraysEqual,
-  createNestedObject: () => createNestedObject,
   cutArrayAfterValue: () => cutArrayAfterValue,
   cutArrayBeforeValue: () => cutArrayBeforeValue,
   getFrequencyInArray: () => getFrequencyInArray,
@@ -88,22 +87,6 @@ const cutArrayAfterValue = (arr, value) => {
   }
   return arr;
 };
-const createNestedObject = (arr, lastValue) => {
-  const nestedObject = {};
-  if (arr.length === 0) {
-    return lastValue;
-  }
-  arr.reduce((obj, value, index) => {
-    if (!obj[value]) {
-      obj[value] = {};
-    }
-    if (index === arr.length - 1 && lastValue) {
-      obj[value] = lastValue;
-    }
-    return obj[value];
-  }, nestedObject);
-  return nestedObject;
-};
 const removeValueFromArray = (arr, value) => {
   const index = arr.indexOf(value);
   if (index > -1) {

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

@@ -20,6 +20,7 @@ var object_exports = {};
 __export(object_exports, {
   checkIfKeyIsComponent: () => checkIfKeyIsComponent,
   clone: () => clone,
+  createNestedObject: () => createNestedObject,
   createObjectWithoutPrototype: () => createObjectWithoutPrototype,
   deepClone: () => deepClone,
   deepCloneExclude: () => deepCloneExclude,
@@ -51,6 +52,7 @@ __export(object_exports, {
   overwriteDeep: () => overwriteDeep,
   overwriteShallow: () => overwriteShallow,
   removeFromObject: () => removeFromObject,
+  removeNestedKeyByPath: () => removeNestedKeyByPath,
   stringToObject: () => stringToObject
 });
 module.exports = __toCommonJS(object_exports);
@@ -58,6 +60,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 +139,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) ? [] : {};
@@ -411,16 +415,23 @@ const overwriteShallow = (obj, params, excludeFrom = []) => {
   }
   return obj;
 };
-const overwriteDeep = (obj, params, excludeFrom = []) => {
+const overwriteDeep = (obj, params, excludeFrom = [], visited = /* @__PURE__ */ new WeakMap()) => {
+  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)) {
+    return visited.get(obj);
+  }
+  visited.set(obj, obj);
   for (const e in params) {
-    if (e === "__ref")
-      continue;
-    if (excludeFrom.includes(e) || e.startsWith("__"))
+    if (e === "__ref" || excludeFrom.includes(e) || e.startsWith("__"))
       continue;
     const objProp = obj[e];
     const paramsProp = params[e];
-    if ((0, import_types.isObjectLike)(objProp) && (0, import_types.isObjectLike)(paramsProp)) {
-      overwriteDeep(objProp, paramsProp);
+    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);
     } else if (paramsProp !== void 0) {
       obj[e] = paramsProp;
     }
@@ -472,6 +483,8 @@ const deepContains = (obj1, obj2, ignoredKeys = ["node", "__ref"]) => {
     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) {
@@ -488,7 +501,10 @@ const deepContains = (obj1, obj2, ignoredKeys = ["node", "__ref"]) => {
         return false;
       const value1 = current1[key];
       const value2 = current2[key];
-      if ((0, import_types.isObjectLike)(value1) && (0, import_types.isObjectLike)(value2)) {
+      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]);
         }
@@ -571,3 +587,35 @@ const getExtendsInElement = (obj) => {
   traverse(obj);
   return result;
 };
+const createNestedObject = (arr, lastValue) => {
+  const nestedObject = {};
+  if (arr.length === 0) {
+    return lastValue;
+  }
+  arr.reduce((obj, value, index) => {
+    if (!obj[value]) {
+      obj[value] = {};
+    }
+    if (index === arr.length - 1 && lastValue) {
+      obj[value] = lastValue;
+    }
+    return obj[value];
+  }, nestedObject);
+  return nestedObject;
+};
+const removeNestedKeyByPath = (obj, path) => {
+  if (!Array.isArray(path)) {
+    throw new Error("Path must be an array.");
+  }
+  let current = obj;
+  for (let i = 0; i < path.length - 1; i++) {
+    if (current[path[i]] === void 0) {
+      return;
+    }
+    current = current[path[i]];
+  }
+  const lastKey = path[path.length - 1];
+  if (current && Object.hasOwnProperty.call(current, lastKey)) {
+    delete current[lastKey];
+  }
+};

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
@@ -426,18 +460,32 @@ export const overwriteShallow = (obj, params, excludeFrom = []) => {
 /**
  * Overwrites DEEPLY object properties with another
  */
-export const overwriteDeep = (obj, params, excludeFrom = []) => {
+export const overwriteDeep = (obj, params, excludeFrom = [], visited = new WeakMap()) => {
+  if (!isObjectLike(obj) || !isObjectLike(params) || isDOMNode(obj) || isDOMNode(params)) {
+    return params
+  }
+
+  if (visited.has(obj)) {
+    return visited.get(obj)
+  }
+
+  visited.set(obj, obj)
+
   for (const e in params) {
-    if (e === '__ref') continue
-    if (excludeFrom.includes(e) || e.startsWith('__')) continue
+    if (e === '__ref' || excludeFrom.includes(e) || e.startsWith('__')) continue
+
     const objProp = obj[e]
     const paramsProp = params[e]
-    if (isObjectLike(objProp) && isObjectLike(paramsProp)) {
-      overwriteDeep(objProp, paramsProp)
+
+    if (isDOMNode(paramsProp)) {
+      obj[e] = paramsProp
+    } else if (isObjectLike(objProp) && isObjectLike(paramsProp)) {
+      obj[e] = overwriteDeep(objProp, paramsProp, excludeFrom, visited)
     } else if (paramsProp !== undefined) {
       obj[e] = paramsProp
     }
   }
+
   return obj
 }
 
@@ -541,6 +589,7 @@ export const isEqualDeep = (param, element, visited = new Set()) => {
 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
 
   const stack = [[obj1, obj2]]
   const visited = new WeakSet()
@@ -562,7 +611,9 @@ export const deepContains = (obj1, obj2, ignoredKeys = ['node', '__ref']) => {
       const value1 = current1[key]
       const value2 = current2[key]
 
-      if (isObjectLike(value1) && isObjectLike(value2)) {
+      if (isDOMNode(value1) || isDOMNode(value2)) {
+        if (value1 !== value2) return false
+      } else if (isObjectLike(value1) && isObjectLike(value2)) {
         if (value1 !== value2) {
           stack.push([value1, value2])
         }
@@ -573,7 +624,7 @@ export const deepContains = (obj1, obj2, ignoredKeys = ['node', '__ref']) => {
   }
 
   return true
-};
+}
 
 export const removeFromObject = (obj, props) => {
   if (props === undefined || props === null) return obj
@@ -663,3 +714,43 @@ export const getExtendsInElement = (obj) => {
   traverse(obj)
   return result
 }
+
+export const createNestedObject = (arr, lastValue) => {
+  const nestedObject = {}
+
+  if (arr.length === 0) {
+    return lastValue
+  }
+
+  arr.reduce((obj, value, index) => {
+    if (!obj[value]) {
+      obj[value] = {}
+    }
+    if (index === arr.length - 1 && lastValue) {
+      obj[value] = lastValue
+    }
+    return obj[value]
+  }, nestedObject)
+
+  return nestedObject
+}
+
+export const removeNestedKeyByPath = (obj, path) => {
+  if (!Array.isArray(path)) {
+    throw new Error('Path must be an array.')
+  }
+
+  let current = obj
+
+  for (let i = 0; i < path.length - 1; i++) {
+    if (current[path[i]] === undefined) {
+      return // Path does not exist, so nothing to remove.
+    }
+    current = current[path[i]]
+  }
+
+  const lastKey = path[path.length - 1]
+  if (current && Object.hasOwnProperty.call(current, lastKey)) {
+    delete current[lastKey]
+  }
+}

package/package.json

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