@leankylin-sheet/formula-parser 4.0.38 → 4.0.40

package/dist/error.d.ts

@@ -8,3 +8,13 @@ export const ERROR_NULL: "NULL";
 export const ERROR_NUM: "NUM";
 export const ERROR_REF: "REF";
 export const ERROR_VALUE: "VALUE";
+export const errors_formula_map: {
+    ERROR: any;
+    "DIV/0": any;
+    NAME: any;
+    "N/A": any;
+    NULL: any;
+    NUM: any;
+    REF: any;
+    VALUE: any;
+};

package/dist/evaluate-by-operator/operator/formula-function.d.ts

@@ -1,4 +1,4 @@
-declare function func(symbol: any): (...params: any[]) => any;
+declare function func(symbol: any): (..._params: any[]) => any;
 declare namespace func {
     export const isFactory: boolean;
     export { SYMBOL };

package/dist/index.esm.js

@@ -1,5 +1,6 @@
 import Emitter from 'tiny-emitter';
 import * as formulajs from '@formulajs/formulajs';
+import { utils } from '@formulajs/formulajs';
 
 function _callSuper(t, o, e) {
   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';
 var ERROR_NUM = 'NUM';
 var ERROR_REF = 'REF';
 var ERROR_VALUE = 'VALUE';
+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);
 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!');
 
 /**
@@ -294,13 +296,23 @@ var SYMBOL$4 = SUPPORTED_FORMULAS;
 function func$4(symbol) {
   return function __formulaFunction() {
     symbol = symbol.toUpperCase();
+    for (var _len = arguments.length, _params = new Array(_len), _key = 0; _key < _len; _key++) {
+      _params[_key] = arguments[_key];
+    }
+    var params = _params === null || _params === void 0 ? void 0 : _params.map(function (item) {
+      if (errors_formula_map[item]) {
+        return errors_formula_map[item];
+      } else {
+        return item;
+      }
+    });
     var symbolParts = symbol.split('.');
     var foundFormula = false;
     var result;
     if (symbolParts.length === 1) {
       if (formulajs[symbolParts[0]]) {
         foundFormula = true;
-        result = formulajs[symbolParts[0]].apply(formulajs, arguments);
+        result = formulajs[symbolParts[0]].apply(formulajs, _toConsumableArray(params));
       }
     } else {
       var length = symbolParts.length;
@@ -316,7 +328,7 @@ function func$4(symbol) {
       }
       if (nestedFormula) {
         foundFormula = true;
-        result = nestedFormula.apply(void 0, arguments);
+        result = nestedFormula.apply(void 0, _toConsumableArray(params));
       }
     }
     if (!foundFormula) {
@@ -2038,9 +2050,9 @@ var Parser$1 = /*#__PURE__*/function (_Emitter) {
           result = "";
         } else {
           result = this.parser.parse(expression);
-          if (result === 'DIV/0') {
-            result = '0';
-          }
+          // if(result === 'DIV/0'){
+          //   result= '0'
+          // }
         }
       } catch (ex) {
         var message = error(ex.message);

package/dist/index.js

@@ -231,6 +231,7 @@ var ERROR_NULL = 'NULL';
 var ERROR_NUM = 'NUM';
 var ERROR_REF = 'REF';
 var ERROR_VALUE = 'VALUE';
+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);
 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!');
 
 /**
@@ -323,13 +324,23 @@ var SYMBOL$4 = SUPPORTED_FORMULAS;
 function func$4(symbol) {
   return function __formulaFunction() {
     symbol = symbol.toUpperCase();
+    for (var _len = arguments.length, _params = new Array(_len), _key = 0; _key < _len; _key++) {
+      _params[_key] = arguments[_key];
+    }
+    var params = _params === null || _params === void 0 ? void 0 : _params.map(function (item) {
+      if (errors_formula_map[item]) {
+        return errors_formula_map[item];
+      } else {
+        return item;
+      }
+    });
     var symbolParts = symbol.split('.');
     var foundFormula = false;
     var result;
     if (symbolParts.length === 1) {
       if (formulajs__namespace[symbolParts[0]]) {
         foundFormula = true;
-        result = formulajs__namespace[symbolParts[0]].apply(formulajs__namespace, arguments);
+        result = formulajs__namespace[symbolParts[0]].apply(formulajs__namespace, _toConsumableArray(params));
       }
     } else {
       var length = symbolParts.length;
@@ -345,7 +356,7 @@ function func$4(symbol) {
       }
       if (nestedFormula) {
         foundFormula = true;
-        result = nestedFormula.apply(void 0, arguments);
+        result = nestedFormula.apply(void 0, _toConsumableArray(params));
       }
     }
     if (!foundFormula) {
@@ -2067,9 +2078,9 @@ var Parser$1 = /*#__PURE__*/function (_Emitter) {
           result = "";
         } else {
           result = this.parser.parse(expression);
-          if (result === 'DIV/0') {
-            result = '0';
-          }
+          // if(result === 'DIV/0'){
+          //   result= '0'
+          // }
         }
       } catch (ex) {
         var message = error(ex.message);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leankylin-sheet/formula-parser",
-  "version": "4.0.38",
+  "version": "4.0.40",
   "description": "Formula parser",
   "main": "dist/index.js",
   "module": "dist/index.esm.js",