Merge pull request #120 from VictoriaMetrics/issue-112/fix-parsing-qu…

…ery-builder fix query builder
VictoriaMetrics · Dec 5, 2023 · 43298f8 · 43298f8
2 parents 95d0711 + ef52e4a
commit 43298f8
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 8 deletions.
diff --git a/.config/jest.config.js b/.config/jest.config.js
@@ -9,7 +9,6 @@ module.exports = {
   testMatch: [
     '<rootDir>/src/**/__tests__/**/*.{js,jsx,ts,tsx}',
     '<rootDir>/src/**/*.{spec,test,jest}.{js,jsx,ts,tsx}',
-    '<rootDir>/src/**/*.{spec,test,jest}.{js,jsx,ts,tsx}',
   ],
   transform: {
     '^.+\\.(t|j)sx?$': [
@@ -28,7 +27,4 @@ module.exports = {
     ],
   },
   setupFilesAfterEnv: ['<rootDir>/jest-setup.ts'],
-  transformIgnorePatterns: [
-    "!node_modules/d3-interpolate"
-  ]
 };
diff --git a/jest.config.js b/jest.config.js
@@ -2,7 +2,7 @@ module.exports = {
   // Jest configuration provided by Grafana scaffolding
   ...require('./.config/jest.config'),
   testTimeout: 300000,
-  "transformIgnorePatterns": [
-    "node_modules/(?!monaco-promql/)"
-  ]
+  transformIgnorePatterns: [
+    "node_modules/(?!(d3-color|d3-interpolate|monaco-promql|ol)/)"
+  ],
 };
diff --git a/src/querybuilder/parsing.ts b/src/querybuilder/parsing.ts
@@ -206,7 +206,7 @@ function handleFunction(expr: string, node: SyntaxNode, context: Context) {
   //   the query model.
   // - it is easier to handle template variables this way as template variable is an error for the parser
   if (rangeFunctions.includes(funcName) || funcName.endsWith('_over_time')) {
-    let match = getString(expr, node).match(/\[(.+)\]/);
+    let match = getString(expr, node).match(/(?<!\{[^}]*)\[(.+?)](?![^{]*})/);
     if (match?.[1]) {
       interval = match[1];
       params.push(match[1]);