@domql/utils 2.5.117 → 2.5.123

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/function.js

@@ -18,6 +18,7 @@ var __copyProps = (to, from, except, desc) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var function_exports = {};
 __export(function_exports, {
+  cloneFunction: () => cloneFunction,
   debounce: () => debounce,
   debounceOnContext: () => debounceOnContext,
   isStringFunction: () => isStringFunction,
@@ -67,3 +68,14 @@ const isStringFunction = (inputString) => {
   const functionRegex = /^((function\s*\([^)]*\)\s*\{[^}]*\})|(\([^)]*\)\s*=>))/;
   return functionRegex.test(inputString);
 };
+function cloneFunction(fn, win = window) {
+  const temp = function() {
+    return fn.apply(win, arguments);
+  };
+  for (const key in fn) {
+    if (Object.hasOwnProperty.call(fn, key)) {
+      temp[key] = fn[key];
+    }
+  }
+  return temp;
+}

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);
@@ -59,6 +61,7 @@ var import_types = require("./types.js");
 var import_array = require("./array.js");
 var import_string = require("./string.js");
 var import_node = require("./node.js");
+var import_function = require("./function.js");
 const exec = (param, element, state, context) => {
   if ((0, import_types.isFunction)(param)) {
     return param(
@@ -170,6 +173,8 @@ const deepCloneWithExtend = (obj, excludeFrom = ["node"], options = {}) => {
       continue;
     if ((0, import_types.isObjectLike)(objProp)) {
       o[prop] = deepCloneWithExtend(objProp, excludeFrom, options);
+    } else if ((0, import_types.isFunction)(objProp) && options.window) {
+      o[prop] = (0, import_function.cloneFunction)(objProp, options.window);
     } else
       o[prop] = objProp;
   }
@@ -413,16 +418,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;
     }
@@ -578,3 +590,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/function.js

@@ -71,3 +71,17 @@ export const isStringFunction = inputString => {
   // Use the regex to test if the inputString matches the function pattern
   return functionRegex.test(inputString)
 }
+
+export function cloneFunction (fn, win = window) {
+  const temp = function () {
+    return fn.apply(win, arguments)
+  }
+
+  // Copy properties from original function
+  for (const key in fn) {
+    if (Object.hasOwnProperty.call(fn, key)) {
+      temp[key] = fn[key]
+    }
+  }
+  return temp
+}

package/object.js

@@ -5,6 +5,7 @@ import { isFunction, isObjectLike, isObject, isArray, isString, is, isUndefined,
 import { mergeAndCloneIfArray, mergeArray } from './array.js'
 import { stringIncludesAny } from './string.js'
 import { isDOMNode } from './node.js'
+import { cloneFunction } from './function.js'
 
 export const exec = (param, element, state, context) => {
   if (isFunction(param)) {
@@ -176,6 +177,8 @@ export const deepCloneWithExtend = (obj, excludeFrom = ['node'], options = {}) =
       // queueMicrotask(() => {
       o[prop] = deepCloneWithExtend(objProp, excludeFrom, options)
       // })
+    } else if (isFunction(objProp) && options.window) {
+      o[prop] = cloneFunction(objProp, options.window)
     } else o[prop] = objProp
   }
   return o
@@ -460,18 +463,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
 }
 
@@ -700,3 +717,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.117",
+  "version": "2.5.123",
   "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": "56be344ba28e3cb51c146c1b74fe3c0e21341879",
+  "gitHead": "6dd041deb89bc2ebfa1f5ee9360d563df60eca13",
   "devDependencies": {
     "@babel/core": "^7.12.0"
   }