@leankylin-sheet/formula-parser 4.0.47 → 4.0.49

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

@@ -0,0 +1 @@
+export default function compareRange(exp1: any, exp2: any, type: any): boolean | (boolean | undefined)[] | undefined;

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

@@ -1,4 +1,4 @@
-declare function func(exp1: any, exp2: any): boolean | boolean[];
+declare function func(exp1: any, exp2: any): boolean | (boolean | undefined)[] | undefined;
 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 | boolean[];
+declare function func(exp1: any, exp2: any): boolean | (boolean | undefined)[] | undefined;
 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 | boolean[];
+declare function func(exp1: any, exp2: any): boolean | (boolean | undefined)[] | undefined;
 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 | boolean[];
+declare function func(exp1: any, exp2: any): boolean | (boolean | undefined)[] | undefined;
 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 | boolean[];
+declare function func(exp1: any, exp2: any): boolean | (boolean | undefined)[] | undefined;
 declare namespace func {
     export { SYMBOL };
 }

package/dist/index.esm.js

@@ -304,28 +304,41 @@ 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) {
+function compareRange(exp1, exp2, type) {
   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;
-    });
+      return compare(item === null || item === void 0 ? void 0 : item[0], exp2);
+    }, type);
   }
   if (!isArray1 && isArray2) {
     return exp2.map(function (item) {
-      return (item === null || item === void 0 ? void 0 : item[0]) === exp1;
-    });
+      return compare(exp1, item === null || item === void 0 ? void 0 : item[0]);
+    }, type);
+  }
+  return compare(exp1, exp2, type);
+}
+function compare(exp1, exp2, type) {
+  if (type === "<") {
+    return tsValue(exp1) < tsValue(exp2);
+  } else if (type === ">") {
+    return tsValue(exp1) > tsValue(exp2);
+  } else if (type === "<=") {
+    return tsValue(exp1) <= tsValue(exp2);
+  } else if (type === ">=") {
+    return tsValue(exp1) >= tsValue(exp2);
+  } else if (type === "=") {
+    return tsValue(exp1) === tsValue(exp2);
   }
-  return exp1 === exp2;
+}
+function tsValue(value) {
+  return value !== null && value !== void 0 ? value : 0;
+}
+
+var SYMBOL$3 = '=';
+function func$3(exp1, exp2) {
+  return compareRange(exp1, exp2, SYMBOL$3);
 }
 func$3.SYMBOL = SYMBOL$3;
 
@@ -396,79 +409,31 @@ function tsParams(fnName, params) {
       }
       return item;
     });
-  }
+  } else ;
   return params;
 }
 
 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;
+  return compareRange(exp1, exp2, SYMBOL$5);
 }
 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;
+  return compareRange(exp1, exp2, SYMBOL$6);
 }
 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;
+  return compareRange(exp1, exp2, SYMBOL$7);
 }
 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;
+  return compareRange(exp1, exp2, SYMBOL$8);
 }
 func$8.SYMBOL = SYMBOL$8;
 
@@ -1592,7 +1557,6 @@ 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

@@ -332,28 +332,41 @@ 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) {
+function compareRange(exp1, exp2, type) {
   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;
-    });
+      return compare(item === null || item === void 0 ? void 0 : item[0], exp2);
+    }, type);
   }
   if (!isArray1 && isArray2) {
     return exp2.map(function (item) {
-      return (item === null || item === void 0 ? void 0 : item[0]) === exp1;
-    });
+      return compare(exp1, item === null || item === void 0 ? void 0 : item[0]);
+    }, type);
+  }
+  return compare(exp1, exp2, type);
+}
+function compare(exp1, exp2, type) {
+  if (type === "<") {
+    return tsValue(exp1) < tsValue(exp2);
+  } else if (type === ">") {
+    return tsValue(exp1) > tsValue(exp2);
+  } else if (type === "<=") {
+    return tsValue(exp1) <= tsValue(exp2);
+  } else if (type === ">=") {
+    return tsValue(exp1) >= tsValue(exp2);
+  } else if (type === "=") {
+    return tsValue(exp1) === tsValue(exp2);
   }
-  return exp1 === exp2;
+}
+function tsValue(value) {
+  return value !== null && value !== void 0 ? value : 0;
+}
+
+var SYMBOL$3 = '=';
+function func$3(exp1, exp2) {
+  return compareRange(exp1, exp2, SYMBOL$3);
 }
 func$3.SYMBOL = SYMBOL$3;
 
@@ -424,79 +437,31 @@ function tsParams(fnName, params) {
       }
       return item;
     });
-  }
+  } else ;
   return params;
 }
 
 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;
+  return compareRange(exp1, exp2, SYMBOL$5);
 }
 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;
+  return compareRange(exp1, exp2, SYMBOL$6);
 }
 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;
+  return compareRange(exp1, exp2, SYMBOL$7);
 }
 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;
+  return compareRange(exp1, exp2, SYMBOL$8);
 }
 func$8.SYMBOL = SYMBOL$8;
 
@@ -1620,7 +1585,6 @@ 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.47",
+  "version": "4.0.49",
   "description": "Formula parser",
   "main": "dist/index.js",
   "module": "dist/index.esm.js",