amis-formula 2.9.0 → 3.0.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/esm/doc.js +1 -1
- package/esm/error.d.ts +6 -0
- package/esm/error.js +21 -0
- package/esm/evalutor.js +3 -2
- package/esm/evalutorForAsync.js +3 -2
- package/esm/filter.js +1 -1
- package/esm/function.js +1 -1
- package/esm/index.js +1 -1
- package/esm/lexer.js +1 -1
- package/esm/parser.js +1 -1
- package/lib/doc.js +1 -1
- package/lib/error.d.ts +6 -0
- package/lib/error.js +25 -0
- package/lib/evalutor.js +3 -2
- package/lib/evalutorForAsync.js +3 -2
- package/lib/filter.js +1 -1
- package/lib/function.js +1 -1
- package/lib/index.js +1 -1
- package/lib/lexer.js +1 -1
- package/lib/parser.js +1 -1
- package/package.json +2 -2
package/esm/doc.js
CHANGED
package/esm/error.d.ts
ADDED
package/esm/error.js
ADDED
|
@@ -0,0 +1,21 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* amis-formula v3.0.0
|
|
3
|
+
* Copyright 2021-2023 fex
|
|
4
|
+
*/
|
|
5
|
+
|
|
6
|
+
import { __extends } from 'tslib';
|
|
7
|
+
|
|
8
|
+
/**
|
|
9
|
+
* 表达式解析错误
|
|
10
|
+
*/
|
|
11
|
+
var FormulaEvalError = /** @class */ (function (_super) {
|
|
12
|
+
__extends(FormulaEvalError, _super);
|
|
13
|
+
function FormulaEvalError(message) {
|
|
14
|
+
var _this = _super.call(this, message) || this;
|
|
15
|
+
_this.name = 'FormulaEvalError';
|
|
16
|
+
return _this;
|
|
17
|
+
}
|
|
18
|
+
return FormulaEvalError;
|
|
19
|
+
}(Error));
|
|
20
|
+
|
|
21
|
+
export { FormulaEvalError };
|
package/esm/evalutor.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* amis-formula
|
|
2
|
+
* amis-formula v3.0.0
|
|
3
3
|
* Copyright 2021-2023 fex
|
|
4
4
|
*/
|
|
5
5
|
|
|
@@ -15,6 +15,7 @@ import uniqBy from 'lodash/uniqBy';
|
|
|
15
15
|
import isEqual from 'lodash/isEqual';
|
|
16
16
|
import isPlainObject from 'lodash/isPlainObject';
|
|
17
17
|
import get from 'lodash/get';
|
|
18
|
+
import { FormulaEvalError } from './error.js';
|
|
18
19
|
|
|
19
20
|
/**
|
|
20
21
|
* @file 公式内置函数
|
|
@@ -366,7 +367,7 @@ var Evaluator = /** @class */ (function () {
|
|
|
366
367
|
(this.filters.hasOwnProperty(ast.identifier) &&
|
|
367
368
|
this.filters[ast.identifier]);
|
|
368
369
|
if (!fn) {
|
|
369
|
-
throw new
|
|
370
|
+
throw new FormulaEvalError("".concat(ast.identifier, "\u51FD\u6570\u6CA1\u6709\u5B9A\u4E49"));
|
|
370
371
|
}
|
|
371
372
|
var args = ast.args;
|
|
372
373
|
// 逻辑函数特殊处理,因为有时候有些运算是可以跳过的。
|
package/esm/evalutorForAsync.js
CHANGED
|
@@ -1,10 +1,11 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* amis-formula
|
|
2
|
+
* amis-formula v3.0.0
|
|
3
3
|
* Copyright 2021-2023 fex
|
|
4
4
|
*/
|
|
5
5
|
|
|
6
6
|
import { __extends, __awaiter, __generator } from 'tslib';
|
|
7
7
|
import { stripNumber, createObject, Evaluator } from './evalutor.js';
|
|
8
|
+
import { FormulaEvalError } from './error.js';
|
|
8
9
|
|
|
9
10
|
function runSequence(arr, fn) {
|
|
10
11
|
return __awaiter(this, void 0, void 0, function () {
|
|
@@ -573,7 +574,7 @@ var AsyncEvaluator = /** @class */ (function (_super) {
|
|
|
573
574
|
(this.filters.hasOwnProperty(ast.identifier) &&
|
|
574
575
|
this.filters[ast.identifier]);
|
|
575
576
|
if (!fn) {
|
|
576
|
-
throw new
|
|
577
|
+
throw new FormulaEvalError("".concat(ast.identifier, "\u51FD\u6570\u6CA1\u6709\u5B9A\u4E49"));
|
|
577
578
|
}
|
|
578
579
|
args = ast.args;
|
|
579
580
|
if (!~['IF', 'AND', 'OR', 'XOR', 'IFS'].indexOf(ast.identifier)) return [3 /*break*/, 1];
|
package/esm/filter.js
CHANGED
package/esm/function.js
CHANGED
package/esm/index.js
CHANGED
package/esm/lexer.js
CHANGED
package/esm/parser.js
CHANGED
package/lib/doc.js
CHANGED
package/lib/error.d.ts
ADDED
package/lib/error.js
ADDED
|
@@ -0,0 +1,25 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* amis-formula v3.0.0
|
|
3
|
+
* Copyright 2021-2023 fex
|
|
4
|
+
*/
|
|
5
|
+
|
|
6
|
+
'use strict';
|
|
7
|
+
|
|
8
|
+
Object.defineProperty(exports, '__esModule', { value: true });
|
|
9
|
+
|
|
10
|
+
var tslib = require('tslib');
|
|
11
|
+
|
|
12
|
+
/**
|
|
13
|
+
* 表达式解析错误
|
|
14
|
+
*/
|
|
15
|
+
var FormulaEvalError = /** @class */ (function (_super) {
|
|
16
|
+
tslib.__extends(FormulaEvalError, _super);
|
|
17
|
+
function FormulaEvalError(message) {
|
|
18
|
+
var _this = _super.call(this, message) || this;
|
|
19
|
+
_this.name = 'FormulaEvalError';
|
|
20
|
+
return _this;
|
|
21
|
+
}
|
|
22
|
+
return FormulaEvalError;
|
|
23
|
+
}(Error));
|
|
24
|
+
|
|
25
|
+
exports.FormulaEvalError = FormulaEvalError;
|
package/lib/evalutor.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* amis-formula
|
|
2
|
+
* amis-formula v3.0.0
|
|
3
3
|
* Copyright 2021-2023 fex
|
|
4
4
|
*/
|
|
5
5
|
|
|
@@ -19,6 +19,7 @@ var uniqBy = require('lodash/uniqBy');
|
|
|
19
19
|
var isEqual = require('lodash/isEqual');
|
|
20
20
|
var isPlainObject = require('lodash/isPlainObject');
|
|
21
21
|
var get = require('lodash/get');
|
|
22
|
+
var error = require('./error.js');
|
|
22
23
|
|
|
23
24
|
function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
|
|
24
25
|
|
|
@@ -384,7 +385,7 @@ var Evaluator = /** @class */ (function () {
|
|
|
384
385
|
(this.filters.hasOwnProperty(ast.identifier) &&
|
|
385
386
|
this.filters[ast.identifier]);
|
|
386
387
|
if (!fn) {
|
|
387
|
-
throw new
|
|
388
|
+
throw new error.FormulaEvalError("".concat(ast.identifier, "\u51FD\u6570\u6CA1\u6709\u5B9A\u4E49"));
|
|
388
389
|
}
|
|
389
390
|
var args = ast.args;
|
|
390
391
|
// 逻辑函数特殊处理,因为有时候有些运算是可以跳过的。
|
package/lib/evalutorForAsync.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* amis-formula
|
|
2
|
+
* amis-formula v3.0.0
|
|
3
3
|
* Copyright 2021-2023 fex
|
|
4
4
|
*/
|
|
5
5
|
|
|
@@ -9,6 +9,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
|
|
|
9
9
|
|
|
10
10
|
var tslib = require('tslib');
|
|
11
11
|
var evalutor = require('./evalutor.js');
|
|
12
|
+
var error = require('./error.js');
|
|
12
13
|
|
|
13
14
|
function runSequence(arr, fn) {
|
|
14
15
|
return tslib.__awaiter(this, void 0, void 0, function () {
|
|
@@ -577,7 +578,7 @@ var AsyncEvaluator = /** @class */ (function (_super) {
|
|
|
577
578
|
(this.filters.hasOwnProperty(ast.identifier) &&
|
|
578
579
|
this.filters[ast.identifier]);
|
|
579
580
|
if (!fn) {
|
|
580
|
-
throw new
|
|
581
|
+
throw new error.FormulaEvalError("".concat(ast.identifier, "\u51FD\u6570\u6CA1\u6709\u5B9A\u4E49"));
|
|
581
582
|
}
|
|
582
583
|
args = ast.args;
|
|
583
584
|
if (!~['IF', 'AND', 'OR', 'XOR', 'IFS'].indexOf(ast.identifier)) return [3 /*break*/, 1];
|
package/lib/filter.js
CHANGED
package/lib/function.js
CHANGED
package/lib/index.js
CHANGED
package/lib/lexer.js
CHANGED
package/lib/parser.js
CHANGED
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "amis-formula",
|
|
3
|
-
"version": "
|
|
3
|
+
"version": "3.0.0",
|
|
4
4
|
"description": "负责 amis 里面的表达式实现,内置公式,编辑器等",
|
|
5
5
|
"main": "lib/index.js",
|
|
6
6
|
"module": "esm/index.js",
|
|
@@ -113,5 +113,5 @@
|
|
|
113
113
|
"printBasicPrototype": false
|
|
114
114
|
}
|
|
115
115
|
},
|
|
116
|
-
"gitHead": "
|
|
116
|
+
"gitHead": "9220b4c13f4d042ebf2bf1dd8ee8e24d11e39141"
|
|
117
117
|
}
|