@xuda.io/xuda-worker-bundle-min 1.3.2449 → 1.3.2451

package/index.js

@@ -5126,56 +5126,149 @@ func.datasource.get_viewFields_for_update_function = function (SESSION_ID, calli
   if (!exp) {
     return viewFields;
   }
-  try {
-    // parse json
-    var json = JSON5.parse(exp.replace(/\n/gi, ''));
-    for (const [key, val] of Object.entries(json)) {
-      let id = key.substr(1, key.length - 1);
-      if (!id) continue;
-      viewFields.push({
-        val,
-        id,
-      });
+  const trim_wrapping_braces = function (value) {
+    const trimmed = value.trim();
+    if (trimmed.startsWith('{') && trimmed.endsWith('}')) {
+      return trimmed.substring(1, trimmed.length - 1);
+    }
+    return trimmed;
+  };
+  const strip_wrapping_quotes = function (value) {
+    const trimmed = value.trim();
+    const first = trimmed.substring(0, 1);
+    const last = trimmed.substring(trimmed.length - 1);
+    if ((first === "'" || first === '"' || first === '`') && last === first) {
+      return trimmed.substring(1, trimmed.length - 1);
+    }
+    return trimmed;
+  };
+  const split_top_level = function (value) {
+    const parts = [];
+    let current = '';
+    let quote = null;
+    let escape = false;
+    let paren_depth = 0;
+    let bracket_depth = 0;
+    let brace_depth = 0;
+
+    for (let index = 0; index < value.length; index++) {
+      const char = value[index];
+
+      if (escape) {
+        current += char;
+        escape = false;
+        continue;
+      }
+
+      if (quote) {
+        current += char;
+        if (char === '\\') {
+          escape = true;
+        } else if (char === quote) {
+          quote = null;
+        }
+        continue;
+      }
+
+      if (char === "'" || char === '"' || char === '`') {
+        quote = char;
+        current += char;
+        continue;
+      }
+
+      if (char === '(') paren_depth++;
+      if (char === ')') paren_depth = Math.max(0, paren_depth - 1);
+      if (char === '[') bracket_depth++;
+      if (char === ']') bracket_depth = Math.max(0, bracket_depth - 1);
+      if (char === '{') brace_depth++;
+      if (char === '}') brace_depth = Math.max(0, brace_depth - 1);
+
+      if ((char === ',' || char === ';') && !paren_depth && !bracket_depth && !brace_depth) {
+        if (current.trim()) {
+          parts.push(current.trim());
+        }
+        current = '';
+        continue;
+      }
+
+      current += char;
     }
-    return viewFields;
-  } catch (e) {
-    if (!exp) {
-      return;
+
+    if (current.trim()) {
+      parts.push(current.trim());
     }
-    if (exp.substr(exp.length - 1, 1) === ';') exp = exp.substr(0, exp.length - 1); // remove closing if exist;
-    var exp_arr = exp.split(/;\s*(?=(?:[^"]|"[^"]*")*$)/g); // split ; outside quotes
-    if (exp_arr?.length) {
-      for (let val of exp_arr) {
-        // run view fields
-        var pos = val.indexOf(':');
-        var seg = [val.substring(0, pos), val.substring(pos + 1)];
-        if (seg && seg.length === 2) {
-          let id = seg[0].substr(1, seg[0].length);
-          if (!id) continue;
-          viewFields.push({
-            id,
-            val: seg[1],
-            //  , props: {},
-          });
-        } else {
-          func.utils.debug.log(SESSION_ID, _ds.prog_id, {
-            module: _ds.viewModule,
-            action: 'set',
-            prop: 'parse update exp',
-            details: exp,
-            result: '',
-            error: 'Invalid json; too many segments',
-            source: _ds.viewSourceDesc,
-            json: '',
-            fields: '',
-            dsSession: dsSessionP,
-          });
+
+    return parts;
+  };
+  const find_top_level_colon = function (value) {
+    let quote = null;
+    let escape = false;
+    let paren_depth = 0;
+    let bracket_depth = 0;
+    let brace_depth = 0;
+
+    for (let index = 0; index < value.length; index++) {
+      const char = value[index];
+
+      if (escape) {
+        escape = false;
+        continue;
+      }
+
+      if (quote) {
+        if (char === '\\') {
+          escape = true;
+        } else if (char === quote) {
+          quote = null;
         }
+        continue;
+      }
+
+      if (char === "'" || char === '"' || char === '`') {
+        quote = char;
+        continue;
+      }
+
+      if (char === '(') paren_depth++;
+      if (char === ')') paren_depth = Math.max(0, paren_depth - 1);
+      if (char === '[') bracket_depth++;
+      if (char === ']') bracket_depth = Math.max(0, bracket_depth - 1);
+      if (char === '{') brace_depth++;
+      if (char === '}') brace_depth = Math.max(0, brace_depth - 1);
+
+      if (char === ':' && !paren_depth && !bracket_depth && !brace_depth) {
+        return index;
       }
     }
 
-    return viewFields;
+    return -1;
+  };
+
+  exp = trim_wrapping_braces(exp.replace(/\n/gi, ''));
+  const exp_arr = split_top_level(exp);
+  for (let index = 0; index < exp_arr.length; index++) {
+    const segment = exp_arr[index];
+    const pos = find_top_level_colon(segment);
+    if (pos === -1) {
+      continue;
+    }
+
+    let id = strip_wrapping_quotes(segment.substring(0, pos));
+    const val = segment.substring(pos + 1).trim();
+    if (id.substring(0, 1) === '@') {
+      id = id.substring(1);
+    }
+    if (!id || !val) {
+      continue;
+    }
+
+    viewFields.push({
+      id,
+      val,
+    });
   }
+
+  return viewFields;
 };
 func.datasource.get_value = async function (SESSION_ID, fieldIdP, dsSessionP, rowIdP, org_dsSessionP) {
   const return_value = async (field_id, value) => {

package/package.json

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