@fw-components/formula-editor 2.0.7-formula-editor.8 → 2.0.7-formula-editor.9

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

@@ -28,6 +28,7 @@ export class Parser {
         let currentPosition = 0;
         // Previous 'token' (not a space or a new line) that we just encountered.
         let previousToken = "";
+        let currentTokens = "";
         // The object that we return as the output of the parsing result.
         let parseOutput = {
             recommendations: null,
@@ -107,7 +108,7 @@ export class Parser {
                     !isNumber &&
                     token != "(" &&
                     !((token == "-" || token == "+") &&
-                        (this.mathematicalOperators.has(previousToken)))) {
+                        (!currentTokens.trim() || this.mathematicalOperators.has(previousToken)))) {
                     parseOutput.errorString = `Expected variable/number at position ${currentPosition}`;
                     tokenClassName += " error";
                     expectation = Expectation.UNDEFINED;
@@ -174,6 +175,7 @@ export class Parser {
             formattedString = `${formattedString}<span class="wysiwygInternals ${tokenClassName}">${token}</span>`;
             currentPosition += token.length;
             previousToken = token;
+            currentTokens += token;
         });
         // If the formula ends with a mathematical operator, or has unclosed `(`
         if (this.mathematicalOperators.has(previousToken)) {
@@ -200,9 +202,10 @@ export class Parser {
         let previousToken = "";
         let carriedToken = null;
         const parsedTokens = [];
+        let currentTokens = "";
         for (const token of tokens) {
             if ((token == "+" || token == "-") &&
-                (this.mathematicalOperators.has(previousToken))) {
+                (!currentTokens.trim() || this.mathematicalOperators.has(previousToken))) {
                 carriedToken = token;
             }
             else if (carriedToken) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fw-components/formula-editor",
-  "version": "2.0.7-formula-editor.8",
+  "version": "2.0.7-formula-editor.9",
   "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": "ca9e8ea86309bdbc9755d3e51fdf00821a00b9b7"
+  "gitHead": "8ec9bb1e89c289c5334db8f99d1a359c731a4375"
 }