@fw-components/formula-editor 2.2.1-fw-localize.0 → 2.3.1

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

@@ -90,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}' doesn't exist.`;
                     expectation = Expectation.UNDEFINED;
                 }
                 else if (this.allowedOperators.has(previousToken) && isOperator) {
-                    parseOutput.errorString = `Please use ${this.variableType}${this.allowedNumbers ? " or numbers" : ""} after '${previousToken}'. Pls do not use consecutive two mathametical operators (+ - * / ^)`;
+                    parseOutput.errorString = `Please don't use mathematical operators (${Array.from(this.allowedOperators).join(" ")}) consecutively.`;
                     expectation = Expectation.UNDEFINED;
                 }
                 else if (parentheses.isEmpty() && token === ")") {
@@ -107,28 +107,28 @@ export class Parser {
                  */
                 else if (expectation === Expectation.VARIABLE && !isNumber && !isSpace && token != "("
                     && !((unaryOperators.includes(token)) && (!parsedString.trim() || previousToken === "(" || this.allowedOperators.has(previousToken)))) {
-                    parseOutput.errorString = `Please use ${this.variableType}${this.allowedNumbers ? " or numbers" : ""} after '${previousToken}'.`;
+                    parseOutput.errorString = `Please use ${this.variableType} ${this.variableType && this.allowedNumbers ? " or " : ''} ${this.allowedNumbers ? "numbers" : ""} after '${previousToken}'.`;
                     expectation = Expectation.UNDEFINED;
                 }
                 /**
                  * Multiple number/variable together without operator
                  */
                 else if (expectation === Expectation.OPERATOR && !isOperator && !isSpace && token != ")") {
-                    parseOutput.errorString = `Please use mathametical operators (${Array.from(this.allowedOperators).join(" ")}) after '${previousToken}'.`;
+                    parseOutput.errorString = `Please use mathematical 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 is not possible`;
+                    parseOutput.errorString = `Division by zero is not possible.`;
                     expectation = Expectation.UNDEFINED;
                 }
                 /**
                  * Empty brackets
                  */
                 else if (previousToken === "(" && token === ")") {
-                    parseOutput.errorString = `Pls do not use empty brackets ().`;
+                    parseOutput.errorString = `Please don't use empty brackets ().`;
                     expectation = Expectation.UNDEFINED;
                 }
             }
@@ -161,7 +161,7 @@ export class Parser {
             parseOutput.recommendations = !parseOutput.errorString?.length ? Array.from(this.variables.keys()) : [];
         }
         if (this.allowedOperators.has(previousToken)) {
-            parseOutput.errorString = `Pls do not use mathametical operators (${Array.from(this.allowedOperators).join(",")}) at the end.`;
+            parseOutput.errorString = `Please don't use mathematical operators (${Array.from(this.allowedOperators).join(" ")}) at the end.`;
         }
         if (!parentheses.isEmpty()) {
             parseOutput.errorString = "Unexpected opening bracket. Make sure all closing brackets ')' have matching opening brackets '('.";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fw-components/formula-editor",
-  "version": "2.2.1-fw-localize.0",
+  "version": "2.3.1",
   "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.2.1-fw-localize.0",
+    "@fw-components/styles": "^2.3.1",
     "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": "64ef7b85d640e3bc8ce0d5c760f82cf040e5f57a"
+  "gitHead": "f563fb5a8936a1767f930a8d98a0fe686e963293"
 }