@domql/utils 2.5.108 → 2.5.113

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

@@ -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/dist/cjs/string.js

@@ -20,6 +20,8 @@ var string_exports = {};
 __export(string_exports, {
   customDecodeURIComponent: () => customDecodeURIComponent,
   customEncodeURIComponent: () => customEncodeURIComponent,
+  decodeNewlines: () => decodeNewlines,
+  encodeNewlines: () => encodeNewlines,
   findKeyPosition: () => findKeyPosition,
   lowercaseFirstLetter: () => lowercaseFirstLetter,
   replaceLiteralsWithObjectFields: () => replaceLiteralsWithObjectFields,
@@ -123,6 +125,12 @@ const replaceOctalEscapeSequences = (str) => {
     return char;
   });
 };
+const encodeNewlines = (str) => {
+  return str.split("\n").join("/////n").split("`").join("/////tilde").split("$").join("/////dlrsgn");
+};
+const decodeNewlines = (encodedStr) => {
+  return encodedStr.split("/////n").join("\n").split("/////tilde").join("`").split("/////dlrsgn").join("$");
+};
 const customEncodeURIComponent = (str) => {
   return str.split("").map((char) => {
     if (/[^a-zA-Z0-9\s]/.test(char)) {

package/object.js

@@ -428,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.108",
+  "version": "2.5.113",
   "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": "ff2aaabca6543ef8e045b928e8bd222d62f4a409",
+  "gitHead": "8436abbfa2752c4659982516ff9ad1db80862e42",
   "devDependencies": {
     "@babel/core": "^7.12.0"
   }

package/string.js

@@ -125,6 +125,14 @@ export const replaceOctalEscapeSequences = (str) => {
   })
 }
 
+export const encodeNewlines = (str) => {
+  return str.split('\n').join('/////n').split('`').join('/////tilde').split('$').join('/////dlrsgn')
+}
+
+export const decodeNewlines = (encodedStr) => {
+  return encodedStr.split('/////n').join('\n').split('/////tilde').join('`').split('/////dlrsgn').join('$')
+}
+
 export const customEncodeURIComponent = (str) => {
   return str.split('').map(char => {
     if (/[^a-zA-Z0-9\s]/.test(char)) {