@domql/utils 2.5.64 → 2.5.71

package/dist/cjs/object.js

@@ -20,6 +20,7 @@ var object_exports = {};
 __export(object_exports, {
   clone: () => clone,
   deepClone: () => deepClone,
+  deepCloneEntrance: () => deepCloneEntrance,
   deepCloneExclude: () => deepCloneExclude,
   deepCloneWithExtend: () => deepCloneWithExtend,
   deepContains: () => deepContains,
@@ -152,18 +153,24 @@ const deepClone = (obj, excludeFrom = [], cleanUndefined = false) => {
   }
   return o;
 };
-const deepCloneWithExtend = (obj, excludeFrom = [], cleanUndefined = false) => {
+const deepCloneEntrance = (...params) => {
+  let extended;
+  try {
+    extended = deepCloneWithExtend(...params);
+  } catch {
+    console.log("HERE", extended);
+  }
+  return extended;
+};
+const deepCloneWithExtend = (obj, excludeFrom = ["node"], options = {}) => {
   const o = (0, import_types.isArray)(obj) ? [] : {};
   for (const prop in obj) {
-    if (prop === "__proto__")
-      continue;
-    if (excludeFrom.includes(prop) || prop.startsWith("__"))
-      continue;
+    const hasOwnProperty2 = Object.prototype.hasOwnProperty.call(obj, prop);
     const objProp = obj[prop];
-    if (cleanUndefined && (0, import_types.isUndefined)(objProp))
+    if (!hasOwnProperty2 || 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, cleanUndefined);
+      o[prop] = deepCloneWithExtend(objProp, excludeFrom, options);
     } else
       o[prop] = objProp;
   }

package/object.js

@@ -1,7 +1,7 @@
 'use strict'
 
 import { window } from './globals.js'
-import { isFunction, isObjectLike, isObject, isArray, isString, is, isUndefined, isDate } from './types.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'
 
@@ -114,15 +114,31 @@ export const deepClone = (obj, excludeFrom = [], cleanUndefined = false) => {
 /**
  * Deep cloning of object
  */
-export const deepCloneWithExtend = (obj, excludeFrom = [], cleanUndefined = false) => {
+export const deepCloneEntrance = (...params) => {
+  // console.groupCollapsed('deepCloneEntrance')
+  // console.warn(params)
+  let extended
+  try {
+    extended = deepCloneWithExtend(...params)
+  } catch {
+    console.log('HERE', extended)
+  }
+  // console.groupEnd('deepCloneEntrance')
+  return extended
+}
+
+export const deepCloneWithExtend = (obj, excludeFrom = ['node'], options = {}) => {
   const o = isArray(obj) ? [] : {}
   for (const prop in obj) {
-    if (prop === '__proto__') continue
-    if (excludeFrom.includes(prop) || prop.startsWith('__')) continue
+    const hasOwnProperty = Object.prototype.hasOwnProperty.call(obj, prop)
     const objProp = obj[prop]
-    if (cleanUndefined && isUndefined(objProp)) continue
+    if (
+      !hasOwnProperty || excludeFrom.includes(prop) || prop.startsWith('__') ||
+      (options.cleanUndefined && isUndefined(objProp)) ||
+      (options.cleanNull && isNull(objProp))
+    ) continue
     if (isObjectLike(objProp)) {
-      o[prop] = deepCloneWithExtend(objProp, excludeFrom, cleanUndefined)
+      o[prop] = deepCloneWithExtend(objProp, excludeFrom, options)
     } else o[prop] = objProp
   }
   return o

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@domql/utils",
-  "version": "2.5.64",
+  "version": "2.5.71",
   "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": "ed8570ce73011589d920684013958c081147a39c",
+  "gitHead": "2750ffc91678c3b2e02f21c82fe58bc593414adb",
   "devDependencies": {
     "@babel/core": "^7.12.0"
   }