@fw-components/formula-editor 2.0.7-formula-editor.34 → 2.0.7-formula-editor.35

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

@@ -9,6 +9,7 @@ import { customElement, property, state, query } from "lit/decorators.js";
 import "./suggestion-menu.js";
 import { Parser } from "./utils/parser.js";
 import { FormulaEditorStyles } from "./styles/editor.js";
+import { getFormulaTokens } from "./utils/get-formula-tokens.js";
 let FormulaEditor = class FormulaEditor extends LitElement {
     constructor() {
         super(...arguments);
@@ -23,6 +24,7 @@ let FormulaEditor = class FormulaEditor extends LitElement {
         this.variables = new Map();
         this.minSuggestionLen = 2;
         this.errorString = "";
+        this.formulaRegex = /'[^']*'|[A-Za-z0-9_#@]+|[-+(),*^/\s]/g;
     }
     firstUpdated(_changedProperties) {
         this.editor.focus();
@@ -35,7 +37,7 @@ let FormulaEditor = class FormulaEditor extends LitElement {
             this._adjustTextAreaHeight();
         }
         if (_changedProperties.has("variables")) {
-            this._parser = new Parser(this.variables, this.minSuggestionLen);
+            this._parser = new Parser(this.variables, this.formulaRegex, this.minSuggestionLen);
             this.recommendations = Array.from(this.variables.keys());
         }
     }
@@ -87,6 +89,7 @@ let FormulaEditor = class FormulaEditor extends LitElement {
                 formulaString: this.content,
                 error: this.errorString,
                 recommendations: this.recommendations,
+                formulaTokens: getFormulaTokens(this.content || "", this.formulaRegex)
             },
             bubbles: true,
         }));
@@ -186,6 +189,9 @@ __decorate([
 __decorate([
     property()
 ], FormulaEditor.prototype, "errorString", void 0);
+__decorate([
+    property()
+], FormulaEditor.prototype, "formulaRegex", void 0);
 __decorate([
     query("#wysiwyg-editor")
 ], FormulaEditor.prototype, "editor", void 0);

package/dist/formula-editor/src/utils/get-formula-tokens.js

@@ -0,0 +1,5 @@
+export function getFormulaTokens(formulaString, formulaRegex) {
+    if (!formulaString?.length)
+        return [];
+    return formulaString.match(formulaRegex) || [];
+}

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

@@ -4,18 +4,15 @@ import { Stack } from "./stack.js";
 import { Queue } from "./queue.js";
 import { Expectation } from "../types";
 import { mathematicalOperators, operatorPrecedence, unaryOperators } from "./constants.js";
+import { getFormulaTokens } from "./get-formula-tokens.js";
 export class Parser {
-    constructor(variables, minSuggestionLen) {
+    constructor(variables, formulaRegex, minSuggestionLen) {
         this.variables = variables;
+        this.formulaRegex = formulaRegex;
         this._recommender = new Recommender(Array.from(this.variables.keys()), minSuggestionLen);
     }
-    getFormulaTokens(formulaString) {
-        if (!formulaString?.length)
-            return [];
-        return formulaString.match(/'[^']*'|[A-Za-z0-9_#@]+|[-+(),*^/\s]/g);
-    }
     parseInput(formula, prevCurPos = null, recommendation = null) {
-        const tokens = this.getFormulaTokens(formula);
+        const tokens = getFormulaTokens(formula, this.formulaRegex);
         const parentheses = new Stack();
         let expectation = Expectation.VARIABLE;
         let currentPosition = 0;
@@ -157,7 +154,7 @@ export class Parser {
     buildRPN(formula) {
         if (this.parseInput(formula).errorString)
             return null;
-        const tokens = this.getFormulaTokens(formula)?.filter((el) => !/\s+/.test(el) && el !== "");
+        const tokens = getFormulaTokens(formula, this.formulaRegex)?.filter((el) => !/\s+/.test(el) && el !== "");
         let previousToken = "";
         let carriedToken = null;
         const parsedTokens = [];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fw-components/formula-editor",
-  "version": "2.0.7-formula-editor.34",
+  "version": "2.0.7-formula-editor.35",
   "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": "bdf6225910be4141015192c528d44ea62ca2eecf"
+  "gitHead": "ef64463d26814b5eb6389aa3a1f9ce12f26c46a6"
 }