amis-formula 1.3.11 → 1.3.12-beta.0

package/dist/index.d.ts

@@ -1,7 +1,7 @@
 import { Evaluator, EvaluatorOptions } from './evalutor';
-import { parse, ParserOptions } from './parser';
+import { ASTNode, parse, ParserOptions } from './parser';
 import { lexer } from './lexer';
 import { registerFilter, filters, getFilters } from './filter';
 export { parse, lexer, Evaluator, filters, getFilters, registerFilter };
 export * from './util';
-export declare function evaluate(astOrString: string, data: any, options?: ParserOptions & EvaluatorOptions): any;
+export declare function evaluate(astOrString: string | ASTNode, data: any, options?: ParserOptions & EvaluatorOptions): any;

package/dist/index.js

@@ -1,5 +1,5 @@
 /**
- * amis-formula v1.3.11
+ * amis-formula v1.3.12-beta.0
  * Copyright 2021-2022 fex
  */
 
@@ -879,7 +879,9 @@ function parse(input, options) {
             ast = {
                 type: 'filter',
                 input: ast,
-                filters: filters
+                filters: filters,
+                start: ast.start,
+                end: filters[filters.length - 1].end
             };
         }
         return ast;
@@ -887,10 +889,13 @@ function parse(input, options) {
     function arrowFunction() {
         var ast = argList() || variable();
         var args = [];
+        var start;
         if ((ast === null || ast === void 0 ? void 0 : ast.type) === 'variable') {
             args = [ast];
+            start = ast.start;
         }
         else if ((ast === null || ast === void 0 ? void 0 : ast.type) === 'arg-list') {
+            start = ast.start;
             args = ast.body;
         }
         if (Array.isArray(args) && matchPunctuator('=')) {
@@ -901,7 +906,9 @@ function parse(input, options) {
                 return {
                     type: 'anonymous_function',
                     args: args,
-                    return: body
+                    return: body,
+                    start: start,
+                    end: body.end
                 };
             }
             else {
@@ -927,7 +934,9 @@ function parse(input, options) {
                 type: 'conditional',
                 test: ast,
                 consequent: consequent,
-                alternate: alternate
+                alternate: alternate,
+                start: ast.start,
+                end: alternate.end
             };
         }
         return ast;
@@ -951,6 +960,8 @@ function parse(input, options) {
                     },
                     _a[leftKey] = ast,
                     _a[rightKey] = right,
+                    _a.start = ast.start,
+                    _a.end = right.end,
                     _a);
             }
         }
@@ -1025,7 +1036,9 @@ function parse(input, options) {
             ast = {
                 type: 'unary',
                 op: op.value,
-                value: ast
+                value: ast,
+                start: op.start,
+                end: op.end,
             };
         }
         return ast;
@@ -1047,7 +1060,9 @@ function parse(input, options) {
             ast = {
                 type: 'getter',
                 host: ast,
-                key: right
+                key: right,
+                start: ast.start,
+                end: right.end
             };
         }
         return ast;
@@ -1079,7 +1094,9 @@ function parse(input, options) {
             next();
             return {
                 type: 'string',
-                value: cToken.value
+                value: cToken.value,
+                start: cToken.start,
+                end: cToken.end
             };
         }
         return null;
@@ -1087,21 +1104,28 @@ function parse(input, options) {
     function numberLiteral() {
         if (token.type === TokenName[TokenEnum.NumericLiteral]) {
             var value = token.value;
+            var cToken = token;
             next();
             return {
                 type: 'literal',
-                value: value
+                value: value,
+                start: cToken.start,
+                end: cToken.end
             };
         }
         return null;
     }
     function template() {
         if (matchPunctuator('`')) {
+            var start = token;
+            var end = start;
             next();
             var state = tempalteStates.START;
             var ast_1 = {
                 type: 'template',
-                body: []
+                body: [],
+                start: start.start,
+                end: start.end
             };
             while (true) {
                 if (state === tempalteStates.SCRIPTING) {
@@ -1113,6 +1137,7 @@ function parse(input, options) {
                 }
                 else {
                     if (matchPunctuator('`')) {
+                        end = token;
                         next();
                         break;
                     }
@@ -1123,7 +1148,9 @@ function parse(input, options) {
                     else if (token.type === TokenName[TokenEnum.TemplateRaw]) {
                         ast_1.body.push({
                             type: 'template_raw',
-                            value: token.value
+                            value: token.value,
+                            start: token.start,
+                            end: token.end
                         });
                         next();
                     }
@@ -1132,6 +1159,7 @@ function parse(input, options) {
                     }
                 }
             }
+            ast_1.end = end.end;
             return ast_1;
         }
         return null;
@@ -1142,7 +1170,9 @@ function parse(input, options) {
             next();
             return {
                 type: 'identifier',
-                name: cToken.value
+                name: cToken.value,
+                start: cToken.start,
+                end: cToken.end
             };
         }
         return null;
@@ -1168,10 +1198,13 @@ function parse(input, options) {
         if (token.type === TokenName[TokenEnum.Literal] ||
             token.type === TokenName[TokenEnum.BooleanLiteral]) {
             var value = token.value;
+            var cToken = token;
             next();
             return {
                 type: 'literal',
-                value: value
+                value: value,
+                start: cToken.start,
+                end: cToken.end
             };
         }
         return null;
@@ -1182,10 +1215,13 @@ function parse(input, options) {
             next();
             if (matchPunctuator('(')) {
                 var argList_1 = expressionList();
+                assert(argList_1);
                 return {
                     type: 'func_call',
                     identifier: id.value,
-                    args: argList_1 === null || argList_1 === void 0 ? void 0 : argList_1.body
+                    args: argList_1 === null || argList_1 === void 0 ? void 0 : argList_1.body,
+                    start: id.start,
+                    end: argList_1.end
                 };
             }
             else {
@@ -1197,9 +1233,12 @@ function parse(input, options) {
     function arrayLiteral() {
         if (matchPunctuator('[')) {
             var argList_2 = expressionList('[', ']');
+            assert(argList_2);
             return {
                 type: 'array',
-                members: argList_2 === null || argList_2 === void 0 ? void 0 : argList_2.body
+                members: argList_2 === null || argList_2 === void 0 ? void 0 : argList_2.body,
+                start: argList_2.start,
+                end: argList_2.end
             };
         }
         return null;
@@ -1208,6 +1247,8 @@ function parse(input, options) {
         if (startOP === void 0) { startOP = '('; }
         if (endOp === void 0) { endOp = ')'; }
         if (matchPunctuator(startOP)) {
+            var start = token;
+            var end = void 0;
             next();
             var args = [];
             var state = argListStates.START;
@@ -1222,13 +1263,16 @@ function parse(input, options) {
                     }
                 }
                 else if (matchPunctuator(endOp)) {
+                    end = token;
                     next();
                     break;
                 }
             }
             return {
                 type: 'expression-list',
-                body: args
+                body: args,
+                start: start.start,
+                end: end.end
             };
         }
         return null;
@@ -1244,6 +1288,8 @@ function parse(input, options) {
             return null;
         };
         if (matchPunctuator(startOP)) {
+            var start = token;
+            var end = start;
             next();
             count++;
             var args = [];
@@ -1268,10 +1314,13 @@ function parse(input, options) {
                 }
             }
             if (matchPunctuator(endOp)) {
+                end = token;
                 next();
                 return {
                     type: 'arg-list',
-                    body: args
+                    body: args,
+                    start: start.start,
+                    end: end.end
                 };
             }
             else {
@@ -1282,10 +1331,14 @@ function parse(input, options) {
     }
     function objectLiteral() {
         if (matchPunctuator('{')) {
+            var start = token;
+            var end = start;
             next();
             var ast_2 = {
                 type: 'object',
-                members: []
+                members: [],
+                start: start.start,
+                end: start.end
             };
             var state = objectStates.START;
             var key = void 0, value = void 0;
@@ -1309,6 +1362,7 @@ function parse(input, options) {
                         state = objectStates.COMMA;
                     }
                     else if (matchPunctuator('}')) {
+                        end = token;
                         next();
                         break;
                     }
@@ -1318,6 +1372,7 @@ function parse(input, options) {
                 }
                 else {
                     if (state != objectStates.COMMA && matchPunctuator('}')) {
+                        end = token;
                         next();
                         break;
                     }
@@ -1325,6 +1380,7 @@ function parse(input, options) {
                     state = objectStates.KEY;
                 }
             }
+            ast_2.end = end.end;
             return ast_2;
         }
         return null;
@@ -1335,7 +1391,9 @@ function parse(input, options) {
     function contents() {
         var node = {
             type: 'document',
-            body: []
+            body: [],
+            start: token.start,
+            end: token.end
         };
         while (token.type !== TokenName[TokenEnum.EOF]) {
             var ast_3 = raw() || rawScript() || oldVariable();
@@ -1344,6 +1402,9 @@ function parse(input, options) {
             }
             node.body.push(ast_3);
         }
+        if (node.body.length) {
+            node.end = node.body[node.body.length - 1].end;
+        }
         return node;
     }
     function raw() {
@@ -1354,20 +1415,27 @@ function parse(input, options) {
         next();
         return {
             type: 'raw',
-            value: cToken.value
+            value: cToken.value,
+            start: cToken.start,
+            end: cToken.end
         };
     }
     function rawScript() {
         if (token.type !== TokenName[TokenEnum.OpenScript]) {
             return null;
         }
+        var start = token;
+        var end = start;
         next();
         var exp = assert(complexExpression());
         assert(token.type === TokenName[TokenEnum.CloseScript]);
+        end = token;
         next();
         return {
             type: 'script',
-            body: exp
+            body: exp,
+            start: start.start,
+            end: end.end
         };
     }
     function variable(allowNameSpace) {
@@ -1383,19 +1451,26 @@ function parse(input, options) {
                 return {
                     type: 'ns-variable',
                     namespace: cToken.value,
-                    body: body
+                    body: body,
+                    start: cToken.start,
+                    end: body.end
                 };
             }
             return {
                 type: 'variable',
-                name: cToken.value
+                name: cToken.value,
+                start: cToken.start,
+                end: cToken.end
             };
         }
         else if (matchPunctuator('&')) {
+            var v = token;
             next();
             return {
                 type: 'variable',
-                name: '&'
+                name: '&',
+                start: v.start,
+                end: v.end
             };
         }
         return null;
@@ -1413,13 +1488,19 @@ function parse(input, options) {
                     ? {
                         type: 'getter',
                         host: prev,
-                        key: key
+                        key: key,
+                        start: prevToken.start,
+                        end: prevToken.end
                     }
                     : {
                         type: 'variable',
-                        name: key
+                        name: key,
+                        start: prevToken.start,
+                        end: prevToken.end
                     };
-            }, null)
+            }, null),
+            start: prevToken.start,
+            end: prevToken.end
         };
     }
     next();
@@ -3909,10 +3990,11 @@ function getFilters() {
 }
 
 function evaluate(astOrString, data, options) {
+    var ast = astOrString;
     if (typeof astOrString === 'string') {
-        astOrString = parse(astOrString, options);
+        ast = parse(astOrString, options);
     }
-    return new Evaluator(data, options).evalute(astOrString);
+    return new Evaluator(data, options).evalute(ast);
 }
 Evaluator.setDefaultFilters(getFilters());
 

package/dist/parser.d.ts

@@ -1,3 +1,4 @@
+import { Position } from './lexer';
 export declare type NodeType = 'content' | 'raw' | 'conditional';
 export interface ParserOptions {
     /**
@@ -16,4 +17,11 @@ export interface ParserOptions {
     allowFilter?: boolean;
     variableNamespaces?: Array<string>;
 }
-export declare function parse(input: string, options?: ParserOptions): any;
+export interface ASTNode {
+    type: string;
+    start: Position;
+    end: Position;
+    [propname: string]: any;
+}
+export declare type ASTNodeOrNull = ASTNode | null;
+export declare function parse(input: string, options?: ParserOptions): ASTNode;

package/package.json

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