@xuda.io/runtime-bundle 1.0.480 → 1.0.481

package/js/xuda-runtime-slim.js

@@ -3320,7 +3320,7 @@ func.datasource.create = async function (
           }
         }
 
-        var datasource_changes = {
+        const datasource_changes = {
           [dsSessionP]: {
             ['datasource_main']: {
               stat: 'idle',
@@ -9097,15 +9097,6 @@ func.UI.update_xu_ref = function (SESSION_ID, dsSessionP, ref_field_id, $elm) {
   SYS_GLOBAL_OBJ_REFS[ref_field_id].props = _ds.in_parameters || {};
 
   if ($elm) {
-    // const get_attributes = function (retry = 0) {
-    //   if (retry > 500) return;
-    //   $elm?.data()?.xuPanelWrapper?.panelXuAttributes ||
-    //     $elm?.data()?.xuData?.debug_info?.attribute_stat ||
-    //     setTimeout(() => {
-    //       get_attributes(retry + 1);
-    //     }, 500);
-    // };
-
     const attributes = $elm?.data()?.xuData?.xuPanelProps || $elm?.data()?.xuData?.debug_info?.attribute_stat || {};
     SYS_GLOBAL_OBJ_REFS[ref_field_id].attributes = attributes;
     SYS_GLOBAL_OBJ_REFS[ref_field_id].xu_ui_id = $elm.attr('xu-ui-id');
@@ -10825,99 +10816,157 @@ 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 = 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,
-            });
+  const nonLettersPatt = /\W/;
+  const validSymbolsNoArray = /[^.@\[]/;
+  const validSymbolsWithArray = /[^.@"'\[\]]/;
+
+  function extractStr(str, startPos = 0) {
+    const cleanSplit = (arr) => (arr?.length > 1 && arr[0] === '' && arr[1].includes('@') ? arr.slice(1) : arr);
+
+    const segments = cleanSplit(str.replace(/@/g, '^^@').split('^^'));
+    const result = [];
+
+    for (const val of segments || []) {
+      if (!val) continue;
+      const pos = str.indexOf(val) + startPos;
+
+      if (val.startsWith('@')) {
+        let tmpStr = '';
+        let wordStart = null;
+        let wordEnd = null;
+        let validSymbols = validSymbolsNoArray;
+
+        for (let i = 0; i < val.length; i++) {
+          const char = val[i];
+
+          if (char === '[') validSymbols = validSymbolsWithArray;
+          if (char === '.' && wordStart === null) wordStart = i;
+          else if (wordStart !== null && nonLettersPatt.test(char)) wordEnd = i;
+
+          if (wordStart !== null && wordEnd !== null) {
+            const word = val.slice(wordStart + 1, wordEnd);
+            tmpStr = tmpStr.slice(0, wordStart) + '^^' + tmpStr.slice(wordStart, wordEnd);
+            wordStart = char === '.' ? wordEnd : null;
+            wordEnd = null;
           }
+
+          tmpStr += nonLettersPatt.test(char) && validSymbols.test(char) && !tmpStr.includes('^^') ? '^^' + char : char;
         }
+
+        if (tmpStr.includes('^^')) {
+          result.push(...extractStr(tmpStr, pos));
+        } else {
+          const fieldIdMatch = val.match(/^@([^.\[]+)/);
+          result.push({
+            value: val,
+            fieldId: fieldIdMatch ? fieldIdMatch[1] : undefined,
+            pos,
+          });
+        }
+      } else {
+        result.push({ value: val, pos });
       }
-      return obj;
     }
-  };
-  var res = extract_str(strP);
-  return res;
+    return result;
+  }
+
+  return extractStr(strP);
 };
 
 func.expression.get_property = async function (valP) {
@@ -11893,31 +11942,32 @@ func.UI.screen.refresh_screen_old = async function (SESSION_ID, fields_changed_a
   }
 };
 
-const get_params_obj = async function (SESSION_ID, prog_id, parameters_obj_inP) {
-  const _prog = await func.utils.VIEWS_OBJ.get(SESSION_ID, prog_id);
-  if (!_prog) {
-    return;
-  }
+// const get_params_obj = async function (SESSION_ID, prog_id, parameters_obj_inP) {
+//   const _prog = await func.utils.VIEWS_OBJ.get(SESSION_ID, prog_id);
+//   if (!_prog) {
+//     return;
+//   }
+
+//   // get in parameters
+//   var params_obj = {};
+//   if (_prog?.properties?.progParams) {
+//     for await (const [key, val] of Object.entries(_prog.properties.progParams)) {
+//       if (!val.data.dir === 'in') continue;
+//       if (typeof parameters_obj_inP?.[val.data.parameter] !== 'undefined') {
+//         if (parameters_obj_inP?.[val.data.parameter].fx) {
+//           let ret = await func.expression.get(SESSION_ID, parameters_obj_inP?.[val.data.parameter].fx, dsSession, 'parameters');
+//           params_obj[val.data.parameter] = ret.result;
+//         } else {
+//           params_obj[val.data.parameter] = parameters_obj_inP?.[val.data.parameter].value;
+//         }
+//         continue;
+//       }
+//       console.warn(`Warning: Program ${_prog.properties.menuName} expected In parameter: ${val.data.parameter} but received null instead`);
+//     }
+//   }
+//   return params_obj;
+// };
 
-  // get in parameters
-  var params_obj = {};
-  if (_prog?.properties?.progParams) {
-    for await (const [key, val] of Object.entries(_prog.properties.progParams)) {
-      if (!val.data.dir === 'in') continue;
-      if (typeof parameters_obj_inP?.[val.data.parameter] !== 'undefined') {
-        if (parameters_obj_inP?.[val.data.parameter].fx) {
-          let ret = await func.expression.get(SESSION_ID, parameters_obj_inP?.[val.data.parameter].fx, dsSession, 'parameters');
-          params_obj[val.data.parameter] = ret.result;
-        } else {
-          params_obj[val.data.parameter] = parameters_obj_inP?.[val.data.parameter].value;
-        }
-        continue;
-      }
-      console.warn(`Warning: Program ${_prog.properties.menuName} expected In parameter: ${val.data.parameter} but received null instead`);
-    }
-  }
-  return params_obj;
-};
 const get_params_obj_new = async function (SESSION_ID, prog_id, nodeP, dsSession) {
   const _prog = await func.utils.VIEWS_OBJ.get(SESSION_ID, prog_id);
   if (!_prog) return;

package/js/xuda-runtime-slim.min.es.js

@@ -3321,7 +3321,7 @@ func.datasource.create = async function (
           }
         }
 
-        var datasource_changes = {
+        const datasource_changes = {
           [dsSessionP]: {
             ['datasource_main']: {
               stat: 'idle',
@@ -9098,15 +9098,6 @@ func.UI.update_xu_ref = function (SESSION_ID, dsSessionP, ref_field_id, $elm) {
   SYS_GLOBAL_OBJ_REFS[ref_field_id].props = _ds.in_parameters || {};
 
   if ($elm) {
-    // const get_attributes = function (retry = 0) {
-    //   if (retry > 500) return;
-    //   $elm?.data()?.xuPanelWrapper?.panelXuAttributes ||
-    //     $elm?.data()?.xuData?.debug_info?.attribute_stat ||
-    //     setTimeout(() => {
-    //       get_attributes(retry + 1);
-    //     }, 500);
-    // };
-
     const attributes = $elm?.data()?.xuData?.xuPanelProps || $elm?.data()?.xuData?.debug_info?.attribute_stat || {};
     SYS_GLOBAL_OBJ_REFS[ref_field_id].attributes = attributes;
     SYS_GLOBAL_OBJ_REFS[ref_field_id].xu_ui_id = $elm.attr('xu-ui-id');
@@ -9966,31 +9957,32 @@ func.UI.screen.refresh_screen_old = async function (SESSION_ID, fields_changed_a
   }
 };
 
-const get_params_obj = async function (SESSION_ID, prog_id, parameters_obj_inP) {
-  const _prog = await func.utils.VIEWS_OBJ.get(SESSION_ID, prog_id);
-  if (!_prog) {
-    return;
-  }
+// const get_params_obj = async function (SESSION_ID, prog_id, parameters_obj_inP) {
+//   const _prog = await func.utils.VIEWS_OBJ.get(SESSION_ID, prog_id);
+//   if (!_prog) {
+//     return;
+//   }
+
+//   // get in parameters
+//   var params_obj = {};
+//   if (_prog?.properties?.progParams) {
+//     for await (const [key, val] of Object.entries(_prog.properties.progParams)) {
+//       if (!val.data.dir === 'in') continue;
+//       if (typeof parameters_obj_inP?.[val.data.parameter] !== 'undefined') {
+//         if (parameters_obj_inP?.[val.data.parameter].fx) {
+//           let ret = await func.expression.get(SESSION_ID, parameters_obj_inP?.[val.data.parameter].fx, dsSession, 'parameters');
+//           params_obj[val.data.parameter] = ret.result;
+//         } else {
+//           params_obj[val.data.parameter] = parameters_obj_inP?.[val.data.parameter].value;
+//         }
+//         continue;
+//       }
+//       console.warn(`Warning: Program ${_prog.properties.menuName} expected In parameter: ${val.data.parameter} but received null instead`);
+//     }
+//   }
+//   return params_obj;
+// };
 
-  // get in parameters
-  var params_obj = {};
-  if (_prog?.properties?.progParams) {
-    for await (const [key, val] of Object.entries(_prog.properties.progParams)) {
-      if (!val.data.dir === 'in') continue;
-      if (typeof parameters_obj_inP?.[val.data.parameter] !== 'undefined') {
-        if (parameters_obj_inP?.[val.data.parameter].fx) {
-          let ret = await func.expression.get(SESSION_ID, parameters_obj_inP?.[val.data.parameter].fx, dsSession, 'parameters');
-          params_obj[val.data.parameter] = ret.result;
-        } else {
-          params_obj[val.data.parameter] = parameters_obj_inP?.[val.data.parameter].value;
-        }
-        continue;
-      }
-      console.warn(`Warning: Program ${_prog.properties.menuName} expected In parameter: ${val.data.parameter} but received null instead`);
-    }
-  }
-  return params_obj;
-};
 const get_params_obj_new = async function (SESSION_ID, prog_id, nodeP, dsSession) {
   const _prog = await func.utils.VIEWS_OBJ.get(SESSION_ID, prog_id);
   if (!_prog) return;
@@ -14621,99 +14613,157 @@ 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 = 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,
-            });
+  const nonLettersPatt = /\W/;
+  const validSymbolsNoArray = /[^.@\[]/;
+  const validSymbolsWithArray = /[^.@"'\[\]]/;
+
+  function extractStr(str, startPos = 0) {
+    const cleanSplit = (arr) => (arr?.length > 1 && arr[0] === '' && arr[1].includes('@') ? arr.slice(1) : arr);
+
+    const segments = cleanSplit(str.replace(/@/g, '^^@').split('^^'));
+    const result = [];
+
+    for (const val of segments || []) {
+      if (!val) continue;
+      const pos = str.indexOf(val) + startPos;
+
+      if (val.startsWith('@')) {
+        let tmpStr = '';
+        let wordStart = null;
+        let wordEnd = null;
+        let validSymbols = validSymbolsNoArray;
+
+        for (let i = 0; i < val.length; i++) {
+          const char = val[i];
+
+          if (char === '[') validSymbols = validSymbolsWithArray;
+          if (char === '.' && wordStart === null) wordStart = i;
+          else if (wordStart !== null && nonLettersPatt.test(char)) wordEnd = i;
+
+          if (wordStart !== null && wordEnd !== null) {
+            const word = val.slice(wordStart + 1, wordEnd);
+            tmpStr = tmpStr.slice(0, wordStart) + '^^' + tmpStr.slice(wordStart, wordEnd);
+            wordStart = char === '.' ? wordEnd : null;
+            wordEnd = null;
           }
+
+          tmpStr += nonLettersPatt.test(char) && validSymbols.test(char) && !tmpStr.includes('^^') ? '^^' + char : char;
+        }
+
+        if (tmpStr.includes('^^')) {
+          result.push(...extractStr(tmpStr, pos));
+        } else {
+          const fieldIdMatch = val.match(/^@([^.\[]+)/);
+          result.push({
+            value: val,
+            fieldId: fieldIdMatch ? fieldIdMatch[1] : undefined,
+            pos,
+          });
         }
+      } else {
+        result.push({ value: val, pos });
       }
-      return obj;
     }
-  };
-  var res = extract_str(strP);
-  return res;
+    return result;
+  }
+
+  return extractStr(strP);
 };
 
 func.expression.get_property = async function (valP) {