@fw-components/formula-editor 2.0.7-formula-editor-enhancements.2 → 2.0.7-formula-editor-enhancements.4

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

@@ -91,13 +91,17 @@ export class Parser {
                     token = recommendation;
                     recommendation = null;
                 }
-                parseOutput.recommendations = this.mathematicalOperators.has(token) ? Array.from(this.variables.keys()) : this._recommender.getRecommendation(token);
+                parseOutput.recommendations = this._recommender.getRecommendation(token);
             }
             let tokenClassName = "";
             // Don't check for errors if an error has already been encountered.
             if (expectation != Expectation.UNDEFINED) {
+                if (this.mathematicalOperators.has(previousToken) && isOperator) {
+                    parseOutput.errorString = `Unexpected same operator at position ${currentPosition}`;
+                    expectation = Expectation.UNDEFINED;
+                }
                 // Unnecessary closing parenthesis
-                if (parentheses.isEmpty() && token == ")") {
+                else if (parentheses.isEmpty() && token == ")") {
                     parseOutput.errorString = `Unexpected ')' at position ${currentPosition}`;
                     tokenClassName += " error";
                     expectation = Expectation.UNDEFINED;
@@ -329,7 +333,10 @@ export class Parser {
         while (!rpn.isEmpty()) {
             const frontItem = rpn.dequeue();
             if (!this.mathematicalOperators.has(frontItem)) {
-                calcStack.push(Big(Number.parseFloat(this.variables.get(frontItem)?.toString() ?? frontItem)));
+                const sign = frontItem[0] === "+" || frontItem[0] === "-" ? frontItem[0] : "";
+                const key = sign ? frontItem.substring(1) : frontItem;
+                const number = sign + (this.variables.get(key)?.toString() ?? key);
+                calcStack.push(Big(Number.parseFloat(number)));
             }
             else {
                 let operator = frontItem;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fw-components/formula-editor",
-  "version": "2.0.7-formula-editor-enhancements.2",
+  "version": "2.0.7-formula-editor-enhancements.4",
   "description": "A WYSIWYG type formula editor",
   "main": "dist/formula-editor/src/formula-builder.js",
   "publishConfig": {
@@ -25,5 +25,5 @@
     "@types/big.js": "^6.1.6",
     "es-dev-server": "^2.1.0"
   },
-  "gitHead": "d1d3c9cad9faf31d3ef0192c0c1d0f6604be41e2"
+  "gitHead": "0cd3939b50f778354aa7b89072c09c1c55aeaee8"
 }