amis-formula 1.3.3 → 1.3.4

package/dist/index.js

@@ -1,5 +1,5 @@
 /**
- * amis-formula v1.3.3
+ * amis-formula v1.3.4
  * Copyright 2021 fex
  */
 
@@ -1654,13 +1654,11 @@ var rawStates = {
 };
 var numberStates = {
     START: 0,
-    MINUS: 1,
-    ZERO: 2,
-    DIGIT: 3,
-    POINT: 4,
-    DIGIT_FRACTION: 5,
-    EXP: 6,
-    EXP_DIGIT_OR_SIGN: 7
+    ZERO: 1,
+    DIGIT: 2,
+    POINT: 3,
+    DIGIT_FRACTION: 4,
+    EXP: 5
 };
 var stringStates = {
     START: 0,
@@ -2134,23 +2132,6 @@ function lexer(input, options) {
             var char_1 = input.charAt(i);
             switch (state) {
                 case numberStates.START: {
-                    if (char_1 === '-') {
-                        state = numberStates.MINUS;
-                    }
-                    else if (char_1 === '0') {
-                        passedValueIndex = i + 1;
-                        state = numberStates.ZERO;
-                    }
-                    else if (isDigit1to9(char_1)) {
-                        passedValueIndex = i + 1;
-                        state = numberStates.DIGIT;
-                    }
-                    else {
-                        return null;
-                    }
-                    break;
-                }
-                case numberStates.MINUS: {
                     if (char_1 === '0') {
                         passedValueIndex = i + 1;
                         state = numberStates.ZERO;
@@ -2213,28 +2194,6 @@ function lexer(input, options) {
                     }
                     break;
                 }
-                case numberStates.EXP: {
-                    if (char_1 === '+' || char_1 === '-') {
-                        state = numberStates.EXP_DIGIT_OR_SIGN;
-                    }
-                    else if (isDigit(char_1)) {
-                        passedValueIndex = i + 1;
-                        state = numberStates.EXP_DIGIT_OR_SIGN;
-                    }
-                    else {
-                        break iterator;
-                    }
-                    break;
-                }
-                case numberStates.EXP_DIGIT_OR_SIGN: {
-                    if (isDigit(char_1)) {
-                        passedValueIndex = i + 1;
-                    }
-                    else {
-                        break iterator;
-                    }
-                    break;
-                }
             }
             i++;
         }
@@ -2301,25 +2260,20 @@ function lexer(input, options) {
         return null;
     }
     function identifier() {
-        var i = index;
-        var chunk = '';
-        while (i < input.length) {
-            var ch = input[i];
-            if (/^[\u4e00-\u9fa5A-Za-z_$@][\u4e00-\u9fa5A-Za-z0-9_\-]*$/.test(chunk + ch)) {
-                chunk += ch;
-                i++;
-            }
-            else {
-                break;
-            }
-        }
-        if (i > index) {
-            var value = input.substring(index, i);
+        // 变量模式是 resolveVariable 的时候使用的
+        // 这个纯变量获取模式，不支持其他什么表达式
+        // 仅仅支持 xxx.xxx 或者 xxx[ exression ] 这类语法
+        var reg = (options === null || options === void 0 ? void 0 : options.variableMode)
+            ? /^[\u4e00-\u9fa5A-Za-z0-9_$@][\u4e00-\u9fa5A-Za-z0-9_\-]*/
+            : /^(?:[\u4e00-\u9fa5A-Za-z_$@][\u4e00-\u9fa5A-Za-z0-9_\-]*|\d+[\u4e00-\u9fa5A-Za-z_][\u4e00-\u9fa5A-Za-z0-9_\-]*)/;
+        var match = reg.exec(input.substring(index, index + 256) // 变量长度不能超过 256
+        );
+        if (match) {
             return {
                 type: TokenName[TokenEnum.Identifier],
-                value: value,
+                value: match[0],
                 start: position(),
-                end: position(value)
+                end: position(match[0])
             };
         }
         return null;

package/package.json

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