[pull] main from prometheus:main

model/textparse/openmetricsparse.go

@@ -73,7 +73,7 @@ func (l *openMetricsLexer) Error(es string) {
 
 // OpenMetricsParser parses samples from a byte slice of samples in the official
 // OpenMetrics text exposition format.
-// This is based on the working draft https://docs.google.com/document/u/1/d/1KwV0mAXwwbvvifBvDKH_LU1YjyXE_wxCkHNoCGq1GX0/edit
+// Specification can be found at https://prometheus.io/docs/specs/om/open_metrics_spec/
 type OpenMetricsParser struct {
 	l         *openMetricsLexer
 	builder   labels.ScratchBuilder

web/ui/mantine-ui/package.json

@@ -15,54 +15,54 @@
     "@codemirror/autocomplete": "^6.18.4",
     "@codemirror/language": "^6.10.8",
     "@codemirror/lint": "^6.8.4",
-    "@codemirror/state": "^6.4.1",
-    "@codemirror/view": "^6.36.2",
+    "@codemirror/state": "^6.5.2",
+    "@codemirror/view": "^6.36.4",
     "@floating-ui/dom": "^1.6.12",
     "@lezer/common": "^1.2.3",
     "@lezer/highlight": "^1.2.1",
-    "@mantine/code-highlight": "^7.15.2",
-    "@mantine/core": "^7.11.2",
-    "@mantine/dates": "^7.15.3",
-    "@mantine/hooks": "^7.11.2",
-    "@mantine/notifications": "^7.15.3",
+    "@mantine/code-highlight": "^7.17.2",
+    "@mantine/core": "^7.17.2",
+    "@mantine/dates": "^7.17.2",
+    "@mantine/hooks": "^7.17.2",
+    "@mantine/notifications": "^7.17.2",
     "@microsoft/fetch-event-source": "^2.0.1",
     "@nexucis/fuzzy": "^0.5.1",
     "@nexucis/kvsearch": "^0.9.1",
     "@prometheus-io/codemirror-promql": "0.302.1",
-    "@reduxjs/toolkit": "^2.5.0",
-    "@tabler/icons-react": "^3.28.1",
+    "@reduxjs/toolkit": "^2.6.1",
+    "@tabler/icons-react": "^3.31.0",
     "@tanstack/react-query": "^5.67.1",
     "@testing-library/jest-dom": "^6.6.3",
     "@testing-library/react": "^16.2.0",
-    "@types/lodash": "^4.17.13",
+    "@types/lodash": "^4.17.16",
     "@types/sanitize-html": "^2.13.0",
-    "@uiw/react-codemirror": "^4.23.7",
+    "@uiw/react-codemirror": "^4.23.10",
     "clsx": "^2.1.1",
     "dayjs": "^1.11.10",
     "lodash": "^4.17.21",
     "react": "^19.0.0",
     "react-dom": "^19.0.0",
     "react-infinite-scroll-component": "^6.1.0",
     "react-redux": "^9.2.0",
-    "react-router-dom": "^7.1.1",
-    "sanitize-html": "^2.14.0",
-    "uplot": "^1.6.31",
+    "react-router-dom": "^7.4.0",
+    "sanitize-html": "^2.15.0",
+    "uplot": "^1.6.32",
     "uplot-react": "^1.2.2",
     "use-query-params": "^2.2.1"
   },
   "devDependencies": {
     "@eslint/compat": "^1.2.4",
-    "@eslint/eslintrc": "^3.2.0",
+    "@eslint/eslintrc": "^3.3.1",
     "@eslint/js": "^9.21.0",
-    "@types/react": "^19.0.6",
-    "@types/react-dom": "^19.0.0",
+    "@types/react": "^19.0.12",
+    "@types/react-dom": "^19.0.4",
     "@typescript-eslint/eslint-plugin": "^8.20.0",
     "@typescript-eslint/parser": "^8.25.0",
     "@vitejs/plugin-react": "^4.3.4",
-    "eslint": "^9.18.0",
+    "eslint": "^9.23.0",
     "eslint-plugin-react-hooks": "^5.1.0",
     "eslint-plugin-react-refresh": "^0.4.19",
-    "globals": "^15.14.0",
+    "globals": "^16.0.0",
     "jsdom": "^25.0.1",
     "postcss": "^8.4.47",
     "postcss-preset-mantine": "^1.17.0",

web/ui/module/codemirror-promql/eslint.config.mjs

@@ -0,0 +1,47 @@
+import { fixupConfigRules } from '@eslint/compat';
+import tsParser from '@typescript-eslint/parser';
+import path from 'node:path';
+import { fileURLToPath } from 'node:url';
+import js from '@eslint/js';
+import { FlatCompat } from '@eslint/eslintrc';
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
+const compat = new FlatCompat({
+    baseDirectory: __dirname,
+    recommendedConfig: js.configs.recommended,
+    allConfig: js.configs.all
+});
+
+export default [{
+    ignores: ['**/dist', '**/.eslintrc.cjs', 'node_modules/**'],
+}, ...fixupConfigRules(compat.extends(
+    'eslint:recommended',
+    'plugin:@typescript-eslint/recommended',
+    'plugin:prettier/recommended',
+)), {
+        languageOptions: {
+            parser: tsParser,
+        },
+        rules: {
+            '@typescript-eslint/explicit-function-return-type': ['off'],
+            'eol-last': [
+                'error',
+                'always',
+            ],
+            'object-curly-spacing': [
+                'error',
+                'always',
+            ],
+            'prefer-const': 'warn',
+            'comma-dangle': [
+                'error',
+                {
+                    'arrays': 'always-multiline',
+                    'objects': 'always-multiline',
+                    'imports': 'always-multiline',
+                },
+	    ],
+        },
+    },
+];

web/ui/module/codemirror-promql/package.json

@@ -36,14 +36,14 @@
     "@codemirror/autocomplete": "^6.18.4",
     "@codemirror/language": "^6.10.8",
     "@codemirror/lint": "^6.8.4",
-    "@codemirror/state": "^6.3.3",
-    "@codemirror/view": "^6.36.2",
+    "@codemirror/state": "^6.5.2",
+    "@codemirror/view": "^6.36.4",
     "@lezer/common": "^1.2.3",
     "@lezer/highlight": "^1.2.0",
     "@lezer/lr": "^1.4.2",
     "eslint-plugin-prettier": "^5.2.3",
     "isomorphic-fetch": "^3.0.0",
-    "nock": "^13.5.6"
+    "nock": "^14.0.1"
   },
   "peerDependencies": {
     "@codemirror/autocomplete": "^6.4.0",

web/ui/module/codemirror-promql/src/complete/hybrid.ts

@@ -232,7 +232,8 @@ function isAggregatorWithParam(functionCallBody: SyntaxNode): boolean {
 export function analyzeCompletion(state: EditorState, node: SyntaxNode, pos: number): Context[] {
   const result: Context[] = [];
   switch (node.type.id) {
-    case 0: // 0 is the id of the error node
+    case 0: {
+      // 0 is the id of the error node
       if (node.parent?.type.id === OffsetExpr) {
         // we are likely in the given situation:
         // `metric_name offset 5` that leads to this tree:
@@ -270,7 +271,8 @@ export function analyzeCompletion(state: EditorState, node: SyntaxNode, pos: num
         result.push({ kind: ContextKind.BinOp });
       }
       break;
-    case Identifier:
+    }
+    case Identifier: {
       // sometimes an Identifier has an error has parent. This should be treated in priority
       if (node.parent?.type.id === 0) {
         const errorNodeParent = node.parent.parent;
@@ -380,6 +382,7 @@ export function analyzeCompletion(state: EditorState, node: SyntaxNode, pos: num
         }
       }
       break;
+    }
     case PromQL:
       if (node.firstChild !== null && node.firstChild.type.id === 0) {
         // this situation can happen when there is nothing in the text area and the user is explicitly triggering the autocompletion (with ctrl + space)

web/ui/module/codemirror-promql/src/parser/matcher.ts

@@ -41,12 +41,13 @@ function createMatcher(labelMatcher: SyntaxNode, state: EditorState): Matcher {
           case QuotedLabelName:
             matcher.name = state.sliceDoc(cursor.from, cursor.to).slice(1, -1);
             break;
-          case MatchOp:
+          case MatchOp: {
             const ope = cursor.node.firstChild;
             if (ope) {
               matcher.type = ope.type.id;
             }
             break;
+          }
           case StringLiteral:
             matcher.value = state.sliceDoc(cursor.from, cursor.to).slice(1, -1);
             break;
@@ -63,12 +64,13 @@ function createMatcher(labelMatcher: SyntaxNode, state: EditorState): Matcher {
           case LabelName:
             matcher.name = state.sliceDoc(cursor.from, cursor.to);
             break;
-          case MatchOp:
+          case MatchOp: {
             const ope = cursor.node.firstChild;
             if (ope) {
               matcher.type = ope.type.id;
             }
             break;
+          }
           case StringLiteral:
             matcher.value = state.sliceDoc(cursor.from, cursor.to).slice(1, -1);
             break;

web/ui/module/codemirror-promql/src/parser/parser.test.ts

@@ -959,7 +959,7 @@ describe('promql operations', () => {
       ],
     },
     {
-      expr: `{'foo\`metric':'bar'}`, // eslint-disable-line
+      expr: `{'foo\`metric':'bar'}`,
       expectedValueType: ValueType.vector,
       expectedDiag: [],
     },

web/ui/module/codemirror-promql/src/parser/parser.ts

@@ -116,25 +116,27 @@ export class Parser {
       case ParenExpr:
         this.checkAST(node.getChild('Expr'));
         break;
-      case UnaryExpr:
+      case UnaryExpr: {
         const unaryExprType = this.checkAST(node.getChild('Expr'));
         if (unaryExprType !== ValueType.scalar && unaryExprType !== ValueType.vector) {
           this.addDiagnostic(node, `unary expression only allowed on expressions of type scalar or instant vector, got ${unaryExprType}`);
         }
         break;
-      case SubqueryExpr:
+      }
+      case SubqueryExpr: {
         const subQueryExprType = this.checkAST(node.getChild('Expr'));
         if (subQueryExprType !== ValueType.vector) {
           this.addDiagnostic(node, `subquery is only allowed on instant vector, got ${subQueryExprType} in ${node.name} instead`);
         }
         break;
+      }
       case MatrixSelector:
         this.checkAST(node.getChild('Expr'));
         break;
       case VectorSelector:
         this.checkVectorSelector(node);
         break;
-      case StepInvariantExpr:
+      case StepInvariantExpr: {
         const exprValue = this.checkAST(node.getChild('Expr'));
         if (exprValue !== ValueType.vector && exprValue !== ValueType.matrix) {
           this.addDiagnostic(node, `@ modifier must be preceded by an instant selector vector or range vector selector or a subquery`);
@@ -148,6 +150,7 @@ export class Parser {
         //     So far I didn't find the way to fix it. I think it's likely due to the fact we are building an ESM package which is now something stable in nodeJS/javascript but still experimental in typescript.
         // For the above reason, we decided to drop these checks.
         break;
+      }
     }
 
     return getType(node);

web/ui/module/codemirror-promql/src/parser/type.ts

@@ -52,19 +52,21 @@ export function getType(node: SyntaxNode | null): ValueType {
       return getType(node.getChild('Expr'));
     case UnaryExpr:
       return getType(node.getChild('Expr'));
-    case BinaryExpr:
+    case BinaryExpr: {
       const lt = getType(node.firstChild);
       const rt = getType(node.lastChild);
       if (lt === ValueType.scalar && rt === ValueType.scalar) {
         return ValueType.scalar;
       }
       return ValueType.vector;
-    case FunctionCall:
+    }
+    case FunctionCall: {
       const funcNode = node.firstChild?.firstChild;
       if (!funcNode) {
         return ValueType.none;
       }
       return getFunction(funcNode.type.id).returnType;
+    }
     case StepInvariantExpr:
       return getType(node.getChild('Expr'));
     default: