@domql/utils 2.5.73 → 2.5.80

package/dist/cjs/object.js

@@ -20,7 +20,6 @@ var object_exports = {};
 __export(object_exports, {
   clone: () => clone,
   deepClone: () => deepClone,
-  deepCloneEntrance: () => deepCloneEntrance,
   deepCloneExclude: () => deepCloneExclude,
   deepCloneWithExtend: () => deepCloneWithExtend,
   deepContains: () => deepContains,
@@ -136,6 +135,12 @@ const mergeArrayExclude = (arr, excl = []) => {
 const deepClone = (obj, excludeFrom = [], cleanUndefined = false) => {
   const o = (0, import_types.isArray)(obj) ? [] : {};
   for (const prop in obj) {
+    if (!Object.prototype.hasOwnProperty.call(obj, prop))
+      continue;
+    if (prop === "node" || prop === "parent" || prop === "root" || prop === "__element") {
+      console.warn("recursive clonning is called", obj);
+      continue;
+    }
     if (prop === "__proto__")
       continue;
     if (excludeFrom.includes(prop) || prop.startsWith("__"))
@@ -153,21 +158,17 @@ const deepClone = (obj, excludeFrom = [], cleanUndefined = false) => {
   }
   return o;
 };
-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) {
-    const hasOwnProperty2 = Object.prototype.hasOwnProperty.call(obj, prop);
+    if (!Object.prototype.hasOwnProperty.call(obj, prop))
+      continue;
+    if (prop === "node" || prop === "parent" || prop === "root" || prop === "__element") {
+      console.warn("recursive clonning is called", obj);
+      continue;
+    }
     const objProp = obj[prop];
-    if (!hasOwnProperty2 || excludeFrom.includes(prop) || prop.startsWith("__") || options.cleanUndefined && (0, import_types.isUndefined)(objProp) || options.cleanNull && (0, import_types.isNull)(objProp))
+    if (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, options);

package/dist/cjs/string.js

@@ -38,14 +38,15 @@ const trimStringFromSymbols = (str, characters) => {
 };
 const brackRegex = {
   2: /\{\{\s*((?:\.\.\/)+)?([^}\s]+)\s*\}\}/g,
-  3: /\{\{\s*((?:\.\.\.\/)+)?([^}\s]+)\s*\}\}/g
+  3: /\{\{\{\s*((?:\.\.\/)+)?([^}\s]+)\s*\}\}\}/g
 };
-const replaceLiteralsWithObjectFields = (str, state, opts = {}) => {
-  if (!str.includes(opts.bracketsLength === 3 ? "{{{" : "{{"))
+const replaceLiteralsWithObjectFields = (str, state, options = {}) => {
+  if (!str.includes(options.bracketsLength === 3 ? "{{{" : "{{"))
     return str;
-  return str.replace(brackRegex[opts.bracketsLength || 2], (_, parentPath, variable) => {
+  const reg = brackRegex[options.bracketsLength || 2];
+  return str.replace(reg, (_, parentPath, variable) => {
     if (parentPath) {
-      const parentLevels = parentPath.match(opts.bracketsLength === 3 ? /\.\.\.\//g : /\.\.\//g).length;
+      const parentLevels = parentPath.match(options.bracketsLength === 3 ? /\.\.\.\//g : /\.\.\//g).length;
       let parentState = state;
       for (let i = 0; i < parentLevels; i++) {
         parentState = parentState.parent;

package/object.js

@@ -98,6 +98,11 @@ export const mergeArrayExclude = (arr, excl = []) => {
 export const deepClone = (obj, excludeFrom = [], cleanUndefined = false) => {
   const o = isArray(obj) ? [] : {}
   for (const prop in obj) {
+    if (!Object.prototype.hasOwnProperty.call(obj, prop)) continue
+    if (prop === 'node' || prop === 'parent' || prop === 'root' || prop === '__element') {
+      console.warn('recursive clonning is called', obj)
+      continue
+    }
     if (prop === '__proto__') continue
     if (excludeFrom.includes(prop) || prop.startsWith('__')) continue
     let objProp = obj[prop]
@@ -106,39 +111,35 @@ export const deepClone = (obj, excludeFrom = [], cleanUndefined = false) => {
       objProp = mergeArray(objProp)
     }
     if (isObjectLike(objProp)) {
+      // queueMicrotask(() => {
       o[prop] = deepClone(objProp, excludeFrom, cleanUndefined)
+      // })
     } else o[prop] = objProp
   }
   return o
 }
+
 /**
  * Deep cloning of object
  */
-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) {
-    const hasOwnProperty = Object.prototype.hasOwnProperty.call(obj, prop)
+    if (!Object.prototype.hasOwnProperty.call(obj, prop)) continue
+    if (prop === 'node' || prop === 'parent' || prop === 'root' || prop === '__element') {
+      console.warn('recursive clonning is called', obj)
+      continue
+    }
     const objProp = obj[prop]
     if (
-      !hasOwnProperty || excludeFrom.includes(prop) || prop.startsWith('__') ||
+      excludeFrom.includes(prop) || prop.startsWith('__') ||
       (options.cleanUndefined && isUndefined(objProp)) ||
       (options.cleanNull && isNull(objProp))
     ) continue
     if (isObjectLike(objProp)) {
+      // queueMicrotask(() => {
       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.73",
+  "version": "2.5.80",
   "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": "6180b8819c6ccf0dc60501220a05ae212df7f44d",
+  "gitHead": "48b6b1ab378914613e11e696ae931cece3f784bb",
   "devDependencies": {
     "@babel/core": "^7.12.0"
   }

package/string.js

@@ -26,14 +26,15 @@ export const trimStringFromSymbols = (str, characters) => {
  */
 const brackRegex = {
   2: /\{\{\s*((?:\.\.\/)+)?([^}\s]+)\s*\}\}/g,
-  3: /\{\{\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) => {
+export const replaceLiteralsWithObjectFields = (str, state, options = {}) => {
+  if (!str.includes(options.bracketsLength === 3 ? '{{{' : '{{')) return str
+  const reg = brackRegex[options.bracketsLength || 2]
+  return str.replace(reg, (_, parentPath, variable) => {
     if (parentPath) {
-      const parentLevels = parentPath.match(opts.bracketsLength === 3 ? /\.\.\.\//g : /\.\.\//g).length
+      const parentLevels = parentPath.match(options.bracketsLength === 3 ? /\.\.\.\//g : /\.\.\//g).length
       let parentState = state
       for (let i = 0; i < parentLevels; i++) {
         parentState = parentState.parent