@leankylin-sheet/formula-parser 4.0.42 → 4.0.44

package/dist/evaluate-by-operator/operator/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/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/greater-than.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/less-than.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/helper/number.d.ts

@@ -1,2 +1,3 @@
 export function toNumber(number: string | number): any;
 export function invertNumber(number: number): number;
+export function toNumberNotNaN(number: any): number;

package/dist/index.esm.js

@@ -177,6 +177,9 @@ function _nonIterableRest() {
 function toNumber(number) {
   var _result;
   var result;
+  if (number === true) {
+    return 1;
+  }
   if (typeof number === 'number') {
     result = number;
   } else if (typeof number === 'string') {
@@ -194,6 +197,22 @@ function toNumber(number) {
 function invertNumber(number) {
   return -1 * toNumber(number);
 }
+function toNumberNotNaN(number) {
+  var _result2;
+  var result;
+  if (number === true) {
+    return 1;
+  }
+  if (typeof number === 'number') {
+    result = number;
+  } else if (typeof number === 'string') {
+    result = number.indexOf('.') > -1 ? parseFloat(number) : parseInt(number, 10);
+  }
+  if (isNaN(result)) {
+    return 0;
+  }
+  return (_result2 = result) !== null && _result2 !== void 0 ? _result2 : 0;
+}
 
 var ERROR = 'ERROR';
 var ERROR_DIV_ZERO = 'DIV/0';
@@ -285,7 +304,26 @@ function func$2(first) {
 func$2.SYMBOL = SYMBOL$2;
 
 var SYMBOL$3 = '=';
+
+// export default function func(exp1, exp2) {
+//   console.log('zzzzz', exp1, exp2)
+
+//   return exp1 === exp2;
+// }
+
 function func$3(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 (item === null || item === void 0 ? void 0 : item[0]) === exp1;
+    });
+  }
   return exp1 === exp2;
 }
 func$3.SYMBOL = SYMBOL$3;
@@ -306,12 +344,19 @@ function func$4(symbol) {
         return item;
       }
     });
-    var symbolParts = symbol.split('.');
+    var symbolParts = symbol.split(".");
     var foundFormula = false;
     var result;
     if (symbolParts.length === 1) {
       if (formulajs[symbolParts[0]]) {
         foundFormula = true;
+        if (symbolParts[0] === "SUMPRODUCT") {
+          var _params2;
+          params = (_params2 = params) === null || _params2 === void 0 ? void 0 : _params2.map(function (item) {
+            var _item$flat;
+            return (item === null || item === void 0 ? void 0 : item.flat) ? (_item$flat = item.flat()) === null || _item$flat === void 0 ? void 0 : _item$flat.map(toNumberNotNaN) : toNumberNotNaN(item);
+          });
+        }
         result = formulajs[symbolParts[0]].apply(formulajs, _toConsumableArray(params));
       }
     } else {
@@ -342,24 +387,72 @@ func$4.SYMBOL = SYMBOL$4;
 
 var SYMBOL$5 = '>';
 function func$5(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$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;
 
 var SYMBOL$7 = '<';
 function func$7(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$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;
@@ -379,11 +472,39 @@ function func$9(first) {
 }
 func$9.SYMBOL = SYMBOL$9;
 
-var SYMBOL$a = '*';
+var SYMBOL$a = "*";
+
+// export default function func(first, ...rest) {
+//   console.log('first',first, rest)
+//   const result = rest.reduce((acc, value) => acc * toNumber(value), toNumber(first));
+
+//   if (isNaN(result)) {
+//     throw Error(ERROR_VALUE);
+//   }
+
+//   return result;
+// }
+
 function func$a(first) {
   for (var _len = arguments.length, rest = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
     rest[_key - 1] = arguments[_key];
   }
+  var isArray1 = Array.isArray(first);
+  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);
+      }, toNumber(item));
+      if (isNaN(v)) {
+        throw Error(ERROR_VALUE);
+      }
+      return v;
+    });
+    return dd;
+  }
   var result = rest.reduce(function (acc, value) {
     return acc * toNumber(value);
   }, toNumber(first));
@@ -1443,6 +1564,7 @@ var parser = {
             }
             r = _this.performAction.apply(yyval, [yytext, yyleng, yylineno, sharedState.yy, action[1], vstack, lstack].concat(args));
             if (typeof r !== "undefined") {
+              console.log('r', r);
               return {
                 v: r
               };

package/dist/index.js

@@ -205,6 +205,9 @@ function _nonIterableRest() {
 function toNumber(number) {
   var _result;
   var result;
+  if (number === true) {
+    return 1;
+  }
   if (typeof number === 'number') {
     result = number;
   } else if (typeof number === 'string') {
@@ -222,6 +225,22 @@ function toNumber(number) {
 function invertNumber(number) {
   return -1 * toNumber(number);
 }
+function toNumberNotNaN(number) {
+  var _result2;
+  var result;
+  if (number === true) {
+    return 1;
+  }
+  if (typeof number === 'number') {
+    result = number;
+  } else if (typeof number === 'string') {
+    result = number.indexOf('.') > -1 ? parseFloat(number) : parseInt(number, 10);
+  }
+  if (isNaN(result)) {
+    return 0;
+  }
+  return (_result2 = result) !== null && _result2 !== void 0 ? _result2 : 0;
+}
 
 var ERROR = 'ERROR';
 var ERROR_DIV_ZERO = 'DIV/0';
@@ -313,7 +332,26 @@ function func$2(first) {
 func$2.SYMBOL = SYMBOL$2;
 
 var SYMBOL$3 = '=';
+
+// export default function func(exp1, exp2) {
+//   console.log('zzzzz', exp1, exp2)
+
+//   return exp1 === exp2;
+// }
+
 function func$3(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 (item === null || item === void 0 ? void 0 : item[0]) === exp1;
+    });
+  }
   return exp1 === exp2;
 }
 func$3.SYMBOL = SYMBOL$3;
@@ -334,12 +372,19 @@ function func$4(symbol) {
         return item;
       }
     });
-    var symbolParts = symbol.split('.');
+    var symbolParts = symbol.split(".");
     var foundFormula = false;
     var result;
     if (symbolParts.length === 1) {
       if (formulajs__namespace[symbolParts[0]]) {
         foundFormula = true;
+        if (symbolParts[0] === "SUMPRODUCT") {
+          var _params2;
+          params = (_params2 = params) === null || _params2 === void 0 ? void 0 : _params2.map(function (item) {
+            var _item$flat;
+            return (item === null || item === void 0 ? void 0 : item.flat) ? (_item$flat = item.flat()) === null || _item$flat === void 0 ? void 0 : _item$flat.map(toNumberNotNaN) : toNumberNotNaN(item);
+          });
+        }
         result = formulajs__namespace[symbolParts[0]].apply(formulajs__namespace, _toConsumableArray(params));
       }
     } else {
@@ -370,24 +415,72 @@ func$4.SYMBOL = SYMBOL$4;
 
 var SYMBOL$5 = '>';
 function func$5(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$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;
 
 var SYMBOL$7 = '<';
 function func$7(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$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;
@@ -407,11 +500,39 @@ function func$9(first) {
 }
 func$9.SYMBOL = SYMBOL$9;
 
-var SYMBOL$a = '*';
+var SYMBOL$a = "*";
+
+// export default function func(first, ...rest) {
+//   console.log('first',first, rest)
+//   const result = rest.reduce((acc, value) => acc * toNumber(value), toNumber(first));
+
+//   if (isNaN(result)) {
+//     throw Error(ERROR_VALUE);
+//   }
+
+//   return result;
+// }
+
 function func$a(first) {
   for (var _len = arguments.length, rest = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
     rest[_key - 1] = arguments[_key];
   }
+  var isArray1 = Array.isArray(first);
+  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);
+      }, toNumber(item));
+      if (isNaN(v)) {
+        throw Error(ERROR_VALUE);
+      }
+      return v;
+    });
+    return dd;
+  }
   var result = rest.reduce(function (acc, value) {
     return acc * toNumber(value);
   }, toNumber(first));
@@ -1471,6 +1592,7 @@ var parser = {
             }
             r = _this.performAction.apply(yyval, [yytext, yyleng, yylineno, sharedState.yy, action[1], vstack, lstack].concat(args));
             if (typeof r !== "undefined") {
+              console.log('r', r);
               return {
                 v: r
               };

package/package.json

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