@xuda.io/runtime-bundle 1.0.323 → 1.0.325

package/js/xuda-runtime-slim.js

@@ -10065,6 +10065,10 @@ func.events.execute = async function (
         `(async function(el,evt) {
           ${refIdP.value}
           })(document.querySelector(\`[xu-ui-id=${elementP}]\`),evt)`,
+        null,
+        null,
+        null,
+        evt,
       );
       await func.datasource.set_outputField(SESSION_ID, dsSessionP, result, args);
 
@@ -10081,6 +10085,9 @@ func.events.execute = async function (
           ${refIdP.value}
           })(document.querySelector(\`[xu-ui-id=${elementP}]\`),evt)`,
         true,
+        null,
+        null,
+        evt,
       );
       await func.datasource.set_outputField(SESSION_ID, dsSessionP, result, args);
 
@@ -10621,22 +10628,7 @@ func.events.invoke = async function (event_id) {
 };
  func.expression = {};
 
-func.expression.get = async function (
-  SESSION_ID,
-  valP,
-  dsSessionP,
-  sourceP,
-  rowIdP,
-  sourceActionP,
-  secondPassP,
-  calling_fieldIdP,
-  fieldsP,
-  debug_infoP,
-  iterate_info,
-  js_script_callback,
-  jobNo,
-  api_output_type
-) {
+func.expression.get = async function (SESSION_ID, valP, dsSessionP, sourceP, rowIdP, sourceActionP, secondPassP, calling_fieldIdP, fieldsP, debug_infoP, iterate_info, js_script_callback, jobNo, api_output_type) {
   class xu_class {
     async get() {
       var ret;
@@ -10645,23 +10637,23 @@ func.expression.get = async function (
       var warning;
 
       function evalJson(text) {
-        return eval("(" + text + ")");
+        return eval('(' + text + ')');
       }
 
       if (valP === null) {
-        ret = "";
+        ret = '';
       } else {
         switch (typeof valP) {
-          case "string":
+          case 'string':
             ret = valP;
             break;
 
-          case "undefined":
-            ret = "";
+          case 'undefined':
+            ret = '';
             break;
 
-          case "boolean":
-            ret = valP ? "Y" : "N";
+          case 'boolean':
+            ret = valP ? 'Y' : 'N';
             break;
 
           default:
@@ -10670,40 +10662,35 @@ func.expression.get = async function (
         }
       }
 
-      ret = ret.replace(/\&/g, "&");
+      ret = ret.replace(/\&/g, '&');
       ret = func.utils.replace_studio_drive_url(SESSION_ID, ret);
 
       const end_results = function () {
         const replace_quotes = function (ret) {
           for (const [key, val] of Object.entries(fields)) {
-            if (typeof val === "string")
-              ret = ret.replace('"' + val + '"', val.replace(/"/gi, ""));
+            if (typeof val === 'string') ret = ret.replace('"' + val + '"', val.replace(/"/gi, ''));
           }
           return ret;
         };
-        if (["update", "javascript"].includes(sourceP)) {
-          if (typeof ret === "string") ret = replace_quotes(ret);
+        if (['update', 'javascript'].includes(sourceP)) {
+          if (typeof ret === 'string') ret = replace_quotes(ret);
         }
         const log_error = function () {
           if (SESSION_OBJ[SESSION_ID].DS_GLB[dsSessionP]) {
-            func.utils.debug.log(
-              SESSION_ID,
-              SESSION_OBJ[SESSION_ID].DS_GLB[dsSessionP].nodeId,
-              {
-                module: "expression",
-                action: sourceP,
-                source: calling_fieldIdP,
-                prop: ret,
-                details: ret,
-                result: ret,
-                error: error,
-                warning: warning,
-                fields: null,
-                type: "exp",
-                prog_id: SESSION_OBJ[SESSION_ID].DS_GLB[dsSessionP].prog_id,
-                debug_info: debug_infoP,
-              }
-            );
+            func.utils.debug.log(SESSION_ID, SESSION_OBJ[SESSION_ID].DS_GLB[dsSessionP].nodeId, {
+              module: 'expression',
+              action: sourceP,
+              source: calling_fieldIdP,
+              prop: ret,
+              details: ret,
+              result: ret,
+              error: error,
+              warning: warning,
+              fields: null,
+              type: 'exp',
+              prog_id: SESSION_OBJ[SESSION_ID].DS_GLB[dsSessionP].prog_id,
+              debug_info: debug_infoP,
+            });
           }
         };
         if (error) log_error();
@@ -10721,32 +10708,22 @@ func.expression.get = async function (
       };
       const variable_not_exist = async function () {
         try {
-          if (sourceP !== "arguments") {
-            if (ret && ret.substr(0, 6) === "_DATE_") {
+          if (sourceP !== 'arguments') {
+            if (ret && ret.substr(0, 6) === '_DATE_') {
               ret = ret.substr(6);
             } else if (
-              (ret &&
-                ret.length === 10 &&
-                ret.substr(4, 1) === "-" &&
-                ret.substr(7, 1) === "-") ||
-              ret === "self" // bypass eval for date 2017-03-22
+              (ret && ret.length === 10 && ret.substr(4, 1) === '-' && ret.substr(7, 1) === '-') ||
+              ret === 'self' // bypass eval for date 2017-03-22
             ) {
               ret = ret;
             } else {
-              ret = await func.expression.secure_eval(
-                SESSION_ID,
-                sourceP,
-                ret,
-                jobNo,
-                dsSessionP,
-                js_script_callback
-              );
+              ret = await func.expression.secure_eval(SESSION_ID, sourceP, ret, jobNo, dsSessionP, js_script_callback);
             }
             // console.log("AFTER OK", ret)
             return end_results();
           } else {
             // do eval for arithmetic vals
-            ret = ret.replace(/_NULL/gi, "");
+            ret = ret.replace(/_NULL/gi, '');
             return end_results();
           }
         } catch (err) {
@@ -10759,14 +10736,7 @@ func.expression.get = async function (
       }
 
       const validate_email = async function () {
-        const ret = await func.expression.secure_eval(
-          SESSION_ID,
-          sourceP,
-          valP,
-          jobNo,
-          dsSessionP,
-          js_script_callback
-        );
+        const ret = await func.expression.secure_eval(SESSION_ID, sourceP, valP, jobNo, dsSessionP, js_script_callback);
 
         return glb.emailRegex.test(ret);
       };
@@ -10785,10 +10755,7 @@ func.expression.get = async function (
         var_Arr[key].value = val.value;
         //--------------
         const replace_value_in_string = async function (retP, fieldIdP) {
-          if (
-            iterate_info?.iterator_key === fieldIdP ||
-            iterate_info?.iterator_val === fieldIdP
-          ) {
+          if (iterate_info?.iterator_key === fieldIdP || iterate_info?.iterator_val === fieldIdP) {
             if (iterate_info.iterator_key === fieldIdP) {
               retP.value = iterate_info._key;
             }
@@ -10798,50 +10765,43 @@ func.expression.get = async function (
           }
 
           const set_value = function (valP) {
-            if (typeof valP !== "undefined") {
+            if (typeof valP !== 'undefined') {
               var_Arr[key].value = valP;
-              if (typeof valP === "string") var_Arr[key].type = "string";
+              if (typeof valP === 'string') var_Arr[key].type = 'string';
             } else {
-              if (retP.type === "object") {
-                var_Arr[key].value = "";
-                var_Arr[key].type = "string";
+              if (retP.type === 'object') {
+                var_Arr[key].value = '';
+                var_Arr[key].type = 'string';
               }
             }
           };
 
-          if (sourceP === "exp" && retP.type !== "exp") {
+          if (sourceP === 'exp' && retP.type !== 'exp') {
             var_Arr[key].type = retP.type;
             return;
           }
-          if (typeof retP.value !== "undefined") {
+          if (typeof retP.value !== 'undefined') {
             var_Arr[key].type = retP.type;
             var_Arr[key].value = retP.value;
-            if ((val.value.indexOf("[") > -1) | (val.value.indexOf(".") > -1)) {
+            if ((val.value.indexOf('[') > -1) | (val.value.indexOf('.') > -1)) {
               //get values from array '@var==="sss" && @var_B==="sss" && @obj.property===5 && @objA["value"]===123 | @objB["value"].property===1234'
               var data = retP.prop;
-              if (retP.type === "object") data = retP.value;
+              if (retP.type === 'object') data = retP.value;
               var property1, property2;
               //check for split situation: @objB[@var].property  1: @objB[   2:@var].property
-              if (
-                val.value.indexOf("[") === -1 &&
-                val.value.indexOf("]") > -1 &&
-                val.value.substr(0, 1) === "@"
-              ) {
+              if (val.value.indexOf('[') === -1 && val.value.indexOf(']') > -1 && val.value.substr(0, 1) === '@') {
                 //check situation 2
                 var prevData = var_Arr[key - 1].value;
                 var_Arr[key].value = prevData[data]; //  @objB[@var]
-                if (val.value.indexOf(".") > -1) {
-                  property2 = await func.expression.get_property(val.value)
-                    .property2; //val.value.substr(val.value.indexOf(".") + 1, val.value.length); // get .
+                if (val.value.indexOf('.') > -1) {
+                  property2 = await func.expression.get_property(val.value).property2; //val.value.substr(val.value.indexOf(".") + 1, val.value.length); // get .
                   if (prevData[data]) set_value(prevData[data][property2]);
                   //                                    var_Arr[key].value = prevData[data][property2]; //@objB[@var].property
                 }
                 delete var_Arr[key - 1];
               } else {
-                property1 = await func.expression.get_property(val.value)
-                  .property1;
-                property2 = await func.expression.get_property(val.value)
-                  .property2;
+                property1 = await func.expression.get_property(val.value).property1;
+                property2 = await func.expression.get_property(val.value).property2;
                 if (property1) {
                   var_Arr[key].value = data[property1]; // @var["value"] or @var.property
                   if (property2) {
@@ -10869,19 +10829,11 @@ func.expression.get = async function (
         //>>>>>>>>>>>>>>>>>>
         if (val.fieldId) {
           // @_THIS
-          if (
-            val.fieldId &&
-            val.fieldId.substr(0, 5) === "_THIS" &&
-            calling_fieldIdP &&
-            (val.fieldId.length === 5 ||
-              (val.fieldId.length > 5 && val.fieldId.substr(5, 1) === "."))
-          ) {
+          if (val.fieldId && val.fieldId.substr(0, 5) === '_THIS' && calling_fieldIdP && (val.fieldId.length === 5 || (val.fieldId.length > 5 && val.fieldId.substr(5, 1) === '.'))) {
             if (val.fieldId.length === 5) val.fieldId = calling_fieldIdP;
-            else
-              val.fieldId =
-                calling_fieldIdP + val.fieldId(5, val.fieldId.length - 1);
+            else val.fieldId = calling_fieldIdP + val.fieldId(5, val.fieldId.length - 1);
           }
-          if (!sourceP === "exp") {
+          if (!sourceP === 'exp') {
             var_Arr[key].value = '""';
           } // put default
           fields[val.fieldId] = var_Arr[key].value;
@@ -10891,7 +10843,7 @@ func.expression.get = async function (
             val.fieldId,
             dsSessionP,
 
-            rowIdP
+            rowIdP,
           ); // find field in dataSources
 
           await replace_value_in_string(ret.ret, ret.fieldIdP);
@@ -10904,7 +10856,7 @@ func.expression.get = async function (
         var var_error_found;
         // merge arr values
         _.forEach(var_Arr, function (val, key) {
-          if (sourceP === "UI Property EXP") {
+          if (sourceP === 'UI Property EXP') {
             let ret = func.utils.get_drive_url(SESSION_ID, val.value, true);
             if (ret.changed) {
               res[key] = ret.value;
@@ -10912,108 +10864,72 @@ func.expression.get = async function (
             }
           }
 
-          if (sourceP === "UI Attr EXP") {
-            let ret = func.utils.get_drive_url(
-              SESSION_ID,
-              val.value,
-              var_Arr.length == 1 ? false : true
-            );
+          if (sourceP === 'UI Attr EXP') {
+            let ret = func.utils.get_drive_url(SESSION_ID, val.value, var_Arr.length == 1 ? false : true);
             if (ret.changed) {
               res[key] = ret.value;
               return true;
             }
           }
 
-          if (val.type === "exp") {
+          if (val.type === 'exp') {
             exp_exist = true;
           }
           res[key] = val.value;
 
-          if (var_Arr.length > 1) { // complex input
-            if (
-              !["DbQuery", "alert", "exp", "api_rendered_output"].includes(
-                sourceP
-              ) &&
-              ["string", "date"].includes(val.type)
-            ) {
-              res[key] = "`" + val.value + "`";
+          if (var_Arr.length > 1) {
+            // complex input
+            if (!['DbQuery', 'alert', 'exp', 'api_rendered_output'].includes(sourceP) && ['string', 'date'].includes(val.type)) {
+              res[key] = '`' + val.value + '`';
             }
             // new Dec 18 2024 for Ishai  // json,html,xml,text,css
-            if (
-              ["api_rendered_output"].includes(sourceP) && ["json"].includes(api_output_type) &&
-              ["string", "date"].includes(val.type)
-            ) {
+            if (['api_rendered_output'].includes(sourceP) && ['json'].includes(api_output_type) && ['string', 'date'].includes(val.type)) {
               res[key] = `"` + val.value + `"`;
             }
           }
-          if (val.fieldId && val.value && typeof val.value === "string") {
-            if (
-              ["query", "condition", "range", "sort", "locate"].includes(
-                sourceP
-              )
-            ) {
-              if (val.value.indexOf("↵") > -1) {
-                res[key] = val.value.split("↵").join("");
+          if (val.fieldId && val.value && typeof val.value === 'string') {
+            if (['query', 'condition', 'range', 'sort', 'locate'].includes(sourceP)) {
+              if (val.value.indexOf('↵') > -1) {
+                res[key] = val.value.split('↵').join('');
               }
-              res[key] = res[key].replace(/(\r\n|\n|\r)/gm, ""); //.replace(/"/g,'\"');//.replace(/'/g,"");
+              res[key] = res[key].replace(/(\r\n|\n|\r)/gm, ''); //.replace(/"/g,'\"');//.replace(/'/g,"");
             }
 
-            if (["init", "update", "virtual"].includes(sourceP)) {
-              if (val.value.indexOf("↵") > -1)
-                res[key] = val.value.split("↵").join("\n");
-              res[key] = res[key].replace(/(\r\n|\n|\r)/gm, "\\n");
+            if (['init', 'update', 'virtual'].includes(sourceP)) {
+              if (val.value.indexOf('↵') > -1) res[key] = val.value.split('↵').join('\n');
+              res[key] = res[key].replace(/(\r\n|\n|\r)/gm, '\\n');
             }
 
-            if (typeof IS_PROCESS_SERVER !== "undefined") {
-              res[key] = res[key].replace(/(\r\n|\n|\r)/gm, "<br>");
+            if (typeof IS_PROCESS_SERVER !== 'undefined') {
+              res[key] = res[key].replace(/(\r\n|\n|\r)/gm, '<br>');
             }
 
             fields[val.fieldId] = res[key];
           }
           // extract object
-          if (typeof val.value === "object" && var_Arr.length > 1) {
-            if (
-              !Array.isArray(val.value) &&
-              !var_Arr[key + 1].value?.includes(".")
-            ) {
+          if (typeof val.value === 'object' && var_Arr.length > 1) {
+            if (!Array.isArray(val.value) && !var_Arr[key + 1].value?.includes('.')) {
               // && !["api_rendered_output"].includes(sourceP)
 
               // prevent cast on single value expression
-              res[key] = "(" + JSON.stringify(val.value) + ")";
+              res[key] = '(' + JSON.stringify(val.value) + ')';
             } else {
               res[key] = JSON.stringify(val.value);
             }
           }
 
-          if (
-            !exp_exist &&
-            sourceP !== "exp" &&
-            val.value &&
-            typeof val.value === "string" &&
-            val.value.substr(0, 1) === "@"
-          ) {
-            warning = "Error encoding " + val.value;
+          if (!exp_exist && sourceP !== 'exp' && val.value && typeof val.value === 'string' && val.value.substr(0, 1) === '@') {
+            warning = 'Error encoding ' + val.value;
             var_error_found = true;
             res[key] = 0;
           }
         });
         var join = function (arrP) {
-          return arrP.join("");
+          return arrP.join('');
         };
         var exp = undefined;
-        if (exp_exist && sourceP !== "exp") {
-          exp = await func.expression.get(
-            SESSION_ID,
-            join(res),
-            dsSessionP,
-            sourceP,
-            rowIdP,
-            sourceActionP,
-            true,
-            calling_fieldIdP,
-            fields,
-            debug_infoP
-          );
+        if (exp_exist && sourceP !== 'exp') {
+          exp = await func.expression.get(SESSION_ID, join(res), dsSessionP, sourceP, rowIdP, sourceActionP, true, calling_fieldIdP, fields, debug_infoP);
           if (exp.res) res = exp.res;
           // do second pass when exp exist
           else res = [exp.result];
@@ -11028,39 +10944,28 @@ func.expression.get = async function (
 
         if (secondPassP) {
           ret = result;
-        } else if (sourceP !== "exp") {
+        } else if (sourceP !== 'exp') {
           // no eval for second pass
           // return single value
-          if (
-            res.length === 1 &&
-            typeof res[0] === "string" &&
-            typeof res[0] !== "object"
-          ) {
+          if (res.length === 1 && typeof res[0] === 'string' && typeof res[0] !== 'object') {
             // avoid eval when query leading zeros problem
             ret = join(res);
-            if (ret && ret.substr(0, 1) === "@") {
-              error = "Error encoding @ var";
+            if (ret && ret.substr(0, 1) === '@') {
+              error = 'Error encoding @ var';
               var_error_found = true;
             }
           } else {
             if (
               ![
-                "arguments",
+                'arguments',
                 // "alert",
-                "api_rendered_output",
-                "DbQuery",
+                'api_rendered_output',
+                'DbQuery',
               ].includes(sourceP)
             ) {
-              ret = await func.expression.secure_eval(
-                SESSION_ID,
-                sourceP,
-                result,
-                jobNo,
-                dsSessionP,
-                js_script_callback
-              );
+              ret = await func.expression.secure_eval(SESSION_ID, sourceP, result, jobNo, dsSessionP, js_script_callback);
             } else {
-              if (sourceP === "DbQuery") {
+              if (sourceP === 'DbQuery') {
                 ret = JSON.stringify(evalJson(result));
               } else {
                 // try eval
@@ -11089,12 +10994,7 @@ func.expression.parse = function (strP) {
     if (!posP) posP = 0;
     var clean_split_str = function (arrP) {
       var arr = [];
-      if (
-        arrP &&
-        arrP.length > 1 &&
-        arrP[0] === "" &&
-        arrP[1].indexOf("@") > -1
-      ) {
+      if (arrP && arrP.length > 1 && arrP[0] === '' && arrP[1].indexOf('@') > -1) {
         for (var i = 1; i <= arrP.length; i++) {
           arr.push(arrP[i]);
         }
@@ -11105,7 +11005,7 @@ func.expression.parse = function (strP) {
     var validSymbolsNoArray = /[^.@\[]/; //valid symbols no array /[^.@\[\]\]]/
     var validSymbolsWithArray = /[^.@"'\[\]]/; //valid symbols with array
     var validSymbols = validSymbolsNoArray;
-    var splitTmp = strP.replace(/@/g, "^^@").split("^^");
+    var splitTmp = strP.replace(/@/g, '^^@').split('^^');
     var split = clean_split_str(splitTmp);
     var obj = [];
     if (split) {
@@ -11113,8 +11013,8 @@ func.expression.parse = function (strP) {
         // run on @ segments
         if (val) {
           var pos = strP.indexOf(val);
-          if (val && val.substr(0, 1) === "@") {
-            var tmpStr = "";
+          if (val && val.substr(0, 1) === '@') {
+            var tmpStr = '';
             var word_start_pos = undefined;
             var word_end_pos = undefined;
             // run on @ segment string
@@ -11122,7 +11022,7 @@ func.expression.parse = function (strP) {
               var key1 = i;
               var val1 = val.substr(i, 1);
               if (
-                val1 === "." &&
+                val1 === '.' &&
                 !word_start_pos // find first dot
               )
                 word_start_pos = key1;
@@ -11132,40 +11032,24 @@ func.expression.parse = function (strP) {
                 nonLettersPatt.test(val1) // find any sign character to mark the end of word
               )
                 word_end_pos = key1;
-              if (
-                word_start_pos &&
-                word_start_pos >= 0 &&
-                word_end_pos &&
-                word_end_pos >= 0
-              ) {
+              if (word_start_pos && word_start_pos >= 0 && word_end_pos && word_end_pos >= 0) {
                 // find the word
-                var word = val.substr(
-                  word_start_pos + 1,
-                  word_end_pos - word_start_pos - 1
-                ); // get the word
+                var word = val.substr(word_start_pos + 1, word_end_pos - word_start_pos - 1); // get the word
                 // if (glb.ALL_PROPERTIES_ARR.indexOf(word) === -1) {
                 // compare with internal properties
-                tmpStr =
-                  tmpStr.substr(0, word_start_pos) +
-                  "^^" +
-                  tmpStr.substr(word_start_pos, word_end_pos);
+                tmpStr = tmpStr.substr(0, word_start_pos) + '^^' + tmpStr.substr(word_start_pos, word_end_pos);
                 // }
-                if (val.substr(word_end_pos, 1) === ".")
-                  word_start_pos = word_end_pos;
+                if (val.substr(word_end_pos, 1) === '.') word_start_pos = word_end_pos;
                 else word_start_pos = null;
                 word_end_pos = null;
               }
-              if (val1 === "[") validSymbols = validSymbolsWithArray;
-              if (
-                nonLettersPatt.test(val1) &&
-                validSymbols.test(val1) &&
-                tmpStr.indexOf("^^") === -1
-              ) {
-                tmpStr += "^^" + val1;
+              if (val1 === '[') validSymbols = validSymbolsWithArray;
+              if (nonLettersPatt.test(val1) && validSymbols.test(val1) && tmpStr.indexOf('^^') === -1) {
+                tmpStr += '^^' + val1;
               } else tmpStr += val1;
             }
             //                        });
-            if (tmpStr.indexOf("^^") > -1) {
+            if (tmpStr.indexOf('^^') > -1) {
               var obj1 = extract_str(tmpStr, pos);
               obj = obj.concat(obj1);
             } else {
@@ -11173,10 +11057,8 @@ func.expression.parse = function (strP) {
               var fieldId = undefined;
               if (val) {
                 fieldId = val.substr(1, val.length);
-                if (val.indexOf(".") > -1)
-                  fieldId = val.substr(1, val.indexOf(".") - 1);
-                if (val.indexOf("[") > -1)
-                  fieldId = val.substr(1, val.indexOf("[") - 1);
+                if (val.indexOf('.') > -1) fieldId = val.substr(1, val.indexOf('.') - 1);
+                if (val.indexOf('[') > -1) fieldId = val.substr(1, val.indexOf('[') - 1);
                 //
                 //                                  if (val.indexOf("]") > -1)
                 //                                    fieldId = val.substr(1, val.indexOf("]") - 1);
@@ -11204,7 +11086,7 @@ func.expression.parse = function (strP) {
 
 func.expression.get_property = async function (valP) {
   async function secure_eval(val) {
-    if (typeof IS_PROCESS_SERVER === "undefined") {
+    if (typeof IS_PROCESS_SERVER === 'undefined') {
       try {
         return eval(val);
       } catch (err) {
@@ -11225,20 +11107,16 @@ func.expression.get_property = async function (valP) {
       });
       return await vm.run(val);
     } catch (err) {
-      throw "";
+      throw '';
     }
   }
 
   var property1, property2;
-  if (valP.indexOf("[") > -1 && valP.indexOf("]") > -1) {
-    property1 = valP.substr(
-      valP.indexOf("[") + 1,
-      valP.indexOf("]") - valP.indexOf("[") - 1
-    ); // get []
+  if (valP.indexOf('[') > -1 && valP.indexOf(']') > -1) {
+    property1 = valP.substr(valP.indexOf('[') + 1, valP.indexOf(']') - valP.indexOf('[') - 1); // get []
     property1 = await secure_eval(property1);
   }
-  if (valP.indexOf(".") > -1)
-    property2 = valP.substr(valP.indexOf(".") + 1, valP.length); // get .
+  if (valP.indexOf('.') > -1) property2 = valP.substr(valP.indexOf('.') + 1, valP.length); // get .
   return {
     property1: property1,
     property2: property2,
@@ -11246,52 +11124,32 @@ func.expression.get_property = async function (valP) {
 };
 func.expression.validate_constant = function (valP) {
   var patt = /["']/;
-  if (
-    typeof valP === "string" &&
-    patt.test(valP.substr(0, 1)) &&
-    patt.test(valP.substr(0, valP.length - 1))
-  )
-    return true;
+  if (typeof valP === 'string' && patt.test(valP.substr(0, 1)) && patt.test(valP.substr(0, valP.length - 1))) return true;
   else return false;
 };
 func.expression.validate_variables = function (valP) {
-  if (typeof valP === "string" && valP.indexOf("@") > -1) return true;
+  if (typeof valP === 'string' && valP.indexOf('@') > -1) return true;
   else return false;
 };
 func.expression.remove_quotes = function (valP) {
-  if (func.expression.validate_constant(valP))
-    return valP.substr(1, valP.length - 2);
+  if (func.expression.validate_constant(valP)) return valP.substr(1, valP.length - 2);
   else return valP;
 };
 
-func.expression.secure_eval = async function (
-  SESSION_ID,
-  sourceP,
-  val,
-  job_id,
-  dsSessionP,
-  js_script_callback
-) {
-  const api_utils = await func.common.get_module(
+func.expression.secure_eval = async function (SESSION_ID, sourceP, val, job_id, dsSessionP, js_script_callback, evt) {
+  const api_utils = await func.common.get_module(SESSION_ID, 'xuda-api-library.mjs', {
+    func,
+    glb,
+    SESSION_OBJ,
     SESSION_ID,
-    "xuda-api-library.mjs",
-    {
-      func,
-      glb,
-      SESSION_OBJ,
-      SESSION_ID,
-      APP_OBJ,
-      dsSession: dsSessionP,
-      job_id,
-    }
-  );
+    APP_OBJ,
+    dsSession: dsSessionP,
+    job_id,
+  });
 
   const xu = api_utils;
 
-  if (
-    typeof IS_PROCESS_SERVER === "undefined" &&
-    typeof IS_DOCKER === "undefined"
-  ) {
+  if (typeof IS_PROCESS_SERVER === 'undefined' && typeof IS_DOCKER === 'undefined') {
     try {
       return eval(val);
     } catch (err) {
@@ -11304,39 +11162,19 @@ func.expression.secure_eval = async function (
     }
   }
   // server side execution
-  if (sourceP === "javascript") {
-    process.on("uncaughtException", (err) => {
-      console.error("Asynchronous error caught.", err);
+  if (sourceP === 'javascript') {
+    process.on('uncaughtException', (err) => {
+      console.error('Asynchronous error caught.', err);
 
       func.events.delete_job(SESSION_ID, job_id);
-      if (
-        typeof IS_PROCESS_SERVER !== "undefined" ||
-        typeof IS_DOCKER !== "undefined"
-      ) {
+      if (typeof IS_PROCESS_SERVER !== 'undefined' || typeof IS_DOCKER !== 'undefined') {
         if (SESSION_OBJ[SESSION_ID].crawler) return;
-        return __.rpi.write_log(
-          SESSION_OBJ[SESSION_ID].app_id,
-          "error",
-          "worker",
-          "vm error",
-          err,
-          null,
-          val,
-          "func.expression.get.secure_eval"
-        );
+        return __.rpi.write_log(SESSION_OBJ[SESSION_ID].app_id, 'error', 'worker', 'vm error', err, null, val, 'func.expression.get.secure_eval');
       }
     });
     try {
-      const dir = path.join(
-        _conf.studio_drive_path,
-        SESSION_OBJ[SESSION_ID].app_id,
-        "node_modules",
-        "/"
-      );
-      const script = new VM.VMScript(
-        `try{${val}}catch(e){func.api.error(SESSION_ID, "nodejs error", e); console.error(e); func.events.delete_job(SESSION_ID, job_id);}`,
-        { filename: dir, dirname: dir }
-      );
+      const dir = path.join(_conf.studio_drive_path, SESSION_OBJ[SESSION_ID].app_id, 'node_modules', '/');
+      const script = new VM.VMScript(`try{${val}}catch(e){func.api.error(SESSION_ID, "nodejs error", e); console.error(e); func.events.delete_job(SESSION_ID, job_id);}`, { filename: dir, dirname: dir });
       let vm = new VM.NodeVM({
         require: {
           external: true,
@@ -11359,11 +11197,11 @@ func.expression.secure_eval = async function (
         dirname: dir,
       });
     } catch (err) {
-      console.error("Failed to execute script.", err);
+      console.error('Failed to execute script.', err);
 
-      if (typeof IS_PROCESS_SERVER !== "undefined") {
+      if (typeof IS_PROCESS_SERVER !== 'undefined') {
         func.events.delete_job(SESSION_ID, jobNo);
-        return __.db.add_error_log(SESSION_OBJ[SESSION_ID].app_id, "api", err);
+        return __.db.add_error_log(SESSION_OBJ[SESSION_ID].app_id, 'api', err);
       }
     }
   } else {
@@ -11382,12 +11220,12 @@ func.expression.secure_eval = async function (
           allowAsync: false,
         });
         let ret = val;
-        if (typeof val === "string") {
+        if (typeof val === 'string') {
           ret = await vm.run(val);
         }
         return ret;
       } catch (err) {
-        throw "";
+        throw '';
       }
     } catch (err) {
       try {
@@ -12872,6 +12710,10 @@ func.UI.screen.execute_xu_functions = async function (SESSION_ID, is_skeleton, $
       const trigger = val.key.split('xu-on:')[1].toLowerCase();
       $elm.on(trigger, async function (evt) {
         for await (const [key, val] of Object.entries($elm.data().xuAttributes['xu-on:' + evt.type])) {
+          if (val.event_modifiers && evt[val.event_modifiers]) {
+            evt[val.event_modifiers]();
+          }
+
           if (val.handler === 'custom') {
             // do BL
             for await (const [key2, val2] of Object.entries(val.event)) {
@@ -12882,10 +12724,6 @@ func.UI.screen.execute_xu_functions = async function (SESSION_ID, is_skeleton, $
               }
               if (!cond) continue;
 
-              if (val.event_modifiers && evt[val.event_modifiers]) {
-                evt[val.event_modifiers]();
-              }
-
               func.events.add_to_queue(SESSION_ID, 'element event', val2.id, evt.type, val2.data.action, val2.data.name, null, $elm.attr('xu-ui-id'), null, evt, null, null, null, paramsP.dsSessionP, null, null, null, evt.type, val2.data.name, null, null, val2, null, null, null, null, null, null);
             }
           }