@domql/utils 2.3.69 → 2.3.70

package/dist/cjs/object.js

@@ -39,59 +39,61 @@ __export(object_exports, {
   overwriteObj: () => overwriteObj
 });
 module.exports = __toCommonJS(object_exports);
+var import_globals = require("@domql/globals");
 var import_types = require("./types.js");
 const exec = (param, element, state) => {
   if ((0, import_types.isFunction)(param))
     return param(element, state || element.state);
   return param;
 };
-const map = (obj2, extention, element) => {
+const map = (obj, extention, element) => {
   for (const e in extention) {
-    obj2[e] = exec(extention[e], element);
+    obj[e] = exec(extention[e], element);
   }
 };
-const merge = (element, obj2) => {
-  for (const e in obj2) {
+const merge = (element, obj) => {
+  for (const e in obj) {
     const elementProp = element[e];
-    const objProp2 = obj2[e];
+    const objProp = obj[e];
     if (elementProp === void 0) {
-      element[e] = objProp2;
+      element[e] = objProp;
     }
   }
   return element;
 };
 const deepMerge = (element, extend) => {
   for (const e in extend) {
-    const elementProp = element[e];
     const extendProp = extend[e];
     if (e === "parent" || e === "props")
       continue;
-    if (elementProp === void 0) {
+    if (element[e] === void 0) {
+      element[e] = extendProp;
+    } else if ((0, import_types.isObjectLike)(element[e]) && (0, import_types.isObjectLike)(extendProp)) {
+      deepMerge(element[e], extendProp);
+    } else {
       element[e] = extendProp;
-    } else if ((0, import_types.isObjectLike)(elementProp) && (0, import_types.isObject)(extendProp)) {
-      deepMerge(elementProp, extendProp);
     }
   }
   return element;
 };
-const clone = (obj2) => {
+const clone = (obj) => {
   const o = {};
-  for (const prop2 in obj2) {
-    if (prop2 === "node")
+  for (const prop in obj) {
+    if (prop === "node")
       continue;
-    o[prop2] = obj2[prop2];
+    o[prop] = obj[prop];
   }
   return o;
 };
-const deepCloneExclude = (obj2, exclude = []) => {
-  if ((0, import_types.isArray)(obj2)) {
-    return obj2.map((x) => deepCloneExclude(x, exclude));
+const deepCloneExclude = (obj, exclude = []) => {
+  if ((0, import_types.isArray)(obj)) {
+    return obj.map((x) => deepCloneExclude(x, exclude));
   }
   const o = {};
-  for (const k in obj2) {
+  for (const k in obj) {
     if (exclude.indexOf(k) > -1)
       continue;
-    let v = obj2[k];
+    let v = obj[k];
     if (k === "extend" && (0, import_types.isArray)(v)) {
       v = mergeArrayExclude(v, exclude);
     }
@@ -107,59 +109,89 @@ const deepCloneExclude = (obj2, exclude = []) => {
 const mergeArrayExclude = (arr, excl = []) => {
   return arr.reduce((acc, curr) => deepMerge(acc, deepCloneExclude(curr, excl)), {});
 };
-const deepClone = (obj2) => {
-  if ((0, import_types.isArray)(obj2)) {
-    return obj2.map(deepClone);
+const deepClone = (obj) => {
+  if ((0, import_types.isArray)(obj)) {
+    return obj.map(deepClone);
   }
   const o = {};
-  for (const prop2 in obj2) {
-    let objProp2 = obj2[prop2];
-    if (prop2 === "extend" && (0, import_types.isArray)(objProp2)) {
-      objProp2 = mergeArray(objProp2);
+  for (const prop in obj) {
+    let objProp = obj[prop];
+    if (prop === "extend" && (0, import_types.isArray)(objProp)) {
+      objProp = mergeArray(objProp);
     }
-    if ((0, import_types.isArray)(objProp2)) {
-      o[prop2] = objProp2.map((v) => (0, import_types.isObject)(v) ? deepClone(v) : v);
-    } else if ((0, import_types.isObject)(objProp2)) {
-      o[prop2] = deepClone(objProp2);
+    if ((0, import_types.isArray)(objProp)) {
+      o[prop] = objProp.map((v) => (0, import_types.isObject)(v) ? deepClone(v) : v);
+    } else if ((0, import_types.isObject)(objProp)) {
+      o[prop] = deepClone(objProp);
     } else
-      o[prop2] = objProp2;
+      o[prop] = objProp;
   }
   return o;
 };
-const deepStringify = (obj2, stringified2 = {}) => {
-  for (const prop2 in obj2) {
-    const objProp2 = obj2[prop2];
-    if ((0, import_types.isFunction)(objProp2)) {
-      stringified2[prop2] = objProp2.toString();
-    } else if ((0, import_types.isObject)(objProp2)) {
-      stringified2[prop2] = {};
-      deepStringify(objProp2[prop2], stringified2[prop2]);
-    } else if ((0, import_types.isArray)(objProp2)) {
-      stringified2[prop2] = [];
-      objProp2.map((v, i) => deepStringify(v, stringified2[prop2][i]));
-    } else
-      stringified2[prop2] = objProp2;
+const deepStringify = (obj, stringified = {}) => {
+  for (const prop in obj) {
+    const objProp = obj[prop];
+    if ((0, import_types.isFunction)(objProp)) {
+      stringified[prop] = objProp.toString();
+    } else if ((0, import_types.isObject)(objProp)) {
+      stringified[prop] = {};
+      deepStringify(objProp, stringified[prop]);
+    } else if ((0, import_types.isArray)(objProp)) {
+      stringified[prop] = [];
+      objProp.forEach((v, i) => {
+        if ((0, import_types.isObject)(v)) {
+          stringified[prop][i] = {};
+          deepStringify(v, stringified[prop][i]);
+        } else if ((0, import_types.isFunction)(v)) {
+          stringified[prop][i] = v.toString();
+        } else {
+          stringified[prop][i] = v;
+        }
+      });
+    } else {
+      stringified[prop] = objProp;
+    }
   }
-  console.log(obj2, stringified2);
-  return stringified2;
+  return stringified;
 };
 const deepDestringify = (obj, stringified = {}) => {
   for (const prop in obj) {
     const objProp = obj[prop];
     if ((0, import_types.isString)(objProp)) {
-      if (objProp.includes("=>") || objProp.includes("function") || objProp[0] === "(") {
+      if (objProp.includes("=>") || objProp.includes("function") || objProp.startsWith("(")) {
         try {
-          const evalProp = eval(objProp);
+          const evalProp = import_globals.window.eval(`(${objProp})`);
           stringified[prop] = evalProp;
         } catch (e) {
           if (e)
             stringified[prop] = objProp;
         }
       }
-    } else
+    } else {
       stringified[prop] = objProp;
-    if ((0, import_types.isObject)(objProp))
-      deepDestringify(stringified[prop], stringified[prop]);
+    }
+    if ((0, import_types.isArray)(objProp)) {
+      stringified[prop] = [];
+      objProp.forEach((arrProp) => {
+        if ((0, import_types.isString)(arrProp)) {
+          if (arrProp.includes("=>") || arrProp.includes("function") || arrProp.startsWith("(")) {
+            try {
+              const evalProp = import_globals.window.eval(arrProp);
+              stringified[prop].push(evalProp);
+            } catch (e) {
+              if (e)
+                stringified[prop].push(arrProp);
+            }
+          } else {
+            stringified[prop].push(arrProp);
+          }
+        } else {
+          stringified[prop].push(deepDestringify(arrProp));
+        }
+      });
+    } else if ((0, import_types.isObject)(objProp)) {
+      stringified[prop] = deepDestringify(objProp, stringified[prop]);
+    }
   }
   return stringified;
 };
@@ -178,44 +210,44 @@ const overwrite = (element, params, options) => {
   }
   return changes;
 };
-const diff = (obj2, original, cache) => {
+const diff = (obj, original, cache) => {
   const changes = cache || {};
-  for (const e in obj2) {
+  for (const e in obj) {
     if (e === "ref")
       continue;
     const originalProp = original[e];
-    const objProp2 = obj2[e];
-    if ((0, import_types.isObjectLike)(originalProp) && (0, import_types.isObjectLike)(objProp2)) {
+    const objProp = obj[e];
+    if ((0, import_types.isObjectLike)(originalProp) && (0, import_types.isObjectLike)(objProp)) {
       changes[e] = {};
-      diff(originalProp, objProp2, changes[e]);
-    } else if (objProp2 !== void 0) {
-      changes[e] = objProp2;
+      diff(originalProp, objProp, changes[e]);
+    } else if (objProp !== void 0) {
+      changes[e] = objProp;
     }
   }
   return changes;
 };
-const overwriteObj = (params, obj2) => {
+const overwriteObj = (params, obj) => {
   const changes = {};
   for (const e in params) {
-    const objProp2 = obj2[e];
+    const objProp = obj[e];
     const paramsProp = params[e];
     if (paramsProp) {
-      obj2[e] = changes[e] = objProp2;
+      obj[e] = changes[e] = objProp;
     }
   }
   return changes;
 };
-const overwriteDeep = (params, obj2) => {
+const overwriteDeep = (params, obj) => {
   for (const e in params) {
-    const objProp2 = obj2[e];
+    const objProp = obj[e];
     const paramsProp = params[e];
-    if ((0, import_types.isObjectLike)(objProp2) && (0, import_types.isObjectLike)(paramsProp)) {
-      overwriteDeep(objProp2, paramsProp);
+    if ((0, import_types.isObjectLike)(objProp) && (0, import_types.isObjectLike)(paramsProp)) {
+      overwriteDeep(paramsProp, objProp);
     } else if (paramsProp !== void 0) {
-      obj2[e] = paramsProp;
+      obj[e] = paramsProp;
     }
   }
-  return obj2;
+  return obj;
 };
 const mergeIfExisted = (a, b) => {
   if ((0, import_types.isObjectLike)(a) && (0, import_types.isObjectLike)(b))
@@ -225,16 +257,16 @@ const mergeIfExisted = (a, b) => {
 const mergeArray = (arr) => {
   return arr.reduce((a, c) => deepMerge(a, deepClone(c)), {});
 };
-const mergeAndCloneIfArray = (obj2) => {
-  return (0, import_types.isArray)(obj2) ? mergeArray(obj2) : deepClone(obj2);
+const mergeAndCloneIfArray = (obj) => {
+  return (0, import_types.isArray)(obj) ? mergeArray(obj) : deepClone(obj);
 };
-const flattenRecursive = (param, prop2, stack = []) => {
+const flattenRecursive = (param, prop, stack = []) => {
   const objectized = mergeAndCloneIfArray(param);
   stack.push(objectized);
-  const extendOfExtend = objectized[prop2];
+  const extendOfExtend = objectized[prop];
   if (extendOfExtend)
-    flattenRecursive(extendOfExtend, prop2, stack);
-  delete objectized[prop2];
+    flattenRecursive(extendOfExtend, prop, stack);
+  delete objectized[prop];
   return stack;
 };
 const isEqualDeep = (param, element) => {
@@ -242,9 +274,9 @@ const isEqualDeep = (param, element) => {
     return true;
   if (!param || !element)
     return false;
-  for (const prop2 in param) {
-    const paramProp = param[prop2];
-    const elementProp = element[prop2];
+  for (const prop in param) {
+    const paramProp = param[prop];
+    const elementProp = element[prop];
     if ((0, import_types.isObjectLike)(paramProp)) {
       const isEqual = isEqualDeep(paramProp, elementProp);
       if (!isEqual)

package/object.js

@@ -1,5 +1,6 @@
 'use strict'
 
+import { window } from '@domql/globals'
 import { isFunction, isObjectLike, isObject, isArray, isString } from './types.js'
 
 export const exec = (param, element, state) => {
@@ -26,14 +27,14 @@ export const merge = (element, obj) => {
 
 export const deepMerge = (element, extend) => {
   for (const e in extend) {
-    const elementProp = element[e]
     const extendProp = extend[e]
-    // const cachedProps = cache.props
     if (e === 'parent' || e === 'props') continue
-    if (elementProp === undefined) {
+    if (element[e] === undefined) {
+      element[e] = extendProp
+    } else if (isObjectLike(element[e]) && isObjectLike(extendProp)) {
+      deepMerge(element[e], extendProp)
+    } else {
       element[e] = extendProp
-    } else if (isObjectLike(elementProp) && isObject(extendProp)) {
-      deepMerge(elementProp, extendProp)
     }
   }
   return element
@@ -111,13 +112,23 @@ export const deepStringify = (obj, stringified = {}) => {
       stringified[prop] = objProp.toString()
     } else if (isObject(objProp)) {
       stringified[prop] = {}
-      deepStringify(objProp[prop], stringified[prop])
+      deepStringify(objProp, stringified[prop])
     } else if (isArray(objProp)) {
       stringified[prop] = []
-      objProp.map((v, i) => deepStringify(v, stringified[prop][i]))
-    } else stringified[prop] = objProp
+      objProp.forEach((v, i) => {
+        if (isObject(v)) {
+          stringified[prop][i] = {}
+          deepStringify(v, stringified[prop][i])
+        } else if (isFunction(v)) {
+          stringified[prop][i] = v.toString()
+        } else {
+          stringified[prop][i] = v
+        }
+      })
+    } else {
+      stringified[prop] = objProp
+    }
   }
-  console.log(obj, stringified)
   return stringified
 }
 
@@ -128,14 +139,35 @@ export const deepDestringify = (obj, stringified = {}) => {
   for (const prop in obj) {
     const objProp = obj[prop]
     if (isString(objProp)) {
-      if (objProp.includes('=>') || objProp.includes('function') || objProp[0] === '(') {
+      if (objProp.includes('=>') || objProp.includes('function') || objProp.startsWith('(')) {
         try {
-          const evalProp = eval(objProp) // eslint-disable-line
+          const evalProp = window.eval(`(${objProp})`) // use parentheses to convert string to function expression
           stringified[prop] = evalProp
         } catch (e) { if (e) stringified[prop] = objProp }
       }
-    } else stringified[prop] = objProp
-    if (isObject(objProp)) deepDestringify(stringified[prop], stringified[prop])
+    } else {
+      stringified[prop] = objProp
+    }
+
+    if (isArray(objProp)) {
+      stringified[prop] = []
+      objProp.forEach((arrProp) => {
+        if (isString(arrProp)) {
+          if (arrProp.includes('=>') || arrProp.includes('function') || arrProp.startsWith('(')) {
+            try {
+              const evalProp = window.eval(arrProp) // eslint-disable-line
+              stringified[prop].push(evalProp)
+            } catch (e) { if (e) stringified[prop].push(arrProp) }
+          } else {
+            stringified[prop].push(arrProp)
+          }
+        } else {
+          stringified[prop].push(deepDestringify(arrProp))
+        }
+      })
+    } else if (isObject(objProp)) {
+      stringified[prop] = deepDestringify(objProp, stringified[prop]) // recursively call deepDestringify for nested objects
+    }
   }
   return stringified
 }
@@ -204,7 +236,7 @@ export const overwriteDeep = (params, obj) => {
     const objProp = obj[e]
     const paramsProp = params[e]
     if (isObjectLike(objProp) && isObjectLike(paramsProp)) {
-      overwriteDeep(objProp, paramsProp)
+      overwriteDeep(paramsProp, objProp)
     } else if (paramsProp !== undefined) {
       obj[e] = paramsProp
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@domql/utils",
-  "version": "2.3.69",
+  "version": "2.3.70",
   "license": "MIT",
   "type": "module",
   "module": "index.js",
@@ -22,5 +22,5 @@
     "@domql/globals": "latest",
     "@domql/tags": "latest"
   },
-  "gitHead": "7b43df6cfdae920a1602749f2cf29a9b44a40000"
+  "gitHead": "c2fa4c40d134093b837eafc1c4374561032281bf"
 }