@fw-components/formula-editor 2.0.7-formula-editor.43 → 2.1.1-formula-editor-regex-fix.0

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

@@ -6,7 +6,7 @@ import { Expectation } from "../types";
 import { operatorPrecedence, unaryOperators, mathematicalOperators } from "./constants.js";
 import { getFormulaTokens } from "./get-formula-tokens.js";
 export class Parser {
-    constructor(variables, minSuggestionLen, formulaRegex = /[A-Za-z0-9_#@]+|[-+(),*^/\s]/g, allowedNumbers = true, allowedOperators = mathematicalOperators, variableType = "") {
+    constructor(variables, minSuggestionLen, formulaRegex = /[A-Za-z0-9_#@.]+|[-+(),*^/\s]/g, allowedNumbers = true, allowedOperators = mathematicalOperators, variableType = "") {
         this.variables = variables;
         this.formulaRegex = formulaRegex;
         this._recommender = new Recommender(Array.from(this.variables.keys()), minSuggestionLen);
@@ -66,7 +66,7 @@ export class Parser {
                 if (recommendation) {
                     isNumber = true;
                     if (this.allowedOperators.has(token)) {
-                        const updatedTokenString = `${token} ${recommendation}`;
+                        const updatedTokenString = `${token} ${recommendation} `;
                         parseOutput.formattedString += updatedTokenString;
                         currentPosition += updatedTokenString.length;
                         parseOutput.newCursorPosition = currentPosition;
@@ -75,8 +75,8 @@ export class Parser {
                     }
                     ;
                     const updatedTokenLength = recommendation.length - token.length;
-                    parseOutput.newCursorPosition = Math.min(parseOutput.newCursorPosition, formula.length) + updatedTokenLength;
-                    token = recommendation;
+                    parseOutput.newCursorPosition = Math.min(parseOutput.newCursorPosition, formula.length) + updatedTokenLength + 1;
+                    token = recommendation + " ";
                     recommendation = null;
                 }
                 parseOutput.recommendations = this._recommender.getRecommendations(token);
@@ -153,8 +153,8 @@ export class Parser {
             previousToken = token;
         });
         if (recommendation) {
-            parseOutput.newCursorPosition = Math.min(parseOutput.newCursorPosition, formula.length) + recommendation.length;
-            parseOutput.formattedString += recommendation;
+            parseOutput.newCursorPosition = Math.min(parseOutput.newCursorPosition, formula.length) + recommendation.length + 1;
+            parseOutput.formattedString += recommendation + " ";
             previousToken = recommendation;
         }
         if (this.allowedOperators.has(previousToken) || !previousToken.trim().length) {
@@ -285,9 +285,13 @@ export class Parser {
         while (!formulaRPN.isEmpty()) {
             const frontItem = formulaRPN.dequeue();
             if (!this.allowedOperators.has(frontItem)) {
+                console.log("frontitem", frontItem);
                 const [sign, variableKey] = /^[+-]/.test(frontItem) ? [frontItem[0], frontItem.slice(1)] : ["", frontItem];
                 const operandValue = Number.parseFloat(this.variables.get(variableKey)?.toString() ?? variableKey);
+                console.log("sign", sign);
+                console.log("variable", variableKey);
                 const number = Number.parseFloat(sign + "1") * operandValue;
+                console.log("number", number);
                 calcStack.push(Big(number));
             }
             else {
@@ -301,6 +305,7 @@ export class Parser {
                 try {
                     switch (operator) {
                         case "+":
+                            console.log("+", numA, " ", numB);
                             calcStack.push(Big(numA).add(Big(numB)));
                             break;
                         case "-":

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fw-components/formula-editor",
-  "version": "2.0.7-formula-editor.43",
+  "version": "2.1.1-formula-editor-regex-fix.0",
   "description": "A WYSIWYG type formula editor",
   "main": "dist/formula-editor/src/formula-editor.js",
   "exports": {
@@ -19,7 +19,7 @@
     "prepublishOnly": "npm run build"
   },
   "dependencies": {
-    "@fw-components/styles": "^2.0.7-formula-editor.0",
+    "@fw-components/styles": "^2.1.1-formula-editor-regex-fix.0",
     "big.js": "^6.2.1",
     "lit": "^2.1.2",
     "match-sorter": "^8.0.0",
@@ -31,5 +31,5 @@
     "@types/big.js": "^6.1.6",
     "es-dev-server": "^2.1.0"
   },
-  "gitHead": "0e8a0a79fb18efde64373e0d2ae7c5df9c56ad59"
+  "gitHead": "701ff5ec75328a31286c1fc3c4359d90d16dd288"
 }