@domql/utils 2.5.107 → 2.5.112

package/array.js

@@ -1,6 +1,6 @@
 'use strict'
 
-import { deepClone, deepMerge } from './object'
+import { deepCloneWithExtend, deepMerge } from './object'
 import { isArray, isNumber, isString } from './types'
 
 export const arrayContainsOtherArray = (arr1, arr2) => {
@@ -40,14 +40,14 @@ export const joinArrays = (...arrays) => {
  * Merges array extendtypes
  */
 export const mergeArray = (arr, excludeFrom = []) => {
-  return arr.reduce((a, c) => deepMerge(a, deepClone(c, excludeFrom), excludeFrom), {})
+  return arr.reduce((a, c) => deepMerge(a, deepCloneWithExtend(c, excludeFrom), excludeFrom), {})
 }
 
 /**
  * Merges array extends
  */
 export const mergeAndCloneIfArray = obj => {
-  return isArray(obj) ? mergeArray(obj) : deepClone(obj)
+  return isArray(obj) ? mergeArray(obj) : deepCloneWithExtend(obj)
 }
 
 export const cutArrayBeforeValue = (arr, value) => {

package/dist/cjs/array.js

@@ -67,10 +67,10 @@ const joinArrays = (...arrays) => {
   return [].concat(...arrays);
 };
 const mergeArray = (arr, excludeFrom = []) => {
-  return arr.reduce((a, c) => (0, import_object.deepMerge)(a, (0, import_object.deepClone)(c, excludeFrom), excludeFrom), {});
+  return arr.reduce((a, c) => (0, import_object.deepMerge)(a, (0, import_object.deepCloneWithExtend)(c, excludeFrom), excludeFrom), {});
 };
 const mergeAndCloneIfArray = (obj) => {
-  return (0, import_types.isArray)(obj) ? mergeArray(obj) : (0, import_object.deepClone)(obj);
+  return (0, import_types.isArray)(obj) ? mergeArray(obj) : (0, import_object.deepCloneWithExtend)(obj);
 };
 const cutArrayBeforeValue = (arr, value) => {
   const index = arr.indexOf(value);

package/dist/cjs/object.js

@@ -159,7 +159,7 @@ const deepClone = (obj, excludeFrom = [], cleanUndefined = false) => {
   return o;
 };
 const deepCloneWithExtend = (obj, excludeFrom = ["node"], options = {}) => {
-  const o = (0, import_types.isArray)(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;
@@ -413,7 +413,7 @@ const overwriteShallow = (obj, params, excludeFrom = []) => {
 };
 const overwriteDeep = (obj, params, excludeFrom = []) => {
   for (const e in params) {
-    if (e === "__proto__")
+    if (e === "__ref")
       continue;
     if (excludeFrom.includes(e) || e.startsWith("__"))
       continue;

package/object.js

@@ -123,7 +123,9 @@ export const deepClone = (obj, excludeFrom = [], cleanUndefined = false) => {
  * Deep cloning of object
  */
 export const deepCloneWithExtend = (obj, excludeFrom = ['node'], options = {}) => {
-  const o = isArray(obj) ? [] : {}
+  const o = options.window
+    ? 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') {
@@ -426,7 +428,7 @@ export const overwriteShallow = (obj, params, excludeFrom = []) => {
  */
 export const overwriteDeep = (obj, params, excludeFrom = []) => {
   for (const e in params) {
-    if (e === '__proto__') continue
+    if (e === '__ref') continue
     if (excludeFrom.includes(e) || e.startsWith('__')) continue
     const objProp = obj[e]
     const paramsProp = params[e]

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@domql/utils",
-  "version": "2.5.107",
+  "version": "2.5.112",
   "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": "a313ce03e61603c66db67f1264c172805edb273e",
+  "gitHead": "8a59640e77bcd22114bdf64dfa4945604b5bfd1f",
   "devDependencies": {
     "@babel/core": "^7.12.0"
   }