@leankylin-sheet/formula-parser 4.0.43 → 4.0.45

package/dist/evaluate-by-operator/operator/greater-than-or-equal.d.ts

@@ -1,4 +1,4 @@
-declare function func(exp1: any, exp2: any): boolean;
+declare function func(exp1: any, exp2: any): boolean | boolean[];
 declare namespace func {
     export { SYMBOL };
 }

package/dist/evaluate-by-operator/operator/less-than-or-equal.d.ts

@@ -1,4 +1,4 @@
-declare function func(exp1: any, exp2: any): boolean;
+declare function func(exp1: any, exp2: any): boolean | boolean[];
 declare namespace func {
     export { SYMBOL };
 }

package/dist/evaluate-by-operator/operator/math.d.ts

@@ -0,0 +1 @@
+export function multiplyNumber(num1?: number, num2?: number): number;

package/dist/index.esm.js

@@ -1,6 +1,7 @@
 import Emitter from 'tiny-emitter';
 import * as formulajs from '@formulajs/formulajs';
 import { utils } from '@formulajs/formulajs';
+import { Decimal } from 'decimal.js';
 
 function _callSuper(t, o, e) {
   return o = _getPrototypeOf(o), _possibleConstructorReturn(t, _isNativeReflectConstruct() ? Reflect.construct(o, e || [], _getPrototypeOf(t).constructor) : o.apply(t, e));
@@ -405,6 +406,18 @@ func$5.SYMBOL = SYMBOL$5;
 
 var SYMBOL$6 = '>=';
 function func$6(exp1, exp2) {
+  var isArray1 = Array.isArray(exp1);
+  var isArray2 = Array.isArray(exp2);
+  if (isArray1 && !isArray2) {
+    return exp1.map(function (item) {
+      return (item === null || item === void 0 ? void 0 : item[0]) >= exp2;
+    });
+  }
+  if (!isArray1 && isArray2) {
+    return exp2.map(function (item) {
+      return exp1 >= (item === null || item === void 0 ? void 0 : item[0]);
+    });
+  }
   return exp1 >= exp2;
 }
 func$6.SYMBOL = SYMBOL$6;
@@ -429,6 +442,18 @@ func$7.SYMBOL = SYMBOL$7;
 
 var SYMBOL$8 = '<=';
 function func$8(exp1, exp2) {
+  var isArray1 = Array.isArray(exp1);
+  var isArray2 = Array.isArray(exp2);
+  if (isArray1 && !isArray2) {
+    return exp1.map(function (item) {
+      return (item === null || item === void 0 ? void 0 : item[0]) <= exp2;
+    });
+  }
+  if (!isArray1 && isArray2) {
+    return exp2.map(function (item) {
+      return exp1 <= (item === null || item === void 0 ? void 0 : item[0]);
+    });
+  }
   return exp1 <= exp2;
 }
 func$8.SYMBOL = SYMBOL$8;
@@ -448,6 +473,19 @@ function func$9(first) {
 }
 func$9.SYMBOL = SYMBOL$9;
 
+/**
+ * 解决js处理精度问题
+ * 0.3 * 0.1 = 0.03
+ * @param num1
+ * @param num2
+ * @returns
+ */
+var multiplyNumber = function multiplyNumber() {
+  var num1 = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 0;
+  var num2 = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 0;
+  return new Decimal(num1).mul(num2).toNumber();
+};
+
 var SYMBOL$a = "*";
 
 // export default function func(first, ...rest) {
@@ -466,14 +504,13 @@ function func$a(first) {
     rest[_key - 1] = arguments[_key];
   }
   var isArray1 = Array.isArray(first);
-  debugger;
   if (isArray1) {
     var dd = first === null || first === void 0 ? void 0 : first.map(function (item, index) {
       var _list = rest.map(function (rItem) {
         return Array.isArray(rItem) ? rItem[index] : toNumber(rItem);
       });
       var v = _list.reduce(function (acc, value) {
-        return acc * toNumber(value);
+        return multiplyNumber(acc, toNumber(value));
       }, toNumber(item));
       if (isNaN(v)) {
         throw Error(ERROR_VALUE);
@@ -483,7 +520,7 @@ function func$a(first) {
     return dd;
   }
   var result = rest.reduce(function (acc, value) {
-    return acc * toNumber(value);
+    return multiplyNumber(acc, toNumber(value));
   }, toNumber(first));
   if (isNaN(result)) {
     throw Error(ERROR_VALUE);

package/dist/index.js

@@ -4,6 +4,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var Emitter = require('tiny-emitter');
 var formulajs = require('@formulajs/formulajs');
+var decimal_js = require('decimal.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -433,6 +434,18 @@ func$5.SYMBOL = SYMBOL$5;
 
 var SYMBOL$6 = '>=';
 function func$6(exp1, exp2) {
+  var isArray1 = Array.isArray(exp1);
+  var isArray2 = Array.isArray(exp2);
+  if (isArray1 && !isArray2) {
+    return exp1.map(function (item) {
+      return (item === null || item === void 0 ? void 0 : item[0]) >= exp2;
+    });
+  }
+  if (!isArray1 && isArray2) {
+    return exp2.map(function (item) {
+      return exp1 >= (item === null || item === void 0 ? void 0 : item[0]);
+    });
+  }
   return exp1 >= exp2;
 }
 func$6.SYMBOL = SYMBOL$6;
@@ -457,6 +470,18 @@ func$7.SYMBOL = SYMBOL$7;
 
 var SYMBOL$8 = '<=';
 function func$8(exp1, exp2) {
+  var isArray1 = Array.isArray(exp1);
+  var isArray2 = Array.isArray(exp2);
+  if (isArray1 && !isArray2) {
+    return exp1.map(function (item) {
+      return (item === null || item === void 0 ? void 0 : item[0]) <= exp2;
+    });
+  }
+  if (!isArray1 && isArray2) {
+    return exp2.map(function (item) {
+      return exp1 <= (item === null || item === void 0 ? void 0 : item[0]);
+    });
+  }
   return exp1 <= exp2;
 }
 func$8.SYMBOL = SYMBOL$8;
@@ -476,6 +501,19 @@ function func$9(first) {
 }
 func$9.SYMBOL = SYMBOL$9;
 
+/**
+ * 解决js处理精度问题
+ * 0.3 * 0.1 = 0.03
+ * @param num1
+ * @param num2
+ * @returns
+ */
+var multiplyNumber = function multiplyNumber() {
+  var num1 = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 0;
+  var num2 = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 0;
+  return new decimal_js.Decimal(num1).mul(num2).toNumber();
+};
+
 var SYMBOL$a = "*";
 
 // export default function func(first, ...rest) {
@@ -494,14 +532,13 @@ function func$a(first) {
     rest[_key - 1] = arguments[_key];
   }
   var isArray1 = Array.isArray(first);
-  debugger;
   if (isArray1) {
     var dd = first === null || first === void 0 ? void 0 : first.map(function (item, index) {
       var _list = rest.map(function (rItem) {
         return Array.isArray(rItem) ? rItem[index] : toNumber(rItem);
       });
       var v = _list.reduce(function (acc, value) {
-        return acc * toNumber(value);
+        return multiplyNumber(acc, toNumber(value));
       }, toNumber(item));
       if (isNaN(v)) {
         throw Error(ERROR_VALUE);
@@ -511,7 +548,7 @@ function func$a(first) {
     return dd;
   }
   var result = rest.reduce(function (acc, value) {
-    return acc * toNumber(value);
+    return multiplyNumber(acc, toNumber(value));
   }, toNumber(first));
   if (isNaN(result)) {
     throw Error(ERROR_VALUE);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leankylin-sheet/formula-parser",
-  "version": "4.0.43",
+  "version": "4.0.45",
   "description": "Formula parser",
   "main": "dist/index.js",
   "module": "dist/index.esm.js",
@@ -37,6 +37,7 @@
   },
   "dependencies": {
     "@formulajs/formulajs": "^4.5.6",
+    "decimal.js": "^10.6.0",
     "tiny-emitter": "^2.1.0"
   },
   "jest": {