@xuda.io/xuda-worker-bundle-min 1.3.244 → 1.3.246

package/index.js

@@ -2766,13 +2766,7 @@ func.datasource.get_field_init_count = async function (
             func.utils.debug_report(
               SESSION_ID,
               "_ds.get_field_init_count",
-              "Error initiating event for field:" +
-                fieldId +
-                " prog:" +
-                _ds.v.viewSourceDesc +
-                " row:" +
-                rowIdP +
-                " reason:missing action",
+              `Error initiating event for field: ${fieldId} prog: ${_ds.v.viewSourceDesc} row: ${rowIdP} reason: missing action`,
               "E"
             );
             break;
@@ -2896,11 +2890,7 @@ func.datasource.get_view_events_count = async function (
         func.utils.debug_report(
           SESSION_ID,
           "get_view_events_count",
-          "Error initiating " +
-            typeP +
-            " prog:" +
-            _ds.v.viewSourceDesc +
-            " reason:missing action",
+          `Error initiating ${typeP} prog:${_ds.v.viewSourceDesc} reason: missing action`,
           "E"
         );
         break;
@@ -2912,11 +2902,7 @@ func.datasource.get_view_events_count = async function (
         func.utils.debug_report(
           SESSION_ID,
           "get_view_events_count",
-          "Error initiating " +
-            typeP +
-            " prog:" +
-            _ds.v.viewSourceDesc +
-            " reason:missing reference",
+          `Error initiating ${typeP} prog: ${_ds.v.viewSourceDesc} reason: missing reference`,
           "E"
         );
         break;
@@ -3907,8 +3893,8 @@ func.datasource.reset_jobs = function (SESSION_ID, dsSessionP, sourceP, errP) {
   func.utils.debug_report(
     SESSION_ID,
     sourceP + "Missing datasource: " + dsSessionP,
-    "W",
     errP,
+    "W",
     null
   );
 };
@@ -7910,7 +7896,7 @@ func.events.execute = async function (
         func.utils.debug_report(
           SESSION_ID,
           "func.events.execute",
-          elementP + ">" + triggerP + ">" + functionP + ">" + "prog missing",
+          `${elementP} > ${triggerP} > ${functionP} > program ${prog} is missing`,
           "E"
         );
         func.events.delete_job(SESSION_ID, jobNoP);
@@ -8107,7 +8093,7 @@ func.events.execute = async function (
         func.utils.debug_report(
           SESSION_ID,
           "func.events.execute",
-          elementP + ">" + triggerP + ">" + functionP + ">" + "program missing",
+          `${elementP} > ${triggerP} > ${functionP} > program is missing`,
           "E"
         );
         func.events.delete_job(SESSION_ID, jobNoP);
@@ -8120,13 +8106,7 @@ func.events.execute = async function (
         func.utils.debug_report(
           SESSION_ID,
           "func.events.execute",
-          elementP +
-            ">" +
-            triggerP +
-            ">" +
-            functionP +
-            ">" +
-            "Output field missing",
+          `${elementP} >${triggerP} >${functionP} > Output field is missing`,
           "E"
         );
         func.events.delete_job(SESSION_ID, jobNoP);
@@ -8645,11 +8625,9 @@ func.expression.get = async function (
           }
           if (val.fieldId && val.value && typeof val.value === "string") {
             if (
-              sourceP === "query" ||
-              sourceP === "condition" ||
-              sourceP === "range" ||
-              sourceP === "sort" ||
-              sourceP === "locate"
+              ["query", "condition", "range", "sort", "locate"].includes(
+                sourceP
+              )
             ) {
               if (val.value.indexOf("↵") > -1) {
                 res[key] = val.value.split("↵").join("");
@@ -8657,11 +8635,7 @@ func.expression.get = async function (
               res[key] = res[key].replace(/(\r\n|\n|\r)/gm, ""); //.replace(/"/g,'\"');//.replace(/'/g,"");
             }
 
-            if (
-              sourceP === "init" ||
-              sourceP === "update" ||
-              sourceP === "virtual"
-            ) {
+            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");
@@ -8784,440 +8758,6 @@ func.expression.get = async function (
   return new_class.get();
 };
 
-// func.expression.get = async function (
-//   SESSION_ID,
-//   valP,
-//   dsSessionP,
-//   sourceP,
-//   rowIdP,
-//   sourceActionP,
-//   secondPassP,
-//   calling_fieldIdP,
-//   fieldsP,
-//   debug_infoP,
-//   iterate_info,
-//   js_script_callback,
-//   jobNo
-// ) {
-//   var ret;
-//   var fields = {};
-//   var error;
-//   var warning;
-
-//   function evalJson(text) {
-//     return eval("(" + text + ")");
-//   }
-
-//   if (valP === null) {
-//     ret = "";
-//   } else {
-//     switch (typeof valP) {
-//       case "string":
-//         ret = valP;
-//         break;
-
-//       case "undefined":
-//         ret = "";
-//         break;
-
-//       case "boolean":
-//         ret = valP ? "Y" : "N";
-//         break;
-
-//       default:
-//         ret = valP.toString();
-//         break;
-//     }
-//   }
-
-//   ret = ret.replace(/\&/g, "&");
-//   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, ""));
-//       }
-//       return ret;
-//     };
-//     if (sourceP === "update" || sourceP === "javascript") {
-//       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,
-//           }
-//         );
-//       }
-//     };
-//     if (error) log_error();
-//     // if (error || warning) log_error();
-//     return {
-//       result: ret,
-//       fields: fields,
-//       res: res,
-//       explain: result,
-//       error: error,
-//       warning: warning,
-//       req: valP,
-//       var_error_found: var_error_found,
-//     };
-//   };
-//   const variable_not_exist = async function () {
-//     try {
-//       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;
-//         } else {
-//           // ret = secure_eval(ret); //eval(ret);
-//           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, "");
-//         return end_results();
-//       }
-//     } catch (err) {
-//       // console.error(err);
-//       return end_results();
-//     }
-//   };
-//   if (!func.expression.validate_variables(valP)) {
-//     return await variable_not_exist();
-//   }
-//   var split = [];
-//   var var_Arr = [];
-//   split = func.expression.parse(ret);
-//   for await (const [arr_key, val] of Object.entries(split)) {
-//     // run each field
-//     const key = Number(arr_key);
-//     var_Arr[key] = {};
-//     var_Arr[key].value = val.value;
-//     //--------------
-//     const replace_value_in_string = function (retP, fieldIdP) {
-//       if (
-//         iterate_info?.iterator_key === fieldIdP ||
-//         iterate_info?.iterator_val === fieldIdP
-//       ) {
-//         if (iterate_info.iterator_key === fieldIdP) {
-//           retP.value = iterate_info._key;
-//         }
-//         if (iterate_info.iterator_val === fieldIdP) {
-//           retP.value = iterate_info._val;
-//         }
-//       }
-
-//       const set_value = function (valP) {
-//         if (typeof valP !== "undefined") {
-//           var_Arr[key].value = valP;
-//           if (typeof valP === "string") var_Arr[key].type = "string";
-//         } else {
-//           if (retP.type === "object") {
-//             var_Arr[key].value = "";
-//             var_Arr[key].type = "string";
-//           }
-//         }
-//       };
-
-//       if (sourceP === "exp" && retP.type !== "exp") {
-//         var_Arr[key].type = retP.type;
-//         return;
-//       }
-//       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)) {
-//           //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;
-//           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) === "@"
-//           ) {
-//             //check situation 2
-//             var prevData = var_Arr[key - 1].value;
-//             var_Arr[key].value = prevData[data]; //  @objB[@var]
-//             if (val.value.indexOf(".") > -1) {
-//               property2 = 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 = func.expression.get_property(val.value).property1;
-//             property2 = func.expression.get_property(val.value).property2;
-//             if (property1) {
-//               var_Arr[key].value = data[property1]; // @var["value"] or @var.property
-//               if (property2) {
-//                 if (data[property1]) set_value(data[property1][property2]);
-//               }
-//             }
-//             if (property2 && !property1) {
-//               if (
-//                 data //data[property2]
-//               ) {
-//                 set_value(data[property2]);
-//               }
-//             }
-//           }
-//           fields[fieldIdP] = var_Arr[key].value; // added 051017 to allow @SYS_GLOBAL_OBJ_WIDGET_INFO.doc_id
-//           var_Arr[key].fieldId = fieldIdP;
-//         } else {
-//           fields[fieldIdP] = var_Arr[key].value; // update flat no warpers
-//           var_Arr[key].fieldId = fieldIdP;
-//         }
-//       }
-//     };
-//     //>>>>>>>>>>>>>>>>>>
-//     //>>>> start here >>
-//     //>>>>>>>>>>>>>>>>>>
-//     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.length === 5) val.fieldId = calling_fieldIdP;
-//         else
-//           val.fieldId =
-//             calling_fieldIdP + val.fieldId(5, val.fieldId.length - 1);
-//       }
-//       if (!sourceP === "exp") {
-//         var_Arr[key].value = '""';
-//       } // put default
-//       fields[val.fieldId] = var_Arr[key].value;
-
-//       const ret = await func.datasource.get_value(
-//         SESSION_ID,
-//         val.fieldId,
-//         dsSessionP,
-
-//         rowIdP
-//       ); // find field in dataSources
-
-//       replace_value_in_string(ret.ret, ret.fieldIdP);
-//     }
-//   }
-//   try {
-//     // eval the expression
-//     var res = [];
-//     var exp_exist;
-//     var var_error_found;
-//     // merge arr values
-//     _.forEach(var_Arr, function (val, key) {
-//       if (sourceP === "UI Property EXP") {
-//         let ret = func.utils.get_drive_url(SESSION_ID, val.value, true);
-//         if (ret.changed) {
-//           res[key] = ret.value;
-//           return 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") {
-//         exp_exist = true;
-//       }
-//       res[key] = val.value;
-//       if (
-//         sourceP !== "DbQuery" &&
-//         sourceP !== "alert" &&
-//         sourceP !== "exp" &&
-//         sourceP !== "api_rendered_output" &&
-//         (val.type === "string" || val.type === "date" || val.type === "time") &&
-//         var_Arr.length > 1
-//       ) {
-//         res[key] = "`" + val.value + "`"; //res[key] = "'" + val.value + "'"; //
-//       }
-//       if (val.fieldId && val.value && typeof val.value === "string") {
-//         if (
-//           sourceP === "query" ||
-//           sourceP === "condition" ||
-//           sourceP === "range" ||
-//           sourceP === "sort" ||
-//           sourceP === "locate"
-//         ) {
-//           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,"");
-//         }
-
-//         if (
-//           sourceP === "init" ||
-//           sourceP === "update" ||
-//           sourceP === "virtual"
-//         ) {
-//           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>");
-//         }
-
-//         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(".")
-//         ) {
-//           // prevent cast on single value expression
-//           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;
-//         var_error_found = true;
-//         res[key] = 0;
-//       }
-//     });
-//     var join = function (arrP) {
-//       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.res) res = exp.res;
-//       // do second pass when exp exist
-//       else res = [exp.result];
-//       fields = _.assignIn(exp.fields, fieldsP);
-//     }
-//     var result = join(res); //res.join("");
-
-//     if (res.length === 1) {
-//       // bypass join for single value expression
-//       result = res[0];
-//     }
-
-//     if (secondPassP) {
-//       ret = result;
-//     } else if (sourceP !== "exp") {
-//       // no eval for second pass
-//       // return single value
-//       if (
-//         res.length === 1 &&
-//         typeof res[0] === "string" &&
-//         typeof res[0] !== "object"
-//       ) {
-//         // avoid eval when query leading zeros problem
-//         ret = join(res); // res.join("");
-//         if (ret && ret.substr(0, 1) === "@") {
-//           error = "Error encoding @ var";
-//           var_error_found = true;
-//         }
-//       } else {
-//         if (
-//           sourceP !== "arguments" &&
-//           sourceP !== "alert" &&
-//           sourceP !== "api_rendered_output" &&
-//           sourceP !== "DbQuery"
-//         ) {
-//           // ret = secure_eval(result); // eval(result);
-//           ret = await func.expression.secure_eval(
-//             SESSION_ID,
-//             sourceP,
-//             result,
-//             jobNo,
-//             dsSessionP,
-//             js_script_callback
-//           );
-//         } else {
-//           if (sourceP === "DbQuery") {
-//             ret = JSON.stringify(evalJson(result));
-//           } else {
-//             // try eval
-//             ret = result;
-//           }
-//         }
-//       }
-//     }
-//     // console.log("AAAA")
-//     return end_results();
-//   } catch (err) {
-//     ret = result; // skip eval on error
-//     error = err.message;
-
-//     return end_results();
-//   }
-//   // }
-//   // else {
-//   //   return variable_not_exist();
-//   //   //===========================
-//   //   // variable not exist
-//   // }
-//   // >>>> return results <<<<<<<<<
-// };
 func.expression.parse = function (strP) {
   var extract_str = function (strP, posP) {
     if (!posP) posP = 0;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xuda.io/xuda-worker-bundle-min",
-  "version": "1.3.244",
+  "version": "1.3.246",
   "description": "xuda framework min",
   "main": "index.js",
   "scripts": {