@domql/utils 2.5.64 → 2.5.73

package/array.js

@@ -53,6 +53,7 @@ export const cutArrayBeforeValue = (arr, value) => {
 }
 
 export const cutArrayAfterValue = (arr, value) => {
+  if (!isArray(arr)) return
   const index = arr.indexOf(value)
   if (index !== -1) {
     return arr.slice(index + 1)

package/dist/cjs/array.js

@@ -71,6 +71,8 @@ const cutArrayBeforeValue = (arr, value) => {
   return arr;
 };
 const cutArrayAfterValue = (arr, value) => {
+  if (!(0, import_types.isArray)(arr))
+    return;
   const index = arr.indexOf(value);
   if (index !== -1) {
     return arr.slice(index + 1);

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

@@ -36,13 +36,16 @@ const trimStringFromSymbols = (str, characters) => {
   const pattern = new RegExp(`[${characters.join("\\")}]`, "g");
   return str.replace(pattern, "");
 };
-const brackRegex = /\{\{\s*((?:\.\.\/)+)?([^}\s]+)\s*\}\}/g;
-const replaceLiteralsWithObjectFields = (str, state) => {
-  if (!str.includes("{{"))
+const brackRegex = {
+  2: /\{\{\s*((?:\.\.\/)+)?([^}\s]+)\s*\}\}/g,
+  3: /\{\{\s*((?:\.\.\.\/)+)?([^}\s]+)\s*\}\}/g
+};
+const replaceLiteralsWithObjectFields = (str, state, opts = {}) => {
+  if (!str.includes(opts.bracketsLength === 3 ? "{{{" : "{{"))
     return str;
-  return str.replace(brackRegex, (_, parentPath, variable) => {
+  return str.replace(brackRegex[opts.bracketsLength || 2], (_, parentPath, variable) => {
     if (parentPath) {
-      const parentLevels = parentPath.match(/\.\.\//g).length;
+      const parentLevels = parentPath.match(opts.bracketsLength === 3 ? /\.\.\.\//g : /\.\.\//g).length;
       let parentState = state;
       for (let i = 0; i < parentLevels; i++) {
         parentState = parentState.parent;

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.73",
   "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": "6180b8819c6ccf0dc60501220a05ae212df7f44d",
   "devDependencies": {
     "@babel/core": "^7.12.0"
   }

package/string.js

@@ -24,12 +24,16 @@ export const trimStringFromSymbols = (str, characters) => {
  * @param {object} state - The object containing the values to substitute.
  * @returns {string} The modified string with placeholders replaced by values from the object.
  */
-const brackRegex = /\{\{\s*((?:\.\.\/)+)?([^}\s]+)\s*\}\}/g
-export const replaceLiteralsWithObjectFields = (str, state) => {
-  if (!str.includes('{{')) return str
-  return str.replace(brackRegex, (_, parentPath, variable) => {
+const brackRegex = {
+  2: /\{\{\s*((?:\.\.\/)+)?([^}\s]+)\s*\}\}/g,
+  3: /\{\{\s*((?:\.\.\.\/)+)?([^}\s]+)\s*\}\}/g
+}
+
+export const replaceLiteralsWithObjectFields = (str, state, opts = {}) => {
+  if (!str.includes(opts.bracketsLength === 3 ? '{{{' : '{{')) return str
+  return str.replace(brackRegex[opts.bracketsLength || 2], (_, parentPath, variable) => {
     if (parentPath) {
-      const parentLevels = parentPath.match(/\.\.\//g).length
+      const parentLevels = parentPath.match(opts.bracketsLength === 3 ? /\.\.\.\//g : /\.\.\//g).length
       let parentState = state
       for (let i = 0; i < parentLevels; i++) {
         parentState = parentState.parent