@domql/utils 2.3.70 → 2.3.77

package/dist/cjs/object.js

@@ -41,9 +41,14 @@ __export(object_exports, {
 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);
+const exec = (param, element, state, context) => {
+  if ((0, import_types.isFunction)(param)) {
+    return param(
+      element,
+      state || element.state,
+      context || element.context
+    );
+  }
   return param;
 };
 const map = (obj, extention, element) => {
@@ -166,17 +171,16 @@ const deepDestringify = (obj, stringified = {}) => {
           if (e)
             stringified[prop] = objProp;
         }
+      } else {
+        stringified[prop] = objProp;
       }
-    } else {
-      stringified[prop] = objProp;
-    }
-    if ((0, import_types.isArray)(objProp)) {
+    } else 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);
+              const evalProp = import_globals.window.eval(`(${arrProp})`);
               stringified[prop].push(evalProp);
             } catch (e) {
               if (e)
@@ -185,12 +189,16 @@ const deepDestringify = (obj, stringified = {}) => {
           } else {
             stringified[prop].push(arrProp);
           }
-        } else {
+        } else if ((0, import_types.isObject)(arrProp)) {
           stringified[prop].push(deepDestringify(arrProp));
+        } else {
+          stringified[prop].push(arrProp);
         }
       });
     } else if ((0, import_types.isObject)(objProp)) {
       stringified[prop] = deepDestringify(objProp, stringified[prop]);
+    } else {
+      stringified[prop] = objProp;
     }
   }
   return stringified;

package/object.js

@@ -1,10 +1,16 @@
 'use strict'
 
 import { window } from '@domql/globals'
-import { isFunction, isObjectLike, isObject, isArray, isString } from './types.js'
-
-export const exec = (param, element, state) => {
-  if (isFunction(param)) return param(element, state || element.state)
+import { isFunction, isObjectLike, isObject, isArray, isString, is } from './types.js'
+
+export const exec = (param, element, state, context) => {
+  if (isFunction(param)) {
+    return param(
+      element,
+      state || element.state,
+      context || element.context
+    )
+  }
   return param
 }
 
@@ -144,29 +150,31 @@ export const deepDestringify = (obj, stringified = {}) => {
           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
       }
-    } else {
-      stringified[prop] = objProp
-    }
-
-    if (isArray(objProp)) {
+    } else 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
+              const evalProp = window.eval(`(${arrProp})`) // use parentheses to convert string to function expression
               stringified[prop].push(evalProp)
             } catch (e) { if (e) stringified[prop].push(arrProp) }
           } else {
             stringified[prop].push(arrProp)
           }
-        } else {
+        } else if (isObject(arrProp)) {
           stringified[prop].push(deepDestringify(arrProp))
+        } else {
+          stringified[prop].push(arrProp)
         }
       })
     } else if (isObject(objProp)) {
       stringified[prop] = deepDestringify(objProp, stringified[prop]) // recursively call deepDestringify for nested objects
+    } else {
+      stringified[prop] = objProp
     }
   }
   return stringified

package/package.json

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