@fw-components/formula-editor 2.0.7-formula-editor.40 → 2.0.7-formula-editor.42

package/dist/formula-editor/src/utils/parser.js

@@ -94,7 +94,7 @@ export class Parser {
                     expectation = Expectation.UNDEFINED;
                 }
                 else if (this.allowedOperators.has(previousToken) && isOperator) {
-                    parseOutput.errorString = `Please use ${this.variableType}${this.allowedNumbers ? " or numbers" : ""} after '${previousToken}'. Pls do not use consecutive two mathametical operators (+ ,- ,* ,/ ,^)`;
+                    parseOutput.errorString = `Please use ${this.variableType}${this.allowedNumbers ? " or numbers" : ""} after '${previousToken}'. Pls do not use consecutive two mathametical operators (+ - * / ^)`;
                     expectation = Expectation.UNDEFINED;
                 }
                 else if (parentheses.isEmpty() && token === ")") {
@@ -114,7 +114,7 @@ export class Parser {
                  * Multiple number/variable together without operator
                  */
                 else if (expectation === Expectation.OPERATOR && !isOperator && !isSpace && token != ")") {
-                    parseOutput.errorString = `Please use mathametical operators (${Array.from(this.allowedOperators).join(", ")}) after ${previousToken}.`;
+                    parseOutput.errorString = `Please use mathametical operators (${Array.from(this.allowedOperators).join(" ")}) after '${previousToken}'.`;
                     expectation = Expectation.UNDEFINED;
                 }
                 /**
@@ -201,13 +201,13 @@ export class Parser {
                 operatorStack.push("(");
             }
             else if (token === ")") {
-                while (operatorStack.top() != "(") {
+                while (!operatorStack.isEmpty() && operatorStack.top() != "(") {
                     outputQueue.enqueue(operatorStack.pop());
                 }
                 operatorStack.pop();
             }
             else if (this.allowedOperators.has(token)) {
-                while (this.allowedOperators.has(operatorStack.top()) && operatorPrecedence[token] <= operatorPrecedence[operatorStack.top()]) {
+                while (!operatorStack.isEmpty() && this.allowedOperators.has(operatorStack.top()) && operatorPrecedence[token] <= operatorPrecedence[operatorStack.top()]) {
                     outputQueue.enqueue(operatorStack.pop());
                 }
                 operatorStack.push(token);
@@ -216,7 +216,7 @@ export class Parser {
                 outputQueue.enqueue(token);
             }
         }
-        while (operatorStack.top()) {
+        while (!operatorStack.isEmpty() && operatorStack.top()) {
             outputQueue.enqueue(operatorStack.pop());
         }
         return outputQueue;
@@ -306,7 +306,7 @@ export class Parser {
                             calcStack.push(Big(numA).mul(Big(numB)));
                             break;
                         case "/":
-                            if (parseFloat(Big(numB).toString()) === 0) {
+                            if (Big(numB).eq(0)) {
                                 calculationResult.errorString = "Division by zero encountered";
                                 return calculationResult;
                             }
@@ -322,6 +322,10 @@ export class Parser {
                 }
             }
         }
+        if (calcStack.isEmpty()) {
+            calculationResult.errorString = "Calculation error: Empty result stack";
+            return calculationResult;
+        }
         calculationResult.result = parseFloat(calcStack.top().toString());
         return calculationResult;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fw-components/formula-editor",
-  "version": "2.0.7-formula-editor.40",
+  "version": "2.0.7-formula-editor.42",
   "description": "A WYSIWYG type formula editor",
   "main": "dist/formula-editor/src/formula-editor.js",
   "exports": {
@@ -31,5 +31,5 @@
     "@types/big.js": "^6.1.6",
     "es-dev-server": "^2.1.0"
   },
-  "gitHead": "5bf490d4aae797852b522a53bec12fcbf3d524bd"
+  "gitHead": "13003cbdce348fbc73c50bb9a650460f344b4b88"
 }