@fw-components/formula-editor 2.0.7-formula-editor.39 → 2.0.7-formula-editor.41

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

@@ -1,4 +1,4 @@
-export const mathematicalOperators = new Set(["^", "+", "-", "*", "/"]);
+export const mathematicalOperators = new Set(["+", "-", "*", "/", "^"]);
 export const unaryOperators = ["+", "-"];
 export const operatorPrecedence = {
     "^": 3,

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

@@ -19,6 +19,14 @@ export class Parser {
             return false;
         return !Number.isNaN(Number(value));
     }
+    formatFormulaToken(token) {
+        for (let existingKey of this.variables.keys()) {
+            if (existingKey.toLowerCase() === token.toLowerCase()) {
+                return existingKey;
+            }
+        }
+        return token;
+    }
     parseInput(formula, prevCurPos = null, recommendation = null) {
         const tokens = getFormulaTokens(formula, this.formulaRegex);
         const parentheses = new Stack();
@@ -38,6 +46,7 @@ export class Parser {
             return parseOutput;
         }
         tokens?.forEach((token) => {
+            token = this.formatFormulaToken(token);
             let isNumber = this.variables.has(token) || this.isNumber(token);
             const isOperator = this.allowedOperators.has(token);
             const isSpace = token.trim() === "";
@@ -81,11 +90,11 @@ export class Parser {
                  * Unknown symbol/variable/word
                  */
                 if (!(isNumber || isOperator || isBracket || isSpace)) {
-                    parseOutput.errorString = `${this.variableType} : ${token} does not exist`;
+                    parseOutput.errorString = `${this.variableType} : '${token}' does not exist`;
                     expectation = Expectation.UNDEFINED;
                 }
                 else if (this.allowedOperators.has(previousToken) && isOperator) {
-                    parseOutput.errorString = `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 === ")") {
@@ -98,14 +107,14 @@ export class Parser {
                  */
                 else if (expectation === Expectation.VARIABLE && !isNumber && !isSpace && token != "("
                     && !((unaryOperators.includes(token)) && (!parsedString.trim() || previousToken === "(" || this.allowedOperators.has(previousToken)))) {
-                    parseOutput.errorString = `Use ${this.variableType}${this.allowedNumbers ? " or numbers" : ""} after ${previousToken}.`;
+                    parseOutput.errorString = `Please use ${this.variableType}${this.allowedNumbers ? " or numbers" : ""} after '${previousToken}'.`;
                     expectation = Expectation.UNDEFINED;
                 }
                 /**
                  * Multiple number/variable together without operator
                  */
                 else if (expectation === Expectation.OPERATOR && !isOperator && !isSpace && token != ")") {
-                    parseOutput.errorString = `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;
                 }
                 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fw-components/formula-editor",
-  "version": "2.0.7-formula-editor.39",
+  "version": "2.0.7-formula-editor.41",
   "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": "a3fb82b15d40e80873eaefdc8ab5b1d0ae13096c"
+  "gitHead": "c53252d71f716dfcaf8a1c1e7637f09edb715b3f"
 }