@fw-components/formula-editor 2.4.0 → 2.4.1-handle-unary-prefixes.0

package/dist/utils/parser.js

@@ -19,6 +19,22 @@ export class Parser {
             return false;
         return !Number.isNaN(Number(value));
     }
+    /**
+     * Checks whether a token (possibly prefixed with a unary operator from buildRPN pre-processing)
+     * is a valid operand: a known variable, a number, or a unary-prefixed variable like "-DIST".
+     */
+    isOperand(token) {
+        if (!token.trim().length)
+            return false;
+        if (!Number.isNaN(Number(token)) || this.variables.has(token))
+            return true;
+        // Handle tokens combined with a unary prefix during buildRPN pre-processing (e.g. "-DIST")
+        if (token.length > 1 && unaryOperators.includes(token[0])) {
+            const inner = token.substring(1);
+            return !Number.isNaN(Number(inner)) || this.variables.has(inner);
+        }
+        return false;
+    }
     formatFormulaToken(token) {
         for (const existingKey of this.variables.keys()) {
             if (existingKey.toLowerCase() === token.toLowerCase()) {
@@ -179,7 +195,8 @@ export class Parser {
         let carriedToken = null;
         const parsedTokens = [];
         let currentTokens = "";
-        // Check if variables include unary operators `-` and `+`.
+        // Combine unary operators with the following operand (e.g. "-" + "DIST" → "-DIST").
+        // This mirrors parseInput's validation: unary +/- is legal at the start, after "(" or after an operator.
         for (const token of tokens) {
             if (unaryOperators.includes(token) && (!currentTokens.trim() || previousToken === "(" || this.allowedOperators.has(previousToken))) {
                 carriedToken = token;
@@ -215,7 +232,7 @@ export class Parser {
                 }
                 operatorStack.push(token);
             }
-            else if ((!Number.isNaN(Number(token)) || this.variables.has(token)) && token.trim().length) {
+            else if (this.isOperand(token)) {
                 outputQueue.enqueue(token);
             }
         }
@@ -237,10 +254,7 @@ export class Parser {
         lexedRPN.forEach((symbol) => {
             let parsedLeftExpression;
             let parsedRightExpression;
-            // check if the symbol is a number or variable or unaryOperatorPreceded Variable
-            if ((unaryOperators.includes(symbol[0]) && this.variables.has(symbol.substring(1))) ||
-                this.variables.has(symbol) ||
-                (!Number.isNaN(parseFloat(symbol)) && Number.isFinite(parseFloat(symbol)))) {
+            if (this.isOperand(symbol)) {
                 resultStack.push(symbol);
                 operatorStack.push(null);
             }
@@ -280,8 +294,8 @@ export class Parser {
         const calcStack = new Stack();
         while (!formulaRPN.isEmpty()) {
             const frontItem = formulaRPN.dequeue();
-            if (!this.allowedOperators.has(frontItem)) {
-                const [sign, variableKey] = /^[+-]/.test(frontItem) ? [frontItem[0], frontItem.slice(1)] : ["", frontItem];
+            if (this.isOperand(frontItem)) {
+                const [sign, variableKey] = /^[+-]/.test(frontItem) && frontItem.length > 1 ? [frontItem[0], frontItem.slice(1)] : ["", frontItem];
                 const operandValue = Number.parseFloat(this.variables.get(variableKey)?.toString() ?? variableKey);
                 const number = Number.parseFloat(`${sign}1`) * operandValue;
                 calcStack.push(Big(number));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fw-components/formula-editor",
-  "version": "2.4.0",
+  "version": "2.4.1-handle-unary-prefixes.0",
   "description": "A WYSIWYG type formula editor",
   "main": "dist/formula-editor/src/formula-editor.js",
   "exports": {
@@ -15,6 +15,8 @@
   "scripts": {
     "build": "tsc --composite false",
     "dev": "tsc -w --composite false",
+    "test": "vitest run",
+    "test:watch": "vitest",
     "prepublishOnly": "npm run build"
   },
   "dependencies": {
@@ -32,7 +34,8 @@
   "devDependencies": {
     "@types/big.js": "6.2.2",
     "es-dev-server": "2.1.0",
-    "typescript": "5.9.3"
+    "typescript": "5.9.3",
+    "vitest": "2.1.9"
   },
-  "gitHead": "1aabc46174564e7c9f3046218744244a77568b54"
+  "gitHead": "63182a0895c61c558359cfd9db69ef0f15f5f727"
 }