@leankylin-sheet/formula-parser 4.0.39 → 4.0.41

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.
Files changed (5) hide show
  1. package/dist/error.d.ts +10 -0
  2. package/dist/evaluate-by-operator/operator/formula-function.d.ts +1 -1
  3. package/dist/index.esm.js +15 -3
  4. package/dist/index.js +14 -3
  5. package/package.json +2 -2
package/dist/error.d.ts CHANGED
@@ -8,3 +8,13 @@ export const ERROR_NULL: "NULL";
8
8
  export const ERROR_NUM: "NUM";
9
9
  export const ERROR_REF: "REF";
10
10
  export const ERROR_VALUE: "VALUE";
11
+ export const errors_formula_map: {
12
+ ERROR: Error;
13
+ "DIV/0": Error;
14
+ NAME: Error;
15
+ "N/A": Error;
16
+ NULL: Error;
17
+ NUM: Error;
18
+ REF: Error;
19
+ VALUE: Error;
20
+ };
package/dist/evaluate-by-operator/operator/formula-function.d.ts CHANGED
@@ -1,4 +1,4 @@
1
- declare function func(symbol: any): (...params: any[]) => any;
1
+ declare function func(symbol: any): (..._params: any[]) => any;
2
2
  declare namespace func {
3
3
  export const isFactory: boolean;
4
4
  export { SYMBOL };
package/dist/index.esm.js CHANGED
@@ -1,5 +1,6 @@
1
1
  import Emitter from 'tiny-emitter';
2
2
  import * as formulajs from '@formulajs/formulajs';
3
+ import { utils } from '@formulajs/formulajs';
3
4
 
4
5
  function _callSuper(t, o, e) {
5
6
  return o = _getPrototypeOf(o), _possibleConstructorReturn(t, _isNativeReflectConstruct() ? Reflect.construct(o, e || [], _getPrototypeOf(t).constructor) : o.apply(t, e));
@@ -202,6 +203,7 @@ var ERROR_NULL = 'NULL';
202
203
  var ERROR_NUM = 'NUM';
203
204
  var ERROR_REF = 'REF';
204
205
  var ERROR_VALUE = 'VALUE';
206
+ var errors_formula_map = _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({}, ERROR, utils.errors.error), ERROR_DIV_ZERO, utils.errors.div0), ERROR_NAME, utils.errors.name), ERROR_NOT_AVAILABLE, utils.errors.na), ERROR_NULL, utils.errors.nil), ERROR_NUM, utils.errors.num), ERROR_REF, utils.errors.ref), ERROR_VALUE, utils.errors.value);
205
207
  var errors = _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({}, ERROR, '#ERROR!'), ERROR_DIV_ZERO, '#DIV/0!'), ERROR_NAME, '#NAME?'), ERROR_NOT_AVAILABLE, '#N/A'), ERROR_NULL, '#NULL!'), ERROR_NUM, '#NUM!'), ERROR_REF, '#REF!'), ERROR_VALUE, '#VALUE!');
206
208
 
207
209
  /**
@@ -294,13 +296,23 @@ var SYMBOL$4 = SUPPORTED_FORMULAS;
294
296
  function func$4(symbol) {
295
297
  return function __formulaFunction() {
296
298
  symbol = symbol.toUpperCase();
299
+ for (var _len = arguments.length, _params = new Array(_len), _key = 0; _key < _len; _key++) {
300
+ _params[_key] = arguments[_key];
301
+ }
302
+ var params = _params === null || _params === void 0 ? void 0 : _params.map(function (item) {
303
+ if (errors_formula_map[item]) {
304
+ return errors_formula_map[item];
305
+ } else {
306
+ return item;
307
+ }
308
+ });
297
309
  var symbolParts = symbol.split('.');
298
310
  var foundFormula = false;
299
311
  var result;
300
312
  if (symbolParts.length === 1) {
301
313
  if (formulajs[symbolParts[0]]) {
302
314
  foundFormula = true;
303
- result = formulajs[symbolParts[0]].apply(formulajs, arguments);
315
+ result = formulajs[symbolParts[0]].apply(formulajs, _toConsumableArray(params));
304
316
  }
305
317
  } else {
306
318
  var length = symbolParts.length;
@@ -316,7 +328,7 @@ function func$4(symbol) {
316
328
  }
317
329
  if (nestedFormula) {
318
330
  foundFormula = true;
319
- result = nestedFormula.apply(void 0, arguments);
331
+ result = nestedFormula.apply(void 0, _toConsumableArray(params));
320
332
  }
321
333
  }
322
334
  if (!foundFormula) {
@@ -2225,7 +2237,7 @@ var Parser$1 = /*#__PURE__*/function (_Emitter) {
2225
2237
  var startCell = {};
2226
2238
  var endCell = {};
2227
2239
  startCell.sheetName = startSheetName;
2228
- if (startRow.index <= endRow.index) {
2240
+ if (startRow.index <= endRow.index || endRow.index === -1) {
2229
2241
  startCell.row = startRow;
2230
2242
  endCell.row = endRow;
2231
2243
  } else {
package/dist/index.js CHANGED
@@ -231,6 +231,7 @@ var ERROR_NULL = 'NULL';
231
231
  var ERROR_NUM = 'NUM';
232
232
  var ERROR_REF = 'REF';
233
233
  var ERROR_VALUE = 'VALUE';
234
+ var errors_formula_map = _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({}, ERROR, formulajs.utils.errors.error), ERROR_DIV_ZERO, formulajs.utils.errors.div0), ERROR_NAME, formulajs.utils.errors.name), ERROR_NOT_AVAILABLE, formulajs.utils.errors.na), ERROR_NULL, formulajs.utils.errors.nil), ERROR_NUM, formulajs.utils.errors.num), ERROR_REF, formulajs.utils.errors.ref), ERROR_VALUE, formulajs.utils.errors.value);
234
235
  var errors = _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({}, ERROR, '#ERROR!'), ERROR_DIV_ZERO, '#DIV/0!'), ERROR_NAME, '#NAME?'), ERROR_NOT_AVAILABLE, '#N/A'), ERROR_NULL, '#NULL!'), ERROR_NUM, '#NUM!'), ERROR_REF, '#REF!'), ERROR_VALUE, '#VALUE!');
235
236
 
236
237
  /**
@@ -323,13 +324,23 @@ var SYMBOL$4 = SUPPORTED_FORMULAS;
323
324
  function func$4(symbol) {
324
325
  return function __formulaFunction() {
325
326
  symbol = symbol.toUpperCase();
327
+ for (var _len = arguments.length, _params = new Array(_len), _key = 0; _key < _len; _key++) {
328
+ _params[_key] = arguments[_key];
329
+ }
330
+ var params = _params === null || _params === void 0 ? void 0 : _params.map(function (item) {
331
+ if (errors_formula_map[item]) {
332
+ return errors_formula_map[item];
333
+ } else {
334
+ return item;
335
+ }
336
+ });
326
337
  var symbolParts = symbol.split('.');
327
338
  var foundFormula = false;
328
339
  var result;
329
340
  if (symbolParts.length === 1) {
330
341
  if (formulajs__namespace[symbolParts[0]]) {
331
342
  foundFormula = true;
332
- result = formulajs__namespace[symbolParts[0]].apply(formulajs__namespace, arguments);
343
+ result = formulajs__namespace[symbolParts[0]].apply(formulajs__namespace, _toConsumableArray(params));
333
344
  }
334
345
  } else {
335
346
  var length = symbolParts.length;
@@ -345,7 +356,7 @@ function func$4(symbol) {
345
356
  }
346
357
  if (nestedFormula) {
347
358
  foundFormula = true;
348
- result = nestedFormula.apply(void 0, arguments);
359
+ result = nestedFormula.apply(void 0, _toConsumableArray(params));
349
360
  }
350
361
  }
351
362
  if (!foundFormula) {
@@ -2254,7 +2265,7 @@ var Parser$1 = /*#__PURE__*/function (_Emitter) {
2254
2265
  var startCell = {};
2255
2266
  var endCell = {};
2256
2267
  startCell.sheetName = startSheetName;
2257
- if (startRow.index <= endRow.index) {
2268
+ if (startRow.index <= endRow.index || endRow.index === -1) {
2258
2269
  startCell.row = startRow;
2259
2270
  endCell.row = endRow;
2260
2271
  } else {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@leankylin-sheet/formula-parser",
3
- "version": "4.0.39",
3
+ "version": "4.0.41",
4
4
  "description": "Formula parser",
5
5
  "main": "dist/index.js",
6
6
  "module": "dist/index.esm.js",
@@ -36,7 +36,7 @@
36
36
  "rimraf": "^3.0.2"
37
37
  },
38
38
  "dependencies": {
39
- "@formulajs/formulajs": "^2.9.3",
39
+ "@formulajs/formulajs": "^4.5.6",
40
40
  "tiny-emitter": "^2.1.0"
41
41
  },
42
42
  "jest": {