amis-formula 1.3.2 → 1.3.3

package/dist/index.js

@@ -1,5 +1,5 @@
 /**
- * amis-formula v1.3.2
+ * amis-formula v1.3.3
  * Copyright 2021 fex
  */
 
@@ -1839,18 +1839,14 @@ function lexer(input, options) {
                     }
                     else {
                         // 支持旧的 $varName 的取值方法
-                        var j = i + 2;
-                        while (/^[a-zA-Z0-9_][a-zA-Z0-9_]*$/.test(input.substring(i + 1, j)) &&
-                            j <= input.length) {
-                            j++;
-                        }
-                        if (j - i > 2) {
+                        var match = /^[a-zA-Z0-9_]+(?:\.[a-zA-Z0-9_]+)*/.exec(input.substring(i + 1));
+                        if (match) {
                             tokenCache.push({
                                 type: TokenName[TokenEnum.Variable],
-                                value: input.substring(i + 1, j - 1),
-                                raw: input.substring(i, j - 1),
+                                value: match[0],
+                                raw: match[0],
                                 start: position(input.substring(index, i)),
-                                end: position(input.substring(index, j - 1))
+                                end: position(input.substring(index, i + 1 + match[0].length))
                             });
                             break;
                         }
@@ -2309,7 +2305,7 @@ function lexer(input, options) {
         var chunk = '';
         while (i < input.length) {
             var ch = input[i];
-            if (/^[\u4e00-\u9fa5A-Za-z_$@][\u4e00-\u9fa5A-Za-z0-9_]*$/.test(chunk + ch)) {
+            if (/^[\u4e00-\u9fa5A-Za-z_$@][\u4e00-\u9fa5A-Za-z0-9_\-]*$/.test(chunk + ch)) {
                 chunk += ch;
                 i++;
             }
@@ -2948,10 +2944,16 @@ function parse(input, options) {
         next();
         return {
             type: 'script',
-            body: {
-                type: 'variable',
-                name: prevToken.value
-            }
+            body: prevToken.value.split('.').reduce(function (prev, key) {
+                return prev ? {
+                    type: 'getter',
+                    host: prev,
+                    key: key
+                } : {
+                    type: 'variable',
+                    name: key
+                };
+            }, null)
         };
     }
     next();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "amis-formula",
-  "version": "1.3.2",
+  "version": "1.3.3",
   "description": "负责 amis 里面的表达式实现，内置公式，编辑器等",
   "main": "dist/index.js",
   "scripts": {