@xuda.io/xuda-worker-bundle-min 1.3.1081 → 1.3.1083

package/index.js

@@ -2206,10 +2206,21 @@ func.datasource.execute = async function (
         prog_obj.scriptData.value,
         dataSourceSession,
         "api_rendered_output",
-        null
+        null, null, null, null, null, null, null, null, null, tree_obj.apiOutput
       );
+
+      let output_result = exp.result
+      if (tree_obj.apiOutput === "json") {
+        // iterate object to fix expressions
+        for await ([key, val] of Object.entries(output_result)) {
+          output_result[key] = (await func.expression.get(
+            SESSION_ID,
+            val,
+            dataSourceSession, "object_property")).result
+        }
+      }
       _ds.api_rendered_output +=
-        exp.result + (tree_obj.apiOutput === "json" ? "," : "");
+        output_result + (tree_obj.apiOutput === "json" ? "," : "");
     } else {
       _ds.api_rendered_output = ""; //empty
     }
@@ -2294,8 +2305,8 @@ func.datasource.execute = async function (
             SESSION_ID,
             "Data source",
             err.message +
-              " https://" +
-              prog_obj.progDataSource.dataSourceDataUrl,
+            " https://" +
+            prog_obj.progDataSource.dataSourceDataUrl,
             "E"
           );
           return null;
@@ -3848,7 +3859,7 @@ func.datasource.del = function (SESSION_ID, dsP) {
 
   const perform_delete = async function () {
     var response = {
-      success: function (jsonP, ajaxP) {},
+      success: function (jsonP, ajaxP) { },
       error: function (status) {
         console.error("error datasource:" + status);
       },
@@ -3914,8 +3925,8 @@ func.datasource.del = function (SESSION_ID, dsP) {
     if (SESSION_OBJ[SESSION_ID].DS_GLB[dsP]) {
       delete SCREEN_BLOCKER_OBJ[
         SESSION_OBJ[SESSION_ID].DS_GLB[dsP].screenId +
-          "_" +
-          SESSION_OBJ[SESSION_ID].DS_GLB[dsP].callingScreenId
+        "_" +
+        SESSION_OBJ[SESSION_ID].DS_GLB[dsP].callingScreenId
       ];
 
       delete_pending_jobs();
@@ -4576,7 +4587,7 @@ func.datasource.get_value = async function (
         _ds.data_feed.rows[row_idx][_field_id]
       );
     }
-  } catch (error) {}
+  } catch (error) { }
 
   if (typeof _ds?.dynamic_fields?.[_field_id] !== "undefined") {
     return await return_dynamic_value(_field_id, _ds.dynamic_fields[_field_id]);
@@ -9227,7 +9238,8 @@ func.expression.get = async function (
   debug_infoP,
   iterate_info,
   js_script_callback,
-  jobNo
+  jobNo,
+  api_output_type
 ) {
   class xu_class {
     async get() {
@@ -9520,24 +9532,24 @@ func.expression.get = async function (
             exp_exist = true;
           }
           res[key] = val.value;
-          if (
-            !["DbQuery", "alert", "exp", "api_rendered_output"].includes(
-              sourceP
-            ) &&
-            ["string", "date"].includes(val.type) &&
-            var_Arr.length > 1
-          ) {
-            res[key] = "`" + val.value + "`";
-          }
-          // new Dec 18 2024 for Ishai
-          if (
-            ["api_rendered_output"].includes(sourceP) &&
-            ["string", "date"].includes(val.type) &&
-            var_Arr.length > 1
-          ) {
-            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)
+            ) {
+              res[key] = `"` + val.value + `"`;
+            }
+          }
           if (val.fieldId && val.value && typeof val.value === "string") {
             if (
               ["query", "condition", "range", "sort", "locate"].includes(
@@ -9566,7 +9578,7 @@ func.expression.get = async function (
           if (typeof val.value === "object" && var_Arr.length > 1) {
             if (
               !Array.isArray(val.value) &&
-              !var_Arr[key + 1].value?.includes(".")
+              !var_Arr[key + 1].value?.includes(".") && !["api_rendered_output"].includes(sourceP)
             ) {
               // prevent cast on single value expression
               res[key] = "(" + JSON.stringify(val.value) + ")";

package/package.json

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