amis-formula 1.3.2 → 1.3.6

package/dist/index.js

@@ -1,6 +1,6 @@
 /**
- * amis-formula v1.3.2
- * Copyright 2021 fex
+ * amis-formula v1.3.6
+ * Copyright 2021-2022 fex
  */
 
 'use strict';
@@ -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,
@@ -1839,18 +1837,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;
                         }
@@ -2138,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;
@@ -2217,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++;
         }
@@ -2305,25 +2260,21 @@ 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_\-$@]|\\(?:\.|\[|\]|\(|\)|\{|\}|\s|=|!|>|<|\||&|\+|-|\*|\/|\^|~|%|&|\?|:|;|,))*|\d+[\u4e00-\u9fa5A-Za-z_$@](?:[\u4e00-\u9fa5A-Za-z0-9_\-$@]|\\(?:\.|\[|\]|\(|\)|\{|\}|\s|=|!|>|<|\||&|\+|-|\*|\/|\^|~|%|&|\?|:|;|,))*)/;
+        var match = reg.exec(input.substring(index, index + 256) // 变量长度不能超过 256
+        );
+        if (match) {
             return {
                 type: TokenName[TokenEnum.Identifier],
-                value: value,
+                value: match[0].replace(/\\(\.|\[|\]|\(|\)|\{|\}|\s|=|!|>|<|\||&|\+|-|\*|\/|\^|~|%|&|\?|:|;|,)/g, function (_, v) { return v; }),
                 start: position(),
-                end: position(value)
+                end: position(match[0])
             };
         }
         return null;
@@ -2948,10 +2899,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();
@@ -3269,12 +3226,19 @@ function pickValues(names, data) {
 }
 function resolveVariable(path, data) {
     if (data === void 0) { data = {}; }
-    if (path === '&') {
+    if (path === '&' || path == '$$') {
         return data;
     }
     else if (!path || typeof path !== 'string') {
         return undefined;
     }
+    else if (!~path.indexOf(':')) {
+        // 简单用法直接用 getVariable
+        return getVariable(data, path[0] === '$' ? path.substring(1) : path);
+    }
+    // window:xxx  ls:xxx.xxx
+    // 带 namespace 的用公式
+    // 主要是用公式会严格点，不能出现奇怪的变量名
     try {
         return new Evaluator(data).evalute(parse(path, {
             variableMode: true,

package/package.json

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