autoql-fe-utils 1.11.10 → 1.11.12

package/dist/index.global.js

@@ -21583,26 +21583,36 @@
   var isValueEmpty = (value) => {
     return value === null || value === void 0 || value === "";
   };
+  var validateBracketNesting = (bracketArray) => {
+    let depth = 0;
+    for (let i = 0; i < bracketArray.length; i++) {
+      const chunk = bracketArray[i];
+      if (chunk.value === "LEFT_BRACKET" /* LEFT_BRACKET */) {
+        depth++;
+      } else if (chunk.value === "RIGHT_BRACKET" /* RIGHT_BRACKET */) {
+        depth--;
+        if (depth < 0) {
+          throw new ChataError("Syntax Error: Formula contains closing bracket without opening");
+        }
+      }
+    }
+    if (depth !== 0) {
+      throw new ChataError("Syntax Error: Formula contains unclosed brackets");
+    }
+  };
   var convertToFunctionStr = (origColumnFnArray) => {
-    var _a, _b;
     try {
       let columnFnStr = "";
-      const numRightBrackets = (_a = origColumnFnArray.filter(
-        (chunk) => chunk.value === "RIGHT_BRACKET" /* RIGHT_BRACKET */
-      )) == null ? void 0 : _a.length;
-      const numLeftBrackets = (_b = origColumnFnArray.filter((chunk) => chunk.value === "LEFT_BRACKET" /* LEFT_BRACKET */)) == null ? void 0 : _b.length;
-      if (numRightBrackets !== numLeftBrackets) {
-        throw new ChataError("Syntax Error: Formula contains unclosed brackets");
-      }
+      validateBracketNesting(origColumnFnArray);
       origColumnFnArray.forEach((chunk, i) => {
-        var _a2, _b2, _c;
+        var _a, _b, _c;
         if (chunk.type === "operator" /* OPERATOR */) {
           if (i === origColumnFnArray.length - 1) {
             if (chunk.value !== "RIGHT_BRACKET" /* RIGHT_BRACKET */) {
               throw new ChataError("Syntax Error: Formula can't end with an operator");
             }
           }
-          columnFnStr = columnFnStr + " " + ((_b2 = (_a2 = OPERATORS[chunk.value]) == null ? void 0 : _a2.js) != null ? _b2 : "");
+          columnFnStr = columnFnStr + " " + ((_b = (_a = OPERATORS[chunk.value]) == null ? void 0 : _a.js) != null ? _b : "");
         } else if (chunk.type === "number") {
           if (isValueEmpty(chunk.value)) {
             throw new ChataError("Syntax Error: Number input is empty");
@@ -21780,6 +21790,20 @@
         denEnd++;
       } else {
         while (denEnd < s.length && /[^\s(),+\-*/]/.test(s[denEnd])) denEnd++;
+        if (denEnd < s.length && s[denEnd] === "(") {
+          let depth = 0;
+          while (denEnd < s.length) {
+            if (s[denEnd] === "(") depth++;
+            else if (s[denEnd] === ")") {
+              depth--;
+              if (depth === 0) {
+                denEnd++;
+                break;
+              }
+            }
+            denEnd++;
+          }
+        }
       }
       if (isInProtectedRange(i)) {
         i = denEnd;
@@ -25301,7 +25325,7 @@
     colorScales,
     isDataAggregated
   }) => {
-    var _a, _b, _c, _d, _e, _f, _g, _h;
+    var _a, _b;
     const commonParams = {
       stacked,
       isScaled,
@@ -25337,17 +25361,6 @@
       ...scaleColumnConfig,
       ...commonParams
     });
-    try {
-      console.debug("[chartHelpers] tempScale1", {
-        range: (_a = tempScale1.range) == null ? void 0 : _a.call(tempScale1),
-        domain: (_b = tempScale1.domain) == null ? void 0 : _b.call(tempScale1),
-        minValue: tempScale1.minValue,
-        maxValue: tempScale1.maxValue,
-        height,
-        width
-      });
-    } catch (e) {
-    }
     if (!hasSecondAxis) {
       return {
         scale: tempScale1
@@ -25368,7 +25381,7 @@
       maxValue: maxValue2,
       disableAutoScale: disableAutoScale != null ? disableAutoScale : disableScale2,
       range: tempScale1.range(),
-      numTicks: (_d = (_c = tempScale1.tickLabels) == null ? void 0 : _c.length) != null ? _d : void 0,
+      numTicks: (_b = (_a = tempScale1.tickLabels) == null ? void 0 : _a.length) != null ? _b : void 0,
       ...scaleColumnConfig2,
       ...commonParams
     });
@@ -25409,23 +25422,6 @@
     });
     scale.secondScale = scale2;
     scale2.secondScale = scale;
-    try {
-      console.debug("[chartHelpers] pairedScales", {
-        scale1: {
-          range: (_e = scale.range) == null ? void 0 : _e.call(scale),
-          domain: (_f = scale.domain) == null ? void 0 : _f.call(scale),
-          minValue: scale.minValue,
-          maxValue: scale.maxValue
-        },
-        scale2: {
-          range: (_g = scale2.range) == null ? void 0 : _g.call(scale2),
-          domain: (_h = scale2.domain) == null ? void 0 : _h.call(scale2),
-          minValue: scale2.minValue,
-          maxValue: scale2.maxValue
-        }
-      });
-    } catch (e) {
-    }
     return { scale, scale2 };
   };
   var doesElementOverflowContainer = (element, container) => {