@xuda.io/runtime-bundle 1.0.481 → 1.0.482

package/js/xuda-runtime-bundle.js

@@ -35248,102 +35248,102 @@ func.expression.get = async function (SESSION_ID, valP, dsSessionP, sourceP, row
   return new_class.get();
 };
 
-// func.expression.parse = function (strP) {
-//   var extract_str = function (strP, posP) {
-//     if (!posP) posP = 0;
-//     var clean_split_str = function (arrP) {
-//       var arr = [];
-//       if (arrP && arrP.length > 1 && arrP[0] === '' && arrP[1].indexOf('@') > -1) {
-//         for (var i = 1; i <= arrP.length; i++) {
-//           arr.push(arrP[i]);
-//         }
-//         return arr;
-//       } else return arrP;
-//     };
-//     var nonLettersPatt = /\W/; // non letters
-//     var validSymbolsNoArray = /[^.@\[]/; //valid symbols no array /[^.@\[\]\]]/
-//     var validSymbolsWithArray = /[^.@"'\[\]]/; //valid symbols with array
-//     var validSymbols = validSymbolsNoArray;
-//     var splitTmp = strP.replace(/@/g, '^^@').split('^^');
-//     var split = clean_split_str(splitTmp);
-//     var obj = [];
-//     if (split) {
-//       for (let val of split) {
-//         // run on @ segments
-//         if (val) {
-//           var pos = strP.indexOf(val);
-//           if (val && val.substr(0, 1) === '@') {
-//             var tmpStr = '';
-//             var word_start_pos = undefined;
-//             var word_end_pos = undefined;
-//             // run on @ segment string
-//             for (var i = 0; i <= val.length; i++) {
-//               var key1 = i;
-//               var val1 = val.substr(i, 1);
-//               if (
-//                 val1 === '.' &&
-//                 !word_start_pos // find first dot
-//               )
-//                 word_start_pos = key1;
-//               if (
-//                 word_start_pos &&
-//                 key1 > word_start_pos &&
-//                 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) {
-//                 // find 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);
-//                 // }
-//                 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;
-//               } else tmpStr += val1;
-//             }
-//             //                        });
-//             if (tmpStr.indexOf('^^') > -1) {
-//               var obj1 = extract_str(tmpStr, pos);
-//               obj = obj.concat(obj1);
-//             } else {
-//               // push clean @var
-//               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);
-//               }
-//               obj.push({
-//                 value: val,
-//                 fieldId: fieldId,
-//                 pos: pos + posP,
-//               });
-//             }
-//           } else {
-//             obj.push({
-//               value: val,
-//               pos: pos + posP,
-//             });
-//           }
-//         }
-//       }
-//       return obj;
-//     }
-//   };
-//   var res = extract_str(strP);
-//   return res;
-// };
+func.expression.parse_org = function (strP) {
+  var extract_str = function (strP, posP) {
+    if (!posP) posP = 0;
+    var clean_split_str = function (arrP) {
+      var arr = [];
+      if (arrP && arrP.length > 1 && arrP[0] === '' && arrP[1].indexOf('@') > -1) {
+        for (var i = 1; i <= arrP.length; i++) {
+          arr.push(arrP[i]);
+        }
+        return arr;
+      } else return arrP;
+    };
+    var nonLettersPatt = /\W/; // non letters
+    var validSymbolsNoArray = /[^.@\[]/; //valid symbols no array /[^.@\[\]\]]/
+    var validSymbolsWithArray = /[^.@"'\[\]]/; //valid symbols with array
+    var validSymbols = validSymbolsNoArray;
+    var splitTmp = strP.replace(/@/g, '^^@').split('^^');
+    var split = clean_split_str(splitTmp);
+    var obj = [];
+    if (split) {
+      for (let val of split) {
+        // run on @ segments
+        if (val) {
+          var pos = strP.indexOf(val);
+          if (val && val.substr(0, 1) === '@') {
+            var tmpStr = '';
+            var word_start_pos = undefined;
+            var word_end_pos = undefined;
+            // run on @ segment string
+            for (var i = 0; i <= val.length; i++) {
+              var key1 = i;
+              var val1 = val.substr(i, 1);
+              if (
+                val1 === '.' &&
+                !word_start_pos // find first dot
+              )
+                word_start_pos = key1;
+              if (
+                word_start_pos &&
+                key1 > word_start_pos &&
+                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) {
+                // find 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);
+                // }
+                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;
+              } else tmpStr += val1;
+            }
+            //                        });
+            if (tmpStr.indexOf('^^') > -1) {
+              var obj1 = extract_str(tmpStr, pos);
+              obj = obj.concat(obj1);
+            } else {
+              // push clean @var
+              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);
+              }
+              obj.push({
+                value: val,
+                fieldId: fieldId,
+                pos: pos + posP,
+              });
+            }
+          } else {
+            obj.push({
+              value: val,
+              pos: pos + posP,
+            });
+          }
+        }
+      }
+      return obj;
+    }
+  };
+  var res = extract_str(strP);
+  return res;
+};
 
-func.expression.parse = function (strP) {
+func.expression.parse_bad = function (strP) {
   const nonLettersPatt = /\W/;
   const validSymbolsNoArray = /[^.@\[]/;
   const validSymbolsWithArray = /[^.@"'\[\]]/;
@@ -35401,6 +35401,61 @@ func.expression.parse = function (strP) {
   return extractStr(strP);
 };
 
+func.expression.parse = function (input) {
+  if (typeof input !== 'string') return [];
+
+  const segments = [];
+  let pos = 0;
+
+  const parts = input.split(/(@)/).filter(Boolean);
+
+  for (let i = 0; i < parts.length; i++) {
+    const part = parts[i];
+
+    if (part === '@' && i + 1 < parts.length) {
+      const nextPart = parts[i + 1];
+      const varEnd = nextPart.search(/[.\[]/); // Split at first . or [
+      let fieldId, remainder;
+
+      if (varEnd > 0) {
+        fieldId = nextPart.slice(0, varEnd);
+        remainder = nextPart.slice(varEnd);
+      } else {
+        fieldId = nextPart;
+        remainder = '';
+      }
+
+      // Add @variable segment
+      const fullVarValue = `@${fieldId}`;
+      segments.push({
+        value: fullVarValue,
+        fieldId,
+        pos,
+      });
+      pos += fullVarValue.length;
+
+      // Add remainder as a separate segment, if any
+      if (remainder) {
+        segments.push({
+          value: remainder,
+          pos,
+        });
+        pos += remainder.length;
+      }
+
+      i++; // Skip the next part since we consumed it
+    } else if (part !== '@') {
+      segments.push({
+        value: part,
+        pos,
+      });
+      pos += part.length;
+    }
+  }
+
+  return segments;
+};
+
 func.expression.get_property = async function (valP) {
   async function secure_eval(val) {
     if (typeof IS_PROCESS_SERVER === 'undefined') {