@domql/utils 2.3.138 → 2.3.142

package/array.js

@@ -43,3 +43,39 @@ export const mergeArray = (arr, excludeFrom = []) => {
 export const mergeAndCloneIfArray = obj => {
   return isArray(obj) ? mergeArray(obj) : deepClone(obj)
 }
+
+export const cutArrayBeforeValue = (arr, value) => {
+  const index = arr.indexOf(value);
+  if (index !== -1) {
+    return arr.slice(0, index);
+  }
+  return arr;
+}
+
+export const cutArrayAfterValue = (arr, value) => {
+  const index = arr.indexOf(value);
+  if (index !== -1) {
+    return arr.slice(index + 1);
+  }
+  return arr;
+}
+
+export const createNestedObject = (arr, lastValue) => {
+  let 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;
+}

package/dist/cjs/array.js

@@ -19,6 +19,9 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var array_exports = {};
 __export(array_exports, {
   arrayContainsOtherArray: () => arrayContainsOtherArray,
+  createNestedObject: () => createNestedObject,
+  cutArrayAfterValue: () => cutArrayAfterValue,
+  cutArrayBeforeValue: () => cutArrayBeforeValue,
   joinArrays: () => joinArrays,
   mergeAndCloneIfArray: () => mergeAndCloneIfArray,
   mergeArray: () => mergeArray,
@@ -58,3 +61,33 @@ const mergeArray = (arr, excludeFrom = []) => {
 const mergeAndCloneIfArray = (obj) => {
   return (0, import_types.isArray)(obj) ? mergeArray(obj) : (0, import_object.deepClone)(obj);
 };
+const cutArrayBeforeValue = (arr, value) => {
+  const index = arr.indexOf(value);
+  if (index !== -1) {
+    return arr.slice(0, index);
+  }
+  return arr;
+};
+const cutArrayAfterValue = (arr, value) => {
+  const index = arr.indexOf(value);
+  if (index !== -1) {
+    return arr.slice(index + 1);
+  }
+  return arr;
+};
+const createNestedObject = (arr, lastValue) => {
+  let 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;
+};

package/dist/cjs/object.js

@@ -64,7 +64,7 @@ const map = (obj, extention, element) => {
 };
 const merge = (element, obj, excludeFrom = []) => {
   for (const e in obj) {
-    if (excludeFrom.includes(e) || e.includes("__"))
+    if (excludeFrom.includes(e) || e.startsWith("__"))
       continue;
     const elementProp = element[e];
     const objProp = obj[e];
@@ -76,7 +76,7 @@ const merge = (element, obj, excludeFrom = []) => {
 };
 const deepMerge = (element, extend, excludeFrom = []) => {
   for (const e in extend) {
-    if (excludeFrom.includes(e) || e.includes("__"))
+    if (excludeFrom.includes(e) || e.startsWith("__"))
       continue;
     const elementProp = element[e];
     const extendProp = extend[e];
@@ -91,7 +91,7 @@ const deepMerge = (element, extend, excludeFrom = []) => {
 const clone = (obj, excludeFrom = []) => {
   const o = {};
   for (const prop in obj) {
-    if (excludeFrom.includes(prop) || prop.includes("__"))
+    if (excludeFrom.includes(prop) || prop.startsWith("__"))
       continue;
     o[prop] = obj[prop];
   }
@@ -103,7 +103,7 @@ const deepCloneExclude = (obj, excludeFrom = []) => {
   }
   const o = {};
   for (const k in obj) {
-    if (excludeFrom.includes(k) || k.includes("__"))
+    if (excludeFrom.includes(k) || k.startsWith("__"))
       continue;
     let v = obj[k];
     if (k === "extend" && (0, import_types.isArray)(v)) {
@@ -124,7 +124,7 @@ const mergeArrayExclude = (arr, excl = []) => {
 const deepClone = (obj, excludeFrom = []) => {
   const o = (0, import_types.isArray)(obj) ? [] : {};
   for (const prop in obj) {
-    if (excludeFrom.includes(prop) || prop.includes("__"))
+    if (excludeFrom.includes(prop) || prop.startsWith("__"))
       continue;
     let objProp = obj[prop];
     if (prop === "extend" && (0, import_types.isArray)(objProp)) {
@@ -322,7 +322,7 @@ const overwrite = (element, params, excludeFrom = []) => {
   const { ref } = element;
   const changes = {};
   for (const e in params) {
-    if (excludeFrom.includes(e) || e.includes("__"))
+    if (excludeFrom.includes(e) || e.startsWith("__"))
       continue;
     const elementProp = element[e];
     const paramsProp = params[e];
@@ -335,7 +335,7 @@ const overwrite = (element, params, excludeFrom = []) => {
 };
 const overwriteShallow = (obj, params, excludeFrom = []) => {
   for (const e in params) {
-    if (excludeFrom.includes(e) || e.includes("__"))
+    if (excludeFrom.includes(e) || e.startsWith("__"))
       continue;
     obj[e] = params[e];
   }
@@ -343,10 +343,12 @@ const overwriteShallow = (obj, params, excludeFrom = []) => {
 };
 const overwriteDeep = (obj, params, excludeFrom = []) => {
   for (const e in params) {
-    if (excludeFrom.includes(e) || e.includes("__"))
+    if (excludeFrom.includes(e) || e.startsWith("__"))
       continue;
     const objProp = obj[e];
     const paramsProp = params[e];
+    if (!obj.hasOwnProperty(e) || e === "__proto__" || e === "constructor")
+      continue;
     if ((0, import_types.isObjectLike)(objProp) && (0, import_types.isObjectLike)(paramsProp)) {
       overwriteDeep(objProp, paramsProp);
     } else if (paramsProp !== void 0) {

package/object.js

@@ -24,7 +24,7 @@ export const map = (obj, extention, element) => {
 
 export const merge = (element, obj, excludeFrom = []) => {
   for (const e in obj) {
-    if (excludeFrom.includes(e) || e.includes('__')) continue
+    if (excludeFrom.includes(e) || e.startsWith('__')) continue
     const elementProp = element[e]
     const objProp = obj[e]
     if (elementProp === undefined) {
@@ -36,7 +36,7 @@ export const merge = (element, obj, excludeFrom = []) => {
 
 export const deepMerge = (element, extend, excludeFrom = []) => {
   for (const e in extend) {
-    if (excludeFrom.includes(e) || e.includes('__')) continue
+    if (excludeFrom.includes(e) || e.startsWith('__')) continue
     const elementProp = element[e]
     const extendProp = extend[e]
     if (isObjectLike(elementProp) && isObjectLike(extendProp)) {
@@ -51,7 +51,7 @@ export const deepMerge = (element, extend, excludeFrom = []) => {
 export const clone = (obj, excludeFrom = []) => {
   const o = {}
   for (const prop in obj) {
-    if (excludeFrom.includes(prop) || prop.includes('__')) continue
+    if (excludeFrom.includes(prop) || prop.startsWith('__')) continue
     o[prop] = obj[prop]
   }
   return o
@@ -65,7 +65,7 @@ export const deepCloneExclude = (obj, excludeFrom = []) => {
 
   const o = {}
   for (const k in obj) {
-    if (excludeFrom.includes(k) || k.includes('__')) continue
+    if (excludeFrom.includes(k) || k.startsWith('__')) continue
 
     let v = obj[k]
 
@@ -94,7 +94,7 @@ export const mergeArrayExclude = (arr, excl = []) => {
 export const deepClone = (obj, excludeFrom = []) => {
   const o = isArray(obj) ? [] : {}
   for (const prop in obj) {
-    if (excludeFrom.includes(prop) || prop.includes('__')) continue
+    if (excludeFrom.includes(prop) || prop.startsWith('__')) continue
     let objProp = obj[prop]
     if (prop === 'extend' && isArray(objProp)) {
       objProp = mergeArray(objProp)
@@ -305,7 +305,7 @@ export const overwrite = (element, params, excludeFrom = []) => {
   const changes = {}
 
   for (const e in params) {
-    if (excludeFrom.includes(e) || e.includes('__')) continue
+    if (excludeFrom.includes(e) || e.startsWith('__')) continue
 
     const elementProp = element[e]
     const paramsProp = params[e]
@@ -321,7 +321,7 @@ export const overwrite = (element, params, excludeFrom = []) => {
 
 export const overwriteShallow = (obj, params, excludeFrom = []) => {
   for (const e in params) {
-    if (excludeFrom.includes(e) || e.includes('__')) continue
+    if (excludeFrom.includes(e) || e.startsWith('__')) continue
     obj[e] = params[e]
   }
   return obj
@@ -332,9 +332,10 @@ export const overwriteShallow = (obj, params, excludeFrom = []) => {
  */
 export const overwriteDeep = (obj, params, excludeFrom = []) => {
   for (const e in params) {
-    if (excludeFrom.includes(e) || e.includes('__')) continue
+    if (excludeFrom.includes(e) || e.startsWith('__')) continue
     const objProp = obj[e]
     const paramsProp = params[e]
+    if (!obj.hasOwnProperty(e) || e === '__proto__' || e === 'constructor') continue
     if (isObjectLike(objProp) && isObjectLike(paramsProp)) {
       overwriteDeep(objProp, paramsProp)
     } else if (paramsProp !== undefined) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@domql/utils",
-  "version": "2.3.138",
+  "version": "2.3.142",
   "license": "MIT",
   "type": "module",
   "module": "index.js",
@@ -23,7 +23,7 @@
     "@domql/key": "latest",
     "@domql/tags": "latest"
   },
-  "gitHead": "066e799de6a79c164756c90b4d68e16b226523df",
+  "gitHead": "5d134dec55390026220f6370a71c82feb6f26aad",
   "devDependencies": {
     "@babel/core": "^7.12.0"
   }