@fw-components/formula-editor 2.0.7-formula-editor.36 → 2.0.7-formula-editor.37

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

@@ -37,7 +37,7 @@ let FormulaEditor = class FormulaEditor extends LitElement {
             this._adjustTextAreaHeight();
         }
         if (_changedProperties.has("variables")) {
-            this._parser = new Parser(this.variables, this.formulaRegex, this.allowedNumbers, this.allowedOperators, this.minSuggestionLen);
+            this._parser = new Parser(this.variables, this.formulaRegex, this.allowedNumbers, this.allowedOperators, this.variableType, this.minSuggestionLen);
             this.recommendations = Array.from(this.variables.keys());
         }
     }
@@ -202,6 +202,9 @@ __decorate([
 __decorate([
     property()
 ], FormulaEditor.prototype, "allowedOperators", void 0);
+__decorate([
+    property()
+], FormulaEditor.prototype, "variableType", void 0);
 __decorate([
     query("#wysiwyg-editor")
 ], FormulaEditor.prototype, "editor", void 0);

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

@@ -6,12 +6,13 @@ import { Expectation } from "../types";
 import { operatorPrecedence, unaryOperators } from "./constants.js";
 import { getFormulaTokens } from "./get-formula-tokens.js";
 export class Parser {
-    constructor(variables, formulaRegex, allowedNumbers, allowedOperators, minSuggestionLen) {
+    constructor(variables, formulaRegex, allowedNumbers, allowedOperators, variableType, minSuggestionLen) {
         this.variables = variables;
         this.formulaRegex = formulaRegex;
         this._recommender = new Recommender(Array.from(this.variables.keys()), minSuggestionLen);
         this.allowedNumbers = allowedNumbers;
         this.allowedOperators = allowedOperators;
+        this.variableType = variableType;
     }
     isNumber(value) {
         if (!this.allowedNumbers || value.trim() === "")
@@ -74,14 +75,21 @@ export class Parser {
             /**
              * Error checks
              * skip error check if there is one already
-             */
+            */
             if (expectation != Expectation.UNDEFINED) {
-                if (this.allowedOperators.has(previousToken) && isOperator) {
-                    parseOutput.errorString = `Multiple operators at position ${currentPosition}`;
+                /**
+                 * Unknown symbol/variable/word
+                 */
+                if (!(isNumber || isOperator || isBracket || isSpace)) {
+                    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 (+,-,*,/,^)`;
                     expectation = Expectation.UNDEFINED;
                 }
                 else if (parentheses.isEmpty() && token === ")") {
-                    parseOutput.errorString = `Unexpected ')' at position ${currentPosition}`;
+                    parseOutput.errorString = "Unexpected closing bracket. Make sure all opening brackets '(' have matching closing brackets ')'.";
                     expectation = Expectation.UNDEFINED;
                 }
                 /**
@@ -90,35 +98,28 @@ export class Parser {
                  */
                 else if (expectation === Expectation.VARIABLE && !isNumber && !isSpace && token != "("
                     && !((unaryOperators.includes(token)) && (!parsedString.trim() || previousToken === "(" || this.allowedOperators.has(previousToken)))) {
-                    parseOutput.errorString = `Expected variable/number at position ${currentPosition}`;
+                    parseOutput.errorString = `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 = `Expected mathematical operator at position ${currentPosition}`;
-                    expectation = Expectation.UNDEFINED;
-                }
-                /**
-                 * Unknown symbol/variable/word
-                 */
-                else if (!(isNumber || isOperator || isBracket || isSpace)) {
-                    parseOutput.errorString = `Unknown word at position ${currentPosition}`;
+                    parseOutput.errorString = `Use mathametical operators (${Array.from(this.allowedOperators).join(",")}) after ${previousToken}.`;
                     expectation = Expectation.UNDEFINED;
                 }
                 /**
                  * division by zero
                  */
                 else if (isNumber && previousToken === "/" && (this.variables.get(token) === 0 || Number(token) === 0)) {
-                    parseOutput.errorString = `Division by zero at position ${currentPosition}`;
+                    parseOutput.errorString = `Division by zero is not possible`;
                     expectation = Expectation.UNDEFINED;
                 }
                 /**
                  * Empty brackets
                  */
                 else if (previousToken === "(" && token === ")") {
-                    parseOutput.errorString = `Empty brackets at position ${currentPosition}`;
+                    parseOutput.errorString = `Pls do not use empty brackets ().`;
                     expectation = Expectation.UNDEFINED;
                 }
             }
@@ -151,10 +152,10 @@ export class Parser {
             parseOutput.recommendations = !parseOutput.errorString?.length ? Array.from(this.variables.keys()) : [];
         }
         if (this.allowedOperators.has(previousToken)) {
-            parseOutput.errorString = `Unexpected ending with mathematical operator at position: ${currentPosition}`;
+            parseOutput.errorString = `Pls do not use mathametical operators (${Array.from(this.allowedOperators).join(",")}) at the end.`;
         }
         if (!parentheses.isEmpty()) {
-            parseOutput.errorString = `Unclosed '(' at position: ${parentheses.top()}`;
+            parseOutput.errorString = "Unexpected opening bracket. Make sure all closing brackets ')' have matching opening brackets '('.";
         }
         return parseOutput;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fw-components/formula-editor",
-  "version": "2.0.7-formula-editor.36",
+  "version": "2.0.7-formula-editor.37",
   "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": "78fd3b78f8f72ac4ab0b4b7ec57848b2a78cccad"
+  "gitHead": "a9c51fbd40797afbd0fc3b65ee780656edb1114f"
 }