public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Chore: Remove default export of promqlGrammar (#108120)

Browse Source 
remove default export
This commit is contained in:
ismail simsek
2025-07-15 15:13:44 +02:00
committed by GitHub
parent 5b5cce3243
commit 3d9228f296
7 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/grafana-prometheus/src/language_provider.ts
+2 -2
View File
@@ -27,7 +27,7 @@ import {
processLabels,
toPromLikeQuery,
} from './language_utils';
import PromqlSyntax from './promql';
import { promqlGrammar } from './promql';
import { buildVisualQueryFromString } from './querybuilder/parsing';
import { LabelsApiClient, ResourceApiClient, SeriesApiClient } from './resource_clients';
import { PromMetricsMetadata, PromQuery } from './types';
@@ -736,7 +736,7 @@ export const exportToAbstractQuery = (query: PromQuery): AbstractQuery => {
if (!promQuery || promQuery.length === 0) {
return { refId: query.refId, labelMatchers: [] };
}
const tokens = Prism.tokenize(promQuery, PromqlSyntax);
const tokens = Prism.tokenize(promQuery, promqlGrammar);
const labelMatchers: AbstractLabelMatcher[] = extractLabelMatchers(tokens);
const nameLabelValue = getNameLabelValue(promQuery, tokens);
if (nameLabelValue && nameLabelValue.length > 0) {
packages/grafana-prometheus/src/promql.test.ts
+6 -6
View File
@@ -1,23 +1,23 @@
// Core Grafana history https://github.com/grafana/grafana/blob/v11.0.0-preview/public/app/plugins/datasource/prometheus/promql.test.ts
import Prism from 'prismjs';
import promql from './promql';
import { promqlGrammar } from './promql';
describe('Loki syntax', () => {
it('should highlight Loki query correctly', () => {
expect(Prism.highlight('{key="val#ue"}', promql, 'promql')).toBe(
expect(Prism.highlight('{key="val#ue"}', promqlGrammar, 'promql')).toBe(
'<span class="token context-labels"><span class="token punctuation">{</span><span class="token label-key attr-name">key</span>=<span class="token label-value attr-value">"val#ue"</span></span><span class="token punctuation">}</span>'
);
expect(Prism.highlight('{key="#value"}', promql, 'promql')).toBe(
expect(Prism.highlight('{key="#value"}', promqlGrammar, 'promql')).toBe(
'<span class="token context-labels"><span class="token punctuation">{</span><span class="token label-key attr-name">key</span>=<span class="token label-value attr-value">"#value"</span></span><span class="token punctuation">}</span>'
);
expect(Prism.highlight('{key="value#"}', promql, 'promql')).toBe(
expect(Prism.highlight('{key="value#"}', promqlGrammar, 'promql')).toBe(
'<span class="token context-labels"><span class="token punctuation">{</span><span class="token label-key attr-name">key</span>=<span class="token label-value attr-value">"value#"</span></span><span class="token punctuation">}</span>'
);
expect(Prism.highlight('#test{key="value"}', promql, 'promql')).toBe(
expect(Prism.highlight('#test{key="value"}', promqlGrammar, 'promql')).toBe(
'<span class="token comment">#test{key="value"}</span>'
);
expect(Prism.highlight('{key="value"}#test', promql, 'promql')).toBe(
expect(Prism.highlight('{key="value"}#test', promqlGrammar, 'promql')).toBe(
'<span class="token context-labels"><span class="token punctuation">{</span><span class="token label-key attr-name">key</span>=<span class="token label-value attr-value">"value"</span></span><span class="token punctuation">}</span><span class="token comment">#test</span>'
);
});
packages/grafana-prometheus/src/promql.ts
-2
View File
@@ -656,5 +656,3 @@ export const promqlGrammar: Grammar = {
operator: new RegExp(`/[-+*/=%^~]|&&?|\\|?\\||!=?|<(?:=>?|<|>)?|>[>=]?|\\b(?:${OPERATORS.join('|')})\\b`, 'i'),
punctuation: /[{};()`,.]/,
};
export default promqlGrammar;
packages/grafana-prometheus/src/querybuilder/QueryPattern.tsx
+1 -1
View File
@@ -5,7 +5,7 @@ import { GrafanaTheme2 } from '@grafana/data';
import { t, Trans } from '@grafana/i18n';
import { Button, Card, useStyles2 } from '@grafana/ui';
import promqlGrammar from '../promql';
import { promqlGrammar } from '../promql';
import { RawQuery } from './shared/RawQuery';
import { promQueryModeller } from './shared/modeller_instance';
packages/grafana-prometheus/src/querybuilder/components/PromQueryBuilderExplained.tsx
+1 -1
View File
@@ -3,7 +3,7 @@ import { memo } from 'react';
import { Stack } from '@grafana/ui';
import promqlGrammar from '../../promql';
import { promqlGrammar } from '../../promql';
import { buildVisualQueryFromString } from '../parsing';
import { OperationExplainedBox } from '../shared/OperationExplainedBox';
import { OperationListExplained } from '../shared/OperationListExplained';
packages/grafana-prometheus/src/querybuilder/components/QueryPreview.tsx
+1 -1
View File
@@ -1,7 +1,7 @@
// Core Grafana history https://github.com/grafana/grafana/blob/v11.0.0-preview/public/app/plugins/datasource/prometheus/querybuilder/components/QueryPreview.tsx
import { EditorFieldGroup, EditorRow } from '@grafana/plugin-ui';
import promqlGrammar from '../../promql';
import { promqlGrammar } from '../../promql';
import { RawQuery } from '../shared/RawQuery';
export interface QueryPreviewProps {
packages/grafana-prometheus/src/querybuilder/components/shared/QueryBuilderContent.tsx
+1 -1
View File
@@ -5,7 +5,7 @@ import { DataSourceApi, getDefaultTimeRange } from '@grafana/data';
import { selectors } from '@grafana/e2e-selectors';
import { EditorRow } from '@grafana/plugin-ui';
import promqlGrammar from '../../../promql';
import { promqlGrammar } from '../../../promql';
import { getInitHints } from '../../../query_hints';
import { buildVisualQueryFromString } from '../../parsing';
import { OperationExplainedBox } from '../../shared/OperationExplainedBox';