@gooddata/sdk-maql-language-server 11.65.0-alpha.9 → 11.65.1

package/esm/completions/complete.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"complete.d.ts","sourceRoot":"","sources":["../../src/completions/complete.ts"],"names":[],"mappings":"AAIA,OAAO,EACH,cAAc,EAEd,cAAc,EAIjB,MAAM,uBAAuB,CAAC;AAS/B,OAAO,EAGH,KAAK,iBAAiB,EACtB,KAAK,UAAU,EAClB,MAAM,sBAAsB,CAAC;AAiB9B,wBAAsB,OAAO,CACzB,IAAI,EAAE,cAAc,EACpB,IAAI,EAAE,CAAC,UAAU,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,GAC1D,OAAO,CAAC,cAAc,CAAC,CAUzB;AAED;;;;;;GAMG;AACH,wBAAsB,QAAQ,CAC1B,KAAK,EAAE,MAAM,EACb,MAAM,GAAE,MAAqB,EAC7B,UAAU,CAAC,EAAE,UAAU,EACvB,iBAAiB,CAAC,EAAE,iBAAiB,GACtC,OAAO,CAAC,cAAc,CAAC,CA8CzB"}
+{"version":3,"file":"complete.d.ts","sourceRoot":"","sources":["../../src/completions/complete.ts"],"names":[],"mappings":"AASA,OAAO,EACH,cAAc,EAEd,cAAc,EAIjB,MAAM,uBAAuB,CAAC;AAO/B,OAAO,EAGH,KAAK,iBAAiB,EACtB,KAAK,UAAU,EAClB,MAAM,sBAAsB,CAAC;AAoB9B,wBAAsB,OAAO,CACzB,IAAI,EAAE,cAAc,EACpB,IAAI,EAAE,CAAC,UAAU,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,GAC1D,OAAO,CAAC,cAAc,CAAC,CAUzB;AAED;;;;;;GAMG;AACH,wBAAsB,QAAQ,CAC1B,KAAK,EAAE,MAAM,EACb,MAAM,GAAE,MAAqB,EAC7B,UAAU,CAAC,EAAE,UAAU,EACvB,iBAAiB,CAAC,EAAE,iBAAiB,GACtC,OAAO,CAAC,cAAc,CAAC,CA8CzB"}

package/esm/completions/complete.js

@@ -1,8 +1,8 @@
 // (C) 2021-2026 GoodData Corporation
-import { CodeCompletionCore } from "antlr4-c3";
+import { CodeCompletionCore, } from "antlr4-c3";
+import { Vocabulary } from "antlr4ng";
 import { CompletionItem, CompletionItemKind, CompletionList, MarkupKind, Range, TextEdit, } from "vscode-languageserver";
-import MaqlPkg from "@gooddata/maql-antlr4ts";
-const { MaqlLexer, MaqlParser, escapeString } = MaqlPkg;
+import { MaqlLexer, MaqlParser, escapeString } from "@gooddata/maql-antlr4ts";
 import { findLabelContext } from "../labelElements.js";
 import { toMaqlObjectType } from "../maqlObjectTypes.js";
 import { parameterDefaultLabel, parameterTypeLabel } from "../metadata/parameters.js";
@@ -13,6 +13,8 @@ import { descriptions, ignoredTokens, } from "./descriptions.js";
 import { findContext, isFinal } from "./findContext.js";
 import { adjustSortText } from "./sort.js";
 const [tokenCompletions, ruleCompletions] = getTokenAndRuleCompletions(descriptions);
+// antlr4ng exposes the vocabulary only on parser instances, so build one from the static name tables
+const vocabulary = new Vocabulary(MaqlParser.literalNames, MaqlParser.symbolicNames);
 export async function resolve(item, docs) {
     const data = item.data;
     const doc = data?.resolveTag ? await docs(data.resolveTag) : undefined;
@@ -95,11 +97,11 @@ function completeFromCandidateTokens(tokens, range, allowedTypes) {
     return CompletionList.create(items, false);
 }
 function getTokenName(tokenId) {
-    const literalName = MaqlParser.VOCABULARY.getLiteralName(tokenId);
-    if (literalName !== undefined) {
+    const literalName = vocabulary.getLiteralName(tokenId);
+    if (literalName !== null) {
         return literalName.slice(1, literalName.length - 1).toUpperCase();
     }
-    return MaqlParser.VOCABULARY.getDisplayName(tokenId);
+    return vocabulary.getDisplayName(tokenId) ?? String(tokenId);
 }
 /**
  * Rule completions are necessary when the tokens to be completed are ambiguous
@@ -239,18 +241,16 @@ function createMetadataCompletionItem(metadataObject, range) {
  */
 function tokenToString(token, offset) {
     if (token.type === MaqlParser.UnterminatedString) {
-        return token.text
-            ?.slice(1, Math.min(token.text.length, offset - token.startIndex))
-            .replace(/\\"/g, '"');
+        return token.text?.slice(1, Math.min(token.text.length, offset - token.start)).replace(/\\"/g, '"');
     }
     else if (token.type === MaqlParser.String) {
         return token.text
-            ?.slice(1, Math.min(token.text.length - 1, offset - token.startIndex))
+            ?.slice(1, Math.min(token.text.length - 1, offset - token.start))
             .replace(/\\"/g, '"');
         // oxlint-disable-next-line eslint/no-negated-condition
     }
     else if (!isFinal(token)) {
-        return token.text?.slice(0, Math.min(token.text.length, offset - token.startIndex));
+        return token.text?.slice(0, Math.min(token.text.length, offset - token.start));
     }
     else {
         return undefined; // final tokens must not be used - their text value is not useful

package/esm/completions/descriptions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"descriptions.d.ts","sourceRoot":"","sources":["../../src/completions/descriptions.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,cAAc,EAAwC,MAAM,uBAAuB,CAAC;AAMlG,OAAO,EAAE,KAAK,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAEnD,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AAIjD;;GAEG;AACH,eAAO,MAAM,IAAI;IACb,SAAS;IACT,KAAK;IACL,MAAM;IACN,SAAS;IACT,IAAI;IACJ,OAAO;IACP,YAAY;IACZ,QAAQ;IACR,OAAO;IACP,QAAQ;IACR,OAAO;IACP,WAAW;IACX,OAAO;CACV,CAAC;AAEF;;GAEG;AACH,MAAM,MAAM,qBAAqB,GAAG,cAAc,GAAG,mBAAmB,CAAC;AAEzE;;;GAGG;AACH,MAAM,WAAW,mBAAmB;IAChC,UAAU,CAAC,EAAE,UAAU,CAAC;IACxB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,QAAQ,CAAC;CACvB;AAED;;;GAGG;AACH,eAAO,MAAM,aAAa,aAmDxB,CAAC;AAEH,eAAO,MAAM,YAAY,EAAE,qBAAqB,EAqO/C,CAAC"}
+{"version":3,"file":"descriptions.d.ts","sourceRoot":"","sources":["../../src/completions/descriptions.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,cAAc,EAAwC,MAAM,uBAAuB,CAAC;AAKlG,OAAO,EAAE,KAAK,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAEnD,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AAIjD;;GAEG;AACH,eAAO,MAAM,IAAI;IACb,SAAS;IACT,KAAK;IACL,MAAM;IACN,SAAS;IACT,IAAI;IACJ,OAAO;IACP,YAAY;IACZ,QAAQ;IACR,OAAO;IACP,QAAQ;IACR,OAAO;IACP,WAAW;IACX,OAAO;CACV,CAAC;AAEF;;GAEG;AACH,MAAM,MAAM,qBAAqB,GAAG,cAAc,GAAG,mBAAmB,CAAC;AAEzE;;;GAGG;AACH,MAAM,WAAW,mBAAmB;IAChC,UAAU,CAAC,EAAE,UAAU,CAAC;IACxB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,QAAQ,CAAC;CACvB;AAED;;;GAGG;AACH,eAAO,MAAM,aAAa,aAmDxB,CAAC;AAEH,eAAO,MAAM,YAAY,EAAE,qBAAqB,EAqO/C,CAAC"}

package/esm/completions/descriptions.js

@@ -1,7 +1,6 @@
 // (C) 2021-2026 GoodData Corporation
 import { CompletionItemKind, InsertTextFormat } from "vscode-languageserver";
-import MaqlPkg from "@gooddata/maql-antlr4ts";
-const { MaqlParser } = MaqlPkg;
+import { MaqlParser } from "@gooddata/maql-antlr4ts";
 import { errorTokens } from "../diagnostics.js";
 import { getTokenIdFromName } from "../parseMaql.js";
 import { MaqlType } from "../types/hierarchy.js";

package/esm/completions/findContext.d.ts

@@ -1,4 +1,4 @@
-import { type Token } from "antlr4ts";
+import { type Token } from "antlr4ng";
 import { type AstNode, type IPosition } from "@gooddata/maql-antlr4ts";
 import { type MaqlMetric } from "../parseMaql.js";
 import { MaqlType } from "../types/hierarchy.js";

package/esm/completions/findContext.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"findContext.d.ts","sourceRoot":"","sources":["../../src/completions/findContext.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,KAAK,EAAoB,MAAM,UAAU,CAAC;AAExD,OAAgB,EACZ,KAAK,OAAO,EAEZ,KAAK,SAAS,EAEjB,MAAM,yBAAyB,CAAC;AAGjC,OAAO,EAAE,KAAK,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAClD,OAAO,EAAE,QAAQ,EAAsB,MAAM,uBAAuB,CAAC;AAOrE,MAAM,WAAW,aAAa;IAC1B,qFAAqF;IACrF,SAAS,EAAE,OAAO,EAAE,CAAC;IACrB,0EAA0E;IAC1E,aAAa,EAAE,QAAQ,EAAE,CAAC;IAC1B,kDAAkD;IAClD,MAAM,EAAE;QAAE,UAAU,EAAE,KAAK,CAAC;QAAC,cAAc,EAAE,KAAK,CAAC;QAAC,eAAe,EAAE,KAAK,CAAA;KAAE,CAAC;CAChF;AAED,wBAAgB,WAAW,CAAC,MAAM,EAAE,UAAU,EAAE,aAAa,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,GAAG,aAAa,CAiBvG;AAkKD,wBAAgB,OAAO,CAAC,KAAK,EAAE,KAAK,GAAG,OAAO,CAE7C"}
+{"version":3,"file":"findContext.d.ts","sourceRoot":"","sources":["../../src/completions/findContext.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,KAAK,EAAoB,MAAM,UAAU,CAAC;AAExD,OAAO,EAEH,KAAK,OAAO,EAEZ,KAAK,SAAS,EAIjB,MAAM,yBAAyB,CAAC;AAEjC,OAAO,EAAE,KAAK,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAClD,OAAO,EAAE,QAAQ,EAAsB,MAAM,uBAAuB,CAAC;AAOrE,MAAM,WAAW,aAAa;IAC1B,qFAAqF;IACrF,SAAS,EAAE,OAAO,EAAE,CAAC;IACrB,0EAA0E;IAC1E,aAAa,EAAE,QAAQ,EAAE,CAAC;IAC1B,kDAAkD;IAClD,MAAM,EAAE;QAAE,UAAU,EAAE,KAAK,CAAC;QAAC,cAAc,EAAE,KAAK,CAAC;QAAC,eAAe,EAAE,KAAK,CAAA;KAAE,CAAC;CAChF;AAED,wBAAgB,WAAW,CAAC,MAAM,EAAE,UAAU,EAAE,aAAa,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,GAAG,aAAa,CAiBvG;AAkKD,wBAAgB,OAAO,CAAC,KAAK,EAAE,KAAK,GAAG,OAAO,CAE7C"}

package/esm/completions/findContext.js

@@ -1,6 +1,5 @@
 // (C) 2022-2026 GoodData Corporation
-import MaqlPkg from "@gooddata/maql-antlr4ts";
-const { AbstractAstVisitor, MaqlParser, positionInRange } = MaqlPkg;
+import { AbstractAstVisitor, MaqlParser, positionInRange, } from "@gooddata/maql-antlr4ts";
 import { MaqlType, abstractValueTypes } from "../types/hierarchy.js";
 import { findFunctionDefinitions, } from "../types/signatures.js";
 export function findContext(metric, caretPosition, offset) {
@@ -125,10 +124,10 @@ function findCaretToken(tokenStream, offset) {
     // first find the caret token
     for (let tokenIndex = 0; tokenIndex < tokenStream.size; tokenIndex++) {
         const nextToken = tokenStream.get(tokenIndex);
-        if (nextToken.startIndex < offset || (nextToken.startIndex === offset && isFinal(caretToken))) {
+        if (nextToken.start < offset || (nextToken.start === offset && isFinal(caretToken))) {
             caretToken = nextToken;
         }
-        if (nextToken.startIndex >= offset)
+        if (nextToken.start >= offset)
             break;
     }
     for (let tokenIndex = caretToken.tokenIndex; tokenIndex < tokenStream.size; tokenIndex++) {

package/esm/completions/functionDescriptions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"functionDescriptions.d.ts","sourceRoot":"","sources":["../../src/completions/functionDescriptions.ts"],"names":[],"mappings":"AAWA,OAAO,EAAE,KAAK,qBAAqB,EAAE,MAAM,mBAAmB,CAAC;AA4E/D,eAAO,MAAM,oBAAoB,EAAE,qBAAqB,EAuBvD,CAAC"}
+{"version":3,"file":"functionDescriptions.d.ts","sourceRoot":"","sources":["../../src/completions/functionDescriptions.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,KAAK,qBAAqB,EAAE,MAAM,mBAAmB,CAAC;AA4E/D,eAAO,MAAM,oBAAoB,EAAE,qBAAqB,EAuBvD,CAAC"}

package/esm/completions/functionDescriptions.js

@@ -1,7 +1,6 @@
 // (C) 2022-2026 GoodData Corporation
 import { CompletionItemKind, InsertTextFormat } from "vscode-languageserver";
-import MaqlPkg from "@gooddata/maql-antlr4ts";
-const { MaqlParser, functionDefinitions } = MaqlPkg;
+import { MaqlParser, functionDefinitions, } from "@gooddata/maql-antlr4ts";
 import { getTokenIdFromName } from "../parseMaql.js";
 import { transformFunctionDefinition } from "../types/signatures.js";
 /**

package/esm/diagnostics.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"diagnostics.d.ts","sourceRoot":"","sources":["../src/diagnostics.ts"],"names":[],"mappings":"AAUA,OAAO,EAAE,UAAU,EAA6B,MAAM,uBAAuB,CAAC;AAY9E,OAAO,EAAE,UAAU,EAAqB,MAAM,gBAAgB,CAAC;AAI/D,OAAO,EAEH,KAAK,iBAAiB,EACtB,KAAK,UAAU,EAGlB,MAAM,qBAAqB,CAAC;AAO7B,UAAU,iBAAiB;IACvB,OAAO,CAAC,SAAS,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IAEpC,IAAI,EAAE,UAAU,CAAC;CACpB;AAED,eAAO,MAAM,sBAAsB,gCAgDjC,CAAC;AAEH,eAAO,MAAM,WAAW,EAAE,MAAM,EAA8C,CAAC;AAE/E,wBAAsB,QAAQ,CAC1B,KAAK,EAAE,MAAM,EACb,UAAU,CAAC,EAAE,UAAU,EACvB,iBAAiB,CAAC,EAAE,iBAAiB,GACtC,OAAO,CAAC,UAAU,EAAE,CAAC,CAsBvB"}
+{"version":3,"file":"diagnostics.d.ts","sourceRoot":"","sources":["../src/diagnostics.ts"],"names":[],"mappings":"AAUA,OAAO,EAAE,UAAU,EAA6B,MAAM,uBAAuB,CAAC;AAc9E,OAAO,EAAE,UAAU,EAAqB,MAAM,gBAAgB,CAAC;AAI/D,OAAO,EAEH,KAAK,iBAAiB,EACtB,KAAK,UAAU,EAGlB,MAAM,qBAAqB,CAAC;AAO7B,UAAU,iBAAiB;IACvB,OAAO,CAAC,SAAS,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IAEpC,IAAI,EAAE,UAAU,CAAC;CACpB;AAED,eAAO,MAAM,sBAAsB,gCAgDjC,CAAC;AAEH,eAAO,MAAM,WAAW,EAAE,MAAM,EAA8C,CAAC;AAE/E,wBAAsB,QAAQ,CAC1B,KAAK,EAAE,MAAM,EACb,UAAU,CAAC,EAAE,UAAU,EACvB,iBAAiB,CAAC,EAAE,iBAAiB,GACtC,OAAO,CAAC,UAAU,EAAE,CAAC,CAsBvB"}

package/esm/diagnostics.js

@@ -1,9 +1,8 @@
 // (C) 2021-2026 GoodData Corporation
-import { DefaultErrorStrategy, FailedPredicateException, InputMismatchException, NoViableAltException, } from "antlr4ts";
+import { DefaultErrorStrategy, FailedPredicateException, InputMismatchException, NoViableAltException, } from "antlr4ng";
 import { groupBy } from "lodash-es";
 import { Diagnostic, DiagnosticSeverity, Range } from "vscode-languageserver";
-import MaqlPkg from "@gooddata/maql-antlr4ts";
-const { AbstractAstVisitor, MaqlLexer, SyntaxErrorListener } = MaqlPkg;
+import { AbstractAstVisitor, MaqlLexer, SyntaxErrorListener, } from "@gooddata/maql-antlr4ts";
 import { isUnexpectedResponseError } from "@gooddata/sdk-backend-spi";
 import { areObjRefsEqual, serializeObjRef } from "@gooddata/sdk-model";
 import { ErrorCodes, diagnosticsSource } from "./constants.js";

package/esm/findObjects.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"findObjects.d.ts","sourceRoot":"","sources":["../src/findObjects.ts"],"names":[],"mappings":"AAkBA,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAC5C,OAAO,EAAE,KAAK,WAAW,EAAqB,MAAM,kBAAkB,CAAC;AAEvE;;GAEG;AACH,MAAM,WAAW,aAAc,SAAQ,WAAW;IAC9C,QAAQ,CAAC,OAAO,EAAE;QAAE,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAA;KAAE,CAAC;CACtE;AAED,wBAAgB,cAAc,CAAC,MAAM,EAAE,UAAU,GAAG,aAAa,EAAE,CAIlE"}
+{"version":3,"file":"findObjects.d.ts","sourceRoot":"","sources":["../src/findObjects.ts"],"names":[],"mappings":"AAoBA,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAC5C,OAAO,EAAE,KAAK,WAAW,EAAqB,MAAM,kBAAkB,CAAC;AAEvE;;GAEG;AACH,MAAM,WAAW,aAAc,SAAQ,WAAW;IAC9C,QAAQ,CAAC,OAAO,EAAE;QAAE,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAA;KAAE,CAAC;CACtE;AAED,wBAAgB,cAAc,CAAC,MAAM,EAAE,UAAU,GAAG,aAAa,EAAE,CAIlE"}

package/esm/findObjects.js

@@ -1,7 +1,6 @@
 // (C) 2021-2026 GoodData Corporation
-import { ParseTreeWalker } from "antlr4ts/tree/index.js";
-import MaqlPkg from "@gooddata/maql-antlr4ts";
-const { AttributeTypeContext, MaqlParser, NumericTypeContext } = MaqlPkg;
+import { ParseTreeWalker } from "antlr4ng";
+import { AttributeTypeContext, MaqlParser, MaqlParserListener, NumericTypeContext, } from "@gooddata/maql-antlr4ts";
 import { isTigerType, tigerIdTypeToObjectType } from "@gooddata/sdk-backend-tiger";
 import { normalizeMaqlObjectType } from "./maqlObjectTypes.js";
 import { MaqlMetric } from "./parseMaql.js";
@@ -12,61 +11,63 @@ export function findAllObjects(metric) {
     return finder.objects;
 }
 // TODO rewrite using AbstractAstVisitor
-class ObjectFinder {
+class ObjectFinder extends MaqlParserListener {
     objects;
-    visitTerminal; // to satisfy TS2559 - weak type detection
     constructor(objects = []) {
+        super();
         this.objects = objects;
     }
     pushObject(ctx, type) {
-        const lbrace = ctx.tryGetToken(MaqlParser.LBRACE, 0);
-        const sep = ctx.tryGetToken(MaqlParser.SEP, 0);
-        const id = ctx.tryGetToken(MaqlParser.ID, 0);
-        const rbrace = ctx.tryGetToken(MaqlParser.RBRACE, 0);
+        const lbrace = ctx.getToken(MaqlParser.LBRACE, 0);
+        const sep = ctx.getToken(MaqlParser.SEP, 0);
+        const id = ctx.getToken(MaqlParser.ID, 0);
+        const rbrace = ctx.getToken(MaqlParser.RBRACE, 0);
+        const start = ctx.start;
         // check that the object is complete
-        if (lbrace === undefined ||
+        if (lbrace === null ||
             lbrace.symbol.tokenIndex === -1 ||
-            sep === undefined ||
+            sep === null ||
             sep.symbol.tokenIndex === -1 ||
-            id === undefined ||
+            id === null ||
             id.symbol.tokenIndex === -1 ||
-            rbrace === undefined ||
+            rbrace === null ||
             rbrace.symbol.tokenIndex === -1 ||
-            type === undefined) {
+            type === undefined ||
+            start === null) {
             return;
         }
-        const range = antlrContextRange(ctx.start, ctx.stop);
+        const range = antlrContextRange(start, ctx.stop);
         // `actualType` keeps the MAQL spelling so diagnostics quote what the author wrote.
         //NOTE: The lexer accepts any casing, so fold it before the type is looked up.
         const tigerType = normalizeMaqlObjectType(type.toLowerCase());
         this.objects.push({
             tigerType: isTigerType(tigerType) ? tigerType : undefined,
             actualType: type,
-            id: ctx.ID().text,
+            id: id.getText(),
             ref: {
                 type: tigerIdTypeToObjectType[tigerType],
-                identifier: ctx.ID().text,
+                identifier: id.getText(),
             },
             range: range,
             offsets: {
-                start: MaqlMetric.rawOffset(ctx.start.startIndex),
-                end: MaqlMetric.rawOffset((ctx.stop?.stopIndex ?? ctx.start.stopIndex) + 1),
+                start: MaqlMetric.rawOffset(start.start),
+                end: MaqlMetric.rawOffset((ctx.stop?.stop ?? start.stop) + 1),
             },
         });
     }
-    exitAttribute(ctx) {
-        this.pushObject(ctx, ctx.tryGetRuleContext(0, AttributeTypeContext)?.text);
-    }
-    exitNumeric(ctx) {
-        this.pushObject(ctx, ctx.tryGetRuleContext(0, NumericTypeContext)?.text);
-    }
-    exitFact(ctx) {
-        this.pushObject(ctx, ctx.tryGetToken(MaqlParser.FACT, 0)?.text);
-    }
-    exitPrompt(ctx) {
-        this.pushObject(ctx, ctx.tryGetToken(MaqlParser.PROMPT, 0)?.text);
-    }
-    exitParameter(ctx) {
-        this.pushObject(ctx, ctx.tryGetToken(MaqlParser.PARAMETER, 0)?.text);
-    }
+    exitAttribute = (ctx) => {
+        this.pushObject(ctx, ctx.getRuleContext(0, AttributeTypeContext)?.getText());
+    };
+    exitNumeric = (ctx) => {
+        this.pushObject(ctx, ctx.getRuleContext(0, NumericTypeContext)?.getText());
+    };
+    exitFact = (ctx) => {
+        this.pushObject(ctx, ctx.getToken(MaqlParser.FACT, 0)?.getText());
+    };
+    exitPrompt = (ctx) => {
+        this.pushObject(ctx, ctx.getToken(MaqlParser.PROMPT, 0)?.getText());
+    };
+    exitParameter = (ctx) => {
+        this.pushObject(ctx, ctx.getToken(MaqlParser.PARAMETER, 0)?.getText());
+    };
 }

package/esm/format.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"format.d.ts","sourceRoot":"","sources":["../src/format.ts"],"names":[],"mappings":"AAUA,OAAO,EAAE,KAAK,iBAAiB,EAAiB,KAAK,KAAK,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AAQpG,wBAAgB,MAAM,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,iBAAiB,GAAG,QAAQ,EAAE,CAI5E;AAED,wBAAgB,WAAW,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,iBAAiB,GAAG,QAAQ,EAAE,CAI/F"}
+{"version":3,"file":"format.d.ts","sourceRoot":"","sources":["../src/format.ts"],"names":[],"mappings":"AAUA,OAAO,EAAE,KAAK,iBAAiB,EAAiB,KAAK,KAAK,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AA6CpG,wBAAgB,MAAM,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,iBAAiB,GAAG,QAAQ,EAAE,CAI5E;AAED,wBAAgB,WAAW,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,iBAAiB,GAAG,QAAQ,EAAE,CAI/F"}

package/esm/format.js

@@ -1,7 +1,6 @@
 // (C) 2022-2026 GoodData Corporation
-import { AbstractParseTreeVisitor, } from "antlr4ts/tree/index.js";
 import { TextEdit } from "vscode-languageserver";
-import Maql from "@gooddata/maql-antlr4ts";
+import { ExpressionListContext, MaqlExpressionContext, MaqlParser, MaqlParserVisitor, } from "@gooddata/maql-antlr4ts";
 import { TokenTypes, tokenTypeMap } from "./highlight/semanticsHighlight.js";
 import { MaqlMetric } from "./parseMaql.js";
 import { antlrContextRange, tokenRange } from "./tokenRanges.js";
@@ -35,11 +34,12 @@ export function formatRange(query, range, options) {
  * using the same token, the first rule triggered has precedence.
  * Most important are the whitespace (WS) tokens, which are strings of whitespace characters - spaces, new lines, tabs etc.
  */
-class MaqlFormatter extends AbstractParseTreeVisitor {
+class MaqlFormatter extends MaqlParserVisitor {
     options;
     indentationLevel = 0;
     formattedTokens;
     stream;
+    range;
     get indentSpaces() {
         return " ".repeat(this.indentationLevel * this.options.tabSize);
     }
@@ -48,10 +48,7 @@ class MaqlFormatter extends AbstractParseTreeVisitor {
         this.options = options;
         this.formattedTokens = new Set();
         this.stream = metric.tokenStream;
-        if (range) {
-            // if a range is specified do not enter contexts where the intersection with the context range is empty
-            this.visit = (tree) => this.visitInRange(tree, range);
-        }
+        this.range = range;
     }
     defaultResult() {
         return [];
@@ -59,14 +56,22 @@ class MaqlFormatter extends AbstractParseTreeVisitor {
     aggregateResult(aggregate, nextResult) {
         return aggregate.concat(nextResult);
     }
+    visit(tree) {
+        // if a range is specified do not enter contexts where the intersection with the context range is empty
+        if (this.range) {
+            return this.visitInRange(tree, this.range);
+        }
+        return super.visit(tree) ?? this.defaultResult();
+    }
     visitInRange(tree, range) {
-        const treeRange = antlrContextRange(this.stream.get(tree.sourceInterval.a), this.stream.get(tree.sourceInterval.b)).toRange();
+        const interval = tree.getSourceInterval();
+        const treeRange = antlrContextRange(this.stream.get(interval.start), this.stream.get(interval.stop)).toRange();
         if (!this.intersects(treeRange, range)) {
             return this.defaultResult();
         }
-        return super.visit(tree).filter((edit) => this.intersects(edit.range, range));
+        return (super.visit(tree) ?? []).filter((edit) => this.intersects(edit.range, range));
     }
-    visitChildren(node, firstChild = 0, lastChild = node.childCount - 1) {
+    visitChildren(node, firstChild = 0, lastChild = node.getChildCount() - 1) {
         let result = this.defaultResult();
         for (let i = firstChild; i <= lastChild; i++) {
             if (!this.shouldVisitNextChild(node, result)) {
@@ -129,8 +134,8 @@ class MaqlFormatter extends AbstractParseTreeVisitor {
         edits.push(...this.visitChildren(ctx));
         return edits;
     }
-    visitFunctionCall = this.visitFunctionCallCommon;
-    visitFunctionCallRun(ctx) {
+    visitFunctionCall = (ctx) => this.visitFunctionCallCommon(ctx);
+    visitFunctionCallRun = (ctx) => {
         const edits = [];
         edits.push(...this.visitFunctionCallCommon(ctx));
         const withinCtx = ctx.within();
@@ -142,8 +147,8 @@ class MaqlFormatter extends AbstractParseTreeVisitor {
             edits.push(...this.visitFunctionCallClause(rollWindowCtx));
         }
         return edits;
-    }
-    visitFunctionCallRank(ctx) {
+    };
+    visitFunctionCallRank = (ctx) => {
         const edits = [];
         edits.push(...this.visitFunctionCallCommon(ctx));
         const rankDirCtx = ctx.rankDir();
@@ -155,8 +160,8 @@ class MaqlFormatter extends AbstractParseTreeVisitor {
             edits.push(...this.visitFunctionCallClause(withinCtx));
         }
         return edits;
-    }
-    visitFunctionCallLastFirstValue(ctx) {
+    };
+    visitFunctionCallLastFirstValue = (ctx) => {
         const edits = [];
         edits.push(...this.visitFunctionCallCommon(ctx));
         const orderByCtx = ctx.orderby();
@@ -168,20 +173,26 @@ class MaqlFormatter extends AbstractParseTreeVisitor {
             edits.push(...this.visitFunctionCallClause(withinCtx));
         }
         return edits;
-    }
+    };
     /**
      * Ensure new line before function modifying clauses e.g. WITHIN
      */
     visitFunctionCallClause(ctx) {
         const edits = [];
-        edits.push(...this.ensureNewline(this.getHiddenToLeft(ctx.start), tokenRange(ctx.start).start));
+        const start = ctx.start;
+        if (start) {
+            edits.push(...this.ensureNewline(this.getHiddenToLeft(start), tokenRange(start).start));
+        }
         edits.push(...this.visit(ctx));
         return edits;
     }
     visitFunctionCallCommon(ctx) {
         const edits = [];
-        edits.push(...this.visit(ctx.getChild(0)));
-        const lparen = ctx.tryGetToken(Maql.MaqlParser.LPAREN, 0)?.symbol;
+        const name = ctx.getChild(0);
+        if (name) {
+            edits.push(...this.visit(name));
+        }
+        const lparen = ctx.getToken(MaqlParser.LPAREN, 0)?.symbol;
         if (lparen) {
             edits.push(...this.removeWhitespace(this.getHiddenToLeft(lparen)));
         }
@@ -189,12 +200,11 @@ class MaqlFormatter extends AbstractParseTreeVisitor {
             edits.push(...this.ensureWhitespace(this.getHiddenToRight(lparen), "", undefined, tokenRange(lparen).end));
         }
         this.indent();
-        const argsCtx = ctx.tryGetRuleContext(0, Maql.ExpressionListContext) ??
-            ctx.tryGetRuleContext(0, Maql.MaqlExpressionContext);
+        const argsCtx = ctx.getRuleContext(0, ExpressionListContext) ?? ctx.getRuleContext(0, MaqlExpressionContext);
         if (argsCtx) {
             edits.push(...this.visit(argsCtx));
         }
-        const rparen = ctx.tryGetToken(Maql.MaqlParser.RPAREN, 0)?.symbol;
+        const rparen = ctx.getToken(MaqlParser.RPAREN, 0)?.symbol;
         if (rparen) {
             edits.push(...this.removeWhitespace(this.getHiddenToLeft(rparen)));
         }
@@ -204,9 +214,12 @@ class MaqlFormatter extends AbstractParseTreeVisitor {
         }
         return edits;
     }
-    visitTimeMacro(ctx) {
+    visitTimeMacro = (ctx) => {
         const edits = [];
-        edits.push(...this.visit(ctx.getChild(0)));
+        const name = ctx.getChild(0);
+        if (name) {
+            edits.push(...this.visit(name));
+        }
         const lparen = ctx.LPAREN().symbol;
         edits.push(...this.removeWhitespace(this.getHiddenToLeft(lparen)));
         edits.push(...this.ensureWhitespace(this.getHiddenToRight(lparen), "", undefined, tokenRange(lparen).end));
@@ -227,27 +240,19 @@ class MaqlFormatter extends AbstractParseTreeVisitor {
             edits.push(...this.visit(amountCtx));
         }
         return edits;
-    }
-    visitExpressionList(ctx) {
+    };
+    visitExpressionList = (ctx) => {
         const edits = [];
-        const commaContext = ctx.COMMA();
-        const commas = (Array.isArray(commaContext) ? commaContext : [commaContext])
-            .map((c) => c?.symbol)
-            .filter((c) => c !== undefined);
-        for (const comma of commas) {
+        for (const comma of ctx.COMMA().map((c) => c.symbol)) {
             edits.push(...this.removeWhitespace(this.getHiddenToLeft(comma)));
             const commaRange = tokenRange(comma);
             edits.push(...this.ensureSpace(this.getHiddenToRight(comma), commaRange.end));
         }
         edits.push(...this.visitChildren(ctx));
         return edits;
-    }
-    visitDisjunction(ctx) {
-        return this.visitLogicalOperatorExpression(ctx, () => ctx.OR());
-    }
-    visitConjunction(ctx) {
-        return this.visitLogicalOperatorExpression(ctx, () => ctx.AND());
-    }
+    };
+    visitDisjunction = (ctx) => this.visitLogicalOperatorExpression(ctx, () => ctx.OR());
+    visitConjunction = (ctx) => this.visitLogicalOperatorExpression(ctx, () => ctx.AND());
     visitLogicalOperatorExpression(ctx, ops) {
         const edits = [];
         for (const opNode of ops()) {
@@ -259,18 +264,14 @@ class MaqlFormatter extends AbstractParseTreeVisitor {
         edits.push(...this.visitChildren(ctx));
         return edits;
     }
-    visitAddition(ctx) {
-        return this.visitArithmeticOperatorExpression(ctx, () => ctx
-            .additiveOperator()
-            .map((it) => it.PLUS() ?? it.MINUS())
-            .filter((it) => !!it));
-    }
-    visitMultiplication(ctx) {
-        return this.visitArithmeticOperatorExpression(ctx, () => ctx
-            .multiplicativeOperator()
-            .map((it) => it.MUL() ?? it.DIV())
-            .filter((it) => !!it));
-    }
+    visitAddition = (ctx) => this.visitArithmeticOperatorExpression(ctx, () => ctx
+        .additiveOperator()
+        .map((it) => it.PLUS() ?? it.MINUS())
+        .filter((it) => !!it));
+    visitMultiplication = (ctx) => this.visitArithmeticOperatorExpression(ctx, () => ctx
+        .multiplicativeOperator()
+        .map((it) => it.MUL() ?? it.DIV())
+        .filter((it) => !!it));
     visitArithmeticOperatorExpression(ctx, ops) {
         const edits = [];
         for (const opNode of ops()) {
@@ -282,7 +283,7 @@ class MaqlFormatter extends AbstractParseTreeVisitor {
         edits.push(...this.visitChildren(ctx));
         return edits;
     }
-    visitRelationRelop(ctx) {
+    visitRelationRelop = (ctx) => {
         const edits = [];
         const relop = ctx.RELOP().symbol;
         const relopRange = tokenRange(relop);
@@ -290,19 +291,19 @@ class MaqlFormatter extends AbstractParseTreeVisitor {
         edits.push(...this.ensureSpace(this.getHiddenToRight(relop), relopRange.end));
         edits.push(...this.visitChildren(ctx));
         return edits;
-    }
-    visitRelationLike(ctx) {
+    };
+    visitRelationLike = (ctx) => {
         const edits = [];
         const likeCtx = ctx.like();
-        const item = likeCtx.LIKE() || likeCtx.ILIKE();
+        const item = likeCtx.LIKE() ?? likeCtx.ILIKE();
         const like = item.symbol;
         const likeRange = tokenRange(like);
         edits.push(...this.ensureSpace(this.getHiddenToLeft(like), likeRange.start));
         edits.push(...this.ensureSpace(this.getHiddenToRight(like), likeRange.end));
         edits.push(...this.visit(likeCtx));
         return edits;
-    }
-    visitRelationBetween(ctx) {
+    };
+    visitRelationBetween = (ctx) => {
         const edits = [];
         const between = ctx.BETWEEN().symbol;
         const betweenRange = tokenRange(between);
@@ -314,8 +315,8 @@ class MaqlFormatter extends AbstractParseTreeVisitor {
         edits.push(...this.ensureSpace(this.getHiddenToRight(and), andRange.end));
         edits.push(...this.visitChildren(ctx));
         return edits;
-    }
-    visitRelationNot(ctx) {
+    };
+    visitRelationNot = (ctx) => {
         const not = ctx.NOT();
         const edits = [];
         if (not) {
@@ -327,8 +328,8 @@ class MaqlFormatter extends AbstractParseTreeVisitor {
         }
         edits.push(...this.visit(ctx.relationNegatable()));
         return edits;
-    }
-    visitRelationIn(ctx) {
+    };
+    visitRelationIn = (ctx) => {
         const edits = [];
         const int = ctx.IN().symbol;
         const range = tokenRange(int);
@@ -337,19 +338,19 @@ class MaqlFormatter extends AbstractParseTreeVisitor {
         edits.push(...this.visit(ctx.IN()));
         const lparen = ctx.LPAREN().symbol;
         const lparenRange = tokenRange(lparen);
-        if (ctx.listLiteral() === undefined) {
+        if (ctx.listLiteral() === null) {
             edits.push(...this.removeWhitespace(this.getHiddenToLeft(ctx.RPAREN().symbol)));
         }
         else {
             this.indent();
             edits.push(...this.ensureNewline(this.getHiddenToRight(lparen), lparenRange.end));
-            edits.push(...this.visitChildren(ctx, 1, ctx.childCount - 2));
+            edits.push(...this.visitChildren(ctx, 1, ctx.getChildCount() - 2));
             this.dedent();
         }
         edits.push(...this.visit(ctx.RPAREN()));
         return edits;
-    }
-    visitSelectExpression(ctx) {
+    };
+    visitSelectExpression = (ctx) => {
         const edits = [];
         const select = ctx.SELECT().symbol;
         const selectRange = tokenRange(select);
@@ -360,11 +361,9 @@ class MaqlFormatter extends AbstractParseTreeVisitor {
         edits.push(...this.visitChildren(ctx, 1));
         this.dedent();
         return edits;
-    }
-    visitBy(ctx) {
-        return this.visitKeywordOfStatement(ctx, () => ctx.BY());
-    }
-    visitForEach(ctx) {
+    };
+    visitBy = (ctx) => this.visitKeywordOfStatement(ctx, () => ctx.BY());
+    visitForEach = (ctx) => {
         const edits = [];
         const forEach = ctx.FOR().symbol;
         const forEachRange = tokenRange(forEach);
@@ -373,25 +372,13 @@ class MaqlFormatter extends AbstractParseTreeVisitor {
         edits.push(...this.visitChildren(ctx, 1));
         this.dedent();
         return edits;
-    }
-    visitForTransformation(ctx) {
-        return this.visitKeywordOfStatement(ctx, () => ctx.FOR());
-    }
-    visitWhere(ctx) {
-        return this.visitKeywordOfStatement(ctx, () => ctx.WHERE());
-    }
-    visitHaving(ctx) {
-        return this.visitKeywordOfStatement(ctx, () => ctx.HAVING());
-    }
-    visitUsing(ctx) {
-        return this.visitKeywordOfStatement(ctx, () => ctx.USING());
-    }
-    visitWithPf(ctx) {
-        return this.visitKeywordOfStatement(ctx, () => ctx.WITH());
-    }
-    visitWithoutPf(ctx) {
-        return this.visitKeywordOfStatement(ctx, () => ctx.WITHOUT());
-    }
+    };
+    visitForTransformation = (ctx) => this.visitKeywordOfStatement(ctx, () => ctx.FOR());
+    visitWhere = (ctx) => this.visitKeywordOfStatement(ctx, () => ctx.WHERE());
+    visitHaving = (ctx) => this.visitKeywordOfStatement(ctx, () => ctx.HAVING());
+    visitUsing = (ctx) => this.visitKeywordOfStatement(ctx, () => ctx.USING());
+    visitWithPf = (ctx) => this.visitKeywordOfStatement(ctx, () => ctx.WITH());
+    visitWithoutPf = (ctx) => this.visitKeywordOfStatement(ctx, () => ctx.WITHOUT());
     visitKeywordOfStatement(ctx, keyword) {
         const edits = [];
         const kw = keyword().symbol;
@@ -402,13 +389,9 @@ class MaqlFormatter extends AbstractParseTreeVisitor {
         edits.push(...this.visitChildren(ctx, 1));
         return edits;
     }
-    visitAttributeList(ctx) {
-        return this.visitNewlineSeparatedCommaList(ctx);
-    }
+    visitAttributeList = (ctx) => this.visitNewlineSeparatedCommaList(ctx);
     // oxlint-disable-next-line sonarjs/no-identical-functions -- distinct ANTLR visitor override with intentionally identical formatting behavior
-    visitListLiteral(ctx) {
-        return this.visitNewlineSeparatedCommaList(ctx);
-    }
+    visitListLiteral = (ctx) => this.visitNewlineSeparatedCommaList(ctx);
     visitNewlineSeparatedCommaList(ctx) {
         const edits = [];
         for (const comma of ctx.COMMA()) {
@@ -419,18 +402,18 @@ class MaqlFormatter extends AbstractParseTreeVisitor {
         edits.push(...this.visitChildren(ctx));
         return edits;
     }
-    visitIf(ctx) {
+    visitIf = (ctx) => {
         const edits = [];
         edits.push(...this.visit(ctx.IF()));
         edits.push(...this.visitElse(ctx));
         return edits;
-    }
-    visitCase(ctx) {
+    };
+    visitCase = (ctx) => {
         const edits = [];
         edits.push(...this.visit(ctx.CASE()));
         edits.push(...this.visitElse(ctx));
         return edits;
-    }
+    };
     visitElse(ctx) {
         const edits = [];
         this.indent();
@@ -439,14 +422,19 @@ class MaqlFormatter extends AbstractParseTreeVisitor {
             edits.push(...this.ensureNewline(this.getHiddenToLeft(elseCtx.symbol), tokenRange(elseCtx.symbol).start));
             edits.push(...this.visit(elseCtx));
         }
-        edits.push(...this.visitChildren(ctx, 1, ctx.childCount - 2));
+        // error recovery may leave an IF/CASE without its END token; the generated END() then returns null
+        const endNode = ctx.getToken(MaqlParser.END, 0);
+        const lastChild = endNode ? ctx.getChildCount() - 2 : ctx.getChildCount() - 1;
+        edits.push(...this.visitChildren(ctx, 1, lastChild));
         this.dedent();
-        const end = ctx.END()?.symbol;
-        edits.push(...this.ensureNewline(this.getHiddenToLeft(end), tokenRange(end).start));
-        edits.push(...this.visit(ctx.END()));
+        if (endNode) {
+            const end = endNode.symbol;
+            edits.push(...this.ensureNewline(this.getHiddenToLeft(end), tokenRange(end).start));
+            edits.push(...this.visit(endNode));
+        }
         return edits;
     }
-    visitCaseConditional(ctx) {
+    visitCaseConditional = (ctx) => {
         const edits = this.defaultResult();
         for (const when of ctx.WHEN()) {
             const token = when.symbol;
@@ -454,10 +442,10 @@ class MaqlFormatter extends AbstractParseTreeVisitor {
         }
         edits.push(...this.visitChildren(ctx));
         return edits;
-    }
-    visitTransFunction(ctx) {
+    };
+    visitTransFunction = (ctx) => {
         const token = ctx.NEXT() ?? ctx.NEXTPERIOD() ?? ctx.PREVIOUS() ?? ctx.PREVIOUSPERIOD();
-        const text = token?.text;
+        const text = token?.getText();
         const edited = text ? formatTransFunction(text) : undefined;
         if (!token || !edited || text === edited)
             return this.defaultResult();
@@ -465,7 +453,7 @@ class MaqlFormatter extends AbstractParseTreeVisitor {
         if (!this.inRange(range))
             return this.defaultResult();
         return [TextEdit.replace(range, edited)];
-    }
+    };
     /**
      * Shortens whitespace, trims trailing spaces, inserts string at the start of the last line
      * @param whitespace - is assumed to be the token text of a MaqlParser.WS token
@@ -493,7 +481,7 @@ class MaqlFormatter extends AbstractParseTreeVisitor {
             .map((token) => {
             if (!token.text || this.formattedTokens.has(token.tokenIndex))
                 return null;
-            if (token.type === Maql.MaqlParser.WS) {
+            if (token.type === MaqlParser.WS) {
                 const range = tokenRange(token);
                 const edited = this.formatWhitespace(token.text, finalInline, finalNewline);
                 if (token.text !== edited) {
@@ -524,7 +512,7 @@ class MaqlFormatter extends AbstractParseTreeVisitor {
             if (!token.text || this.formattedTokens.has(token.tokenIndex))
                 return;
             this.formattedTokens.add(token.tokenIndex);
-            if (token.type === Maql.MaqlParser.WS) {
+            if (token.type === MaqlParser.WS) {
                 const range = tokenRange(token);
                 const edited = prevIsLineComment
                     ? "\n" + this.indentSpaces
@@ -535,7 +523,7 @@ class MaqlFormatter extends AbstractParseTreeVisitor {
                     edits.push(TextEdit.replace(range, edited));
                 }
             }
-            prevIsLineComment = token.type === Maql.MaqlParser.Comment;
+            prevIsLineComment = token.type === MaqlParser.Comment;
         });
         return edits;
     }
@@ -557,12 +545,12 @@ class MaqlFormatter extends AbstractParseTreeVisitor {
     getHiddenToLeft(token) {
         if (token.tokenIndex < 0 || token.tokenIndex >= this.stream.size)
             return [];
-        return this.stream.getHiddenTokensToLeft(token.tokenIndex, -1);
+        return this.stream.getHiddenTokensToLeft(token.tokenIndex, -1) ?? [];
     }
     getHiddenToRight(token) {
         if (token.tokenIndex < 0 || token.tokenIndex >= this.stream.size)
             return [];
-        return this.stream.getHiddenTokensToRight(token.tokenIndex, -1);
+        return this.stream.getHiddenTokensToRight(token.tokenIndex, -1) ?? [];
     }
 }
 function formatTransFunction(func) {

package/esm/highlight/semanticsHighlight.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"semanticsHighlight.d.ts","sourceRoot":"","sources":["../../src/highlight/semanticsHighlight.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,KAAK,KAAK,EAAE,KAAK,oBAAoB,EAAE,MAAM,uBAAuB,CAAC;AAgB9E;;GAEG;AACH,oBAAY,UAAU;IAClB,IAAI,IAAA;IACJ,OAAO,IAAA;IACP,QAAQ,IAAA;IACR,QAAQ,IAAA;IACR,MAAM,IAAA;IACN,QAAQ,IAAA;IACR,MAAM,IAAA;IACN,OAAO,IAAA;IACP,KAAK,IAAA;IACL,IAAI,IAAA;IACJ,MAAM,KAAA;IACN,OAAO,KAAA;CACV;AAED;;GAEG;AACH,oBAAY,aAAa;IACrB,UAAU,IAAA;CACb;AAED;;GAEG;AACH,eAAO,MAAM,cAAc,UAE1B,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,iBAAiB,UAE7B,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,oBAAoB,EAAE,oBAGlC,CAAC;AAoKF,eAAO,MAAM,YAAY,qBAA4B,CAAC;AA2CtD,wBAAgB,aAAa,CAAC,KAAK,EAAE,MAAM,GAAG,cAAc,EAAE,CAG7D;AAQD;;GAEG;AACH,MAAM,MAAM,cAAc,GAAG;IACzB,QAAQ,EAAE,KAAK,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,MAAM,EAAE,CAAC;CACvB,CAAC"}
+{"version":3,"file":"semanticsHighlight.d.ts","sourceRoot":"","sources":["../../src/highlight/semanticsHighlight.ts"],"names":[],"mappings":"AAUA,OAAO,EAAE,KAAK,KAAK,EAAE,KAAK,oBAAoB,EAAE,MAAM,uBAAuB,CAAC;AAkB9E;;GAEG;AACH,oBAAY,UAAU;IAClB,IAAI,IAAA;IACJ,OAAO,IAAA;IACP,QAAQ,IAAA;IACR,QAAQ,IAAA;IACR,MAAM,IAAA;IACN,QAAQ,IAAA;IACR,MAAM,IAAA;IACN,OAAO,IAAA;IACP,KAAK,IAAA;IACL,IAAI,IAAA;IACJ,MAAM,KAAA;IACN,OAAO,KAAA;CACV;AAED;;GAEG;AACH,oBAAY,aAAa;IACrB,UAAU,IAAA;CACb;AAED;;GAEG;AACH,eAAO,MAAM,cAAc,UAE1B,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,iBAAiB,UAE7B,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,oBAAoB,EAAE,oBAGlC,CAAC;AAoKF,eAAO,MAAM,YAAY,qBAA4B,CAAC;AA2CtD,wBAAgB,aAAa,CAAC,KAAK,EAAE,MAAM,GAAG,cAAc,EAAE,CAG7D;AAQD;;GAEG;AACH,MAAM,MAAM,cAAc,GAAG;IACzB,QAAQ,EAAE,KAAK,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,MAAM,EAAE,CAAC;CACvB,CAAC"}

package/esm/highlight/semanticsHighlight.js

@@ -1,7 +1,6 @@
 // (C) 2021-2026 GoodData Corporation
-import { ParseTreeWalker, } from "antlr4ts/tree/index.js";
-import MaqlPkg from "@gooddata/maql-antlr4ts";
-const { AttributeTypeContext, MaqlLexer, NumericTypeContext } = MaqlPkg;
+import { ParseTreeWalker, } from "antlr4ng";
+import { AttributeTypeContext, MaqlLexer, MaqlParserListener, NumericTypeContext, } from "@gooddata/maql-antlr4ts";
 import { LanguageId } from "../constants.js";
 import { MaqlMetric } from "../parseMaql.js";
 import { antlrContextRange } from "../tokenRanges.js";
@@ -251,11 +250,12 @@ function tokenize(tree, stream) {
  * Parse tree listener that assigns semantic tokens to nodes of a MAQL parse tree, usually by directly mapping
  * from a MAQL token, but is able to use more complicated logic in special cases.
  */
-class SemanticTokenizer {
+class SemanticTokenizer extends MaqlParserListener {
     stream;
     tokens = [];
     skipNodes = false;
     constructor(stream) {
+        super();
         this.stream = stream;
     }
     visitTerminal(node) {
@@ -275,35 +275,37 @@ class SemanticTokenizer {
     }
     exitObject(ctx, objectTypeId = -1) {
         this.skipNodes = false;
-        this.pushHiddenTokensToLeft(ctx.start.tokenIndex);
+        if (ctx.start) {
+            this.pushHiddenTokensToLeft(ctx.start.tokenIndex);
+        }
         this.pushRule(ctx, objectTypeId);
     }
     enterAttribute = this.enterObject;
-    exitAttribute(ctx) {
-        const typeCtx = ctx.tryGetChild(0, AttributeTypeContext);
+    exitAttribute = (ctx) => {
+        const typeCtx = ctx.getRuleContext(0, AttributeTypeContext);
         const type = typeCtx?.ATTRIBUTE() ??
             typeCtx?.COMPUTED_ATTRIBUTE_OBJECT() ??
             typeCtx?.LABEL() ??
             typeCtx?.DATASET();
         this.exitObject(ctx, this.getTokenId(type));
-    }
+    };
     enterNumeric = this.enterObject;
-    exitNumeric(ctx) {
-        const typeCtx = ctx.tryGetChild(0, NumericTypeContext);
+    exitNumeric = (ctx) => {
+        const typeCtx = ctx.getRuleContext(0, NumericTypeContext);
         this.exitObject(ctx, this.getTokenId(typeCtx?.FACT() ?? typeCtx?.METRIC_TYPE()));
-    }
-    exitFact(ctx) {
+    };
+    exitFact = (ctx) => {
         this.exitObject(ctx, this.getTokenId(ctx.FACT()));
-    }
+    };
     enterParameter = this.enterObject;
-    exitParameter(ctx) {
+    exitParameter = (ctx) => {
         this.exitObject(ctx, this.getTokenId(ctx.PARAMETER()));
-    }
+    };
     getTokenId = (node) => node?.symbol.type;
     pushHiddenTokensToLeft(tokenIndex) {
         if (tokenIndex < 0 || this.stream.size < tokenIndex)
             return;
-        this.stream.getHiddenTokensToLeft(tokenIndex, -1).forEach((token) => this.pushToken(token));
+        (this.stream.getHiddenTokensToLeft(tokenIndex, -1) ?? []).forEach((token) => this.pushToken(token));
     }
     pushToken(token) {
         if (SKIP_TOKENS.includes(token.type))
@@ -311,12 +313,14 @@ class SemanticTokenizer {
         const tokenType = tokenTypeMap.get(token.type) ?? TokenTypes.Type;
         if (!token.text)
             return;
-        this.push(token.text, token.line, token.charPositionInLine, tokenType);
+        this.push(token.text, token.line, token.column, tokenType);
     }
     pushRule(rule, objectTypeId) {
+        if (!rule.start)
+            return;
         const tokenType = getObjectTypeTokenType(objectTypeId) ?? TokenTypes.Type;
         const range = antlrContextRange(rule.start, rule.stop);
-        this.push(rule.text, range.startLine, range.startCharacter, tokenType);
+        this.push(rule.getText(), range.startLine, range.startCharacter, tokenType);
     }
     push(text, antlrLine, antlrCharacter, tokenType, tokenModifiers = []) {
         const lines = text.split("\n");

package/esm/labelElements.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"labelElements.d.ts","sourceRoot":"","sources":["../src/labelElements.ts"],"names":[],"mappings":"AAEA,OAAgB,EAIZ,KAAK,SAAS,EAIjB,MAAM,yBAAyB,CAAC;AAKjC,OAAO,EAAE,KAAK,UAAU,EAAE,MAAM,gBAAgB,CAAC;AACjD,OAAO,EACH,UAAU,EACV,KAAK,WAAW,EAChB,KAAK,WAAW,EAChB,KAAK,cAAc,EACnB,KAAK,QAAQ,EAGhB,MAAM,kBAAkB,CAAC;AAE1B;;;GAGG;AACH,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,UAAU,EAAE,QAAQ,EAAE,SAAS,GAAG,YAAY,CAKtF;AAED,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,UAAU,GAAG,CAAC,WAAW,EAAE,WAAW,CAAC,EAAE,CAIpF;AAED,qBAAa,YAAY;IACrB,QAAQ,CAAC,MAAM,EAAE,WAAW,EAAE,CAAM;IACpC,QAAQ,CAAC,OAAO,EAAE,WAAW,EAAE,CAAM;IACrC,QAAQ,CAAC,UAAU,EAAE,cAAc,EAAE,CAAM;IAE3C,IAAI,QAAQ,IAAI,QAAQ,EAAE,CAEzB;IAED,OAAO,IAAI,OAAO,CAEjB;IAED,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,UAAU,GAAG,YAAY,CAMvD;IAED,QAAQ,CAAC,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,UAAU,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,YAAY,CAuBvF;IAED,YAAY,CAAC,sBAAsB,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,KAAK,EAAE,UAAU,GAAG,YAAY,CAOjG;IAED,GAAG,CAAC,KAAK,EAAE,YAAY,GAAG,YAAY,CAKrC;IAED,QAAQ,IAAI,MAAM,CAOjB;CACJ"}
+{"version":3,"file":"labelElements.d.ts","sourceRoot":"","sources":["../src/labelElements.ts"],"names":[],"mappings":"AAEA,OAAO,EAKH,KAAK,SAAS,EAKjB,MAAM,yBAAyB,CAAC;AAIjC,OAAO,EAAE,KAAK,UAAU,EAAE,MAAM,gBAAgB,CAAC;AACjD,OAAO,EACH,UAAU,EACV,KAAK,WAAW,EAChB,KAAK,WAAW,EAChB,KAAK,cAAc,EACnB,KAAK,QAAQ,EAGhB,MAAM,kBAAkB,CAAC;AAE1B;;;GAGG;AACH,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,UAAU,EAAE,QAAQ,EAAE,SAAS,GAAG,YAAY,CAKtF;AAED,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,UAAU,GAAG,CAAC,WAAW,EAAE,WAAW,CAAC,EAAE,CAIpF;AAED,qBAAa,YAAY;IACrB,QAAQ,CAAC,MAAM,EAAE,WAAW,EAAE,CAAM;IACpC,QAAQ,CAAC,OAAO,EAAE,WAAW,EAAE,CAAM;IACrC,QAAQ,CAAC,UAAU,EAAE,cAAc,EAAE,CAAM;IAE3C,IAAI,QAAQ,IAAI,QAAQ,EAAE,CAEzB;IAED,OAAO,IAAI,OAAO,CAEjB;IAED,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,UAAU,GAAG,YAAY,CAMvD;IAED,QAAQ,CAAC,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,UAAU,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,YAAY,CAuBvF;IAED,YAAY,CAAC,sBAAsB,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,KAAK,EAAE,UAAU,GAAG,YAAY,CAOjG;IAED,GAAG,CAAC,KAAK,EAAE,YAAY,GAAG,YAAY,CAKrC;IAED,QAAQ,IAAI,MAAM,CAOjB;CACJ"}

package/esm/labelElements.js

@@ -1,6 +1,5 @@
 // (C) 2021-2026 GoodData Corporation
-import MaqlPkg from "@gooddata/maql-antlr4ts";
-const { AbstractAstVisitor, positionInRange } = MaqlPkg;
+import { AbstractAstVisitor, positionInRange, } from "@gooddata/maql-antlr4ts";
 import { isTigerType, tigerIdTypeToObjectType } from "@gooddata/sdk-backend-tiger";
 import { normalizeMaqlObjectType } from "./maqlObjectTypes.js";
 import { AntlrRange, isMaqlObject, isMaqlString, } from "./tokenRanges.js";

package/esm/metadata/parameters.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"parameters.d.ts","sourceRoot":"","sources":["../../src/metadata/parameters.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,KAAK,oBAAoB,EAA+B,MAAM,qBAAqB,CAAC;AAI7F,wBAAgB,kBAAkB,CAAC,UAAU,EAAE,oBAAoB,GAAG,MAAM,CAE3E;AAED,wBAAgB,qBAAqB,CAAC,UAAU,EAAE,oBAAoB,GAAG,MAAM,CAE9E;AAED,wBAAgB,gBAAgB,CAAC,UAAU,EAAE,oBAAoB,GAAG,MAAM,CAEzE;AAED;;;;GAIG;AACH,wBAAgB,sBAAsB,CAAC,UAAU,EAAE,OAAO,GAAG,UAAU,IAAI,oBAAoB,CAU9F;AAED;;;GAGG;AACH,wBAAgB,oBAAoB,CAAC,UAAU,EAAE,oBAAoB,GAAG,MAAM,CAI7E"}
+{"version":3,"file":"parameters.d.ts","sourceRoot":"","sources":["../../src/metadata/parameters.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,KAAK,oBAAoB,EAA+B,MAAM,qBAAqB,CAAC;AAE7F,wBAAgB,kBAAkB,CAAC,UAAU,EAAE,oBAAoB,GAAG,MAAM,CAE3E;AAED,wBAAgB,qBAAqB,CAAC,UAAU,EAAE,oBAAoB,GAAG,MAAM,CAE9E;AAED,wBAAgB,gBAAgB,CAAC,UAAU,EAAE,oBAAoB,GAAG,MAAM,CAEzE;AAED;;;;GAIG;AACH,wBAAgB,sBAAsB,CAAC,UAAU,EAAE,OAAO,GAAG,UAAU,IAAI,oBAAoB,CAU9F;AAED;;;GAGG;AACH,wBAAgB,oBAAoB,CAAC,UAAU,EAAE,oBAAoB,GAAG,MAAM,CAI7E"}

package/esm/metadata/parameters.js

@@ -1,7 +1,6 @@
 // (C) 2026 GoodData Corporation
-import MaqlPkg from "@gooddata/maql-antlr4ts";
+import { escapeString } from "@gooddata/maql-antlr4ts";
 import { isStringParameterDefinition } from "@gooddata/sdk-model";
-const { escapeString } = MaqlPkg;
 export function parameterTypeLabel(definition) {
     return definition.type.toLowerCase();
 }

package/esm/parameterConstraints.js

@@ -1,8 +1,7 @@
 // (C) 2026 GoodData Corporation
 import { groupBy } from "lodash-es";
 import { Diagnostic, DiagnosticSeverity } from "vscode-languageserver";
-import MaqlPkg from "@gooddata/maql-antlr4ts";
-const { MaqlLexer } = MaqlPkg;
+import { MaqlLexer, } from "@gooddata/maql-antlr4ts";
 import { isStringParameterDefinition } from "@gooddata/sdk-model";
 import { ErrorCodes, diagnosticsSource } from "./constants.js";
 import { AntlrRange, tokenRange } from "./tokenRanges.js";
@@ -142,7 +141,7 @@ function keywordRange(caseNode, metric) {
     const token = metric.tokenStream
         .getTokens()
         .find((candidate) => candidate.line - 1 === astRange.start.line &&
-        candidate.charPositionInLine === astRange.start.character &&
+        candidate.column === astRange.start.character &&
         (candidate.type === MaqlLexer.CASE || candidate.type === MaqlLexer.IF));
     return token ? tokenRange(token) : undefined;
 }

package/esm/parseMaql.d.ts

@@ -1,4 +1,4 @@
-import { type ANTLRErrorListener, type ANTLRErrorStrategy, CommonTokenStream, type ParserRuleContext, type Token } from "antlr4ts";
+import { type ANTLRErrorListener, CommonTokenStream, type DefaultErrorStrategy, type ParserRuleContext } from "antlr4ng";
 import { type AstNode, type MaqlLexer as MaqlLexerType, type MaqlParser as MaqlParserType } from "@gooddata/maql-antlr4ts";
 /**
  * Class holding different representations of a MAQL query
@@ -17,9 +17,9 @@ declare class MaqlQuery {
     private _tree;
     private _ast;
     constructor(raw: string);
-    addErrorListener(listener: ANTLRErrorListener<Token>): this;
+    addErrorListener(listener: ANTLRErrorListener): this;
     removeErrorListeners(): this;
-    setErrorHandler(errorHandler: ANTLRErrorStrategy): this;
+    setErrorHandler(errorHandler: DefaultErrorStrategy): this;
     private notifyChangedConfiguration;
 }
 /**

package/esm/parseMaql.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"parseMaql.d.ts","sourceRoot":"","sources":["../src/parseMaql.ts"],"names":[],"mappings":"AAEA,OAAO,EACH,KAAK,kBAAkB,EACvB,KAAK,kBAAkB,EACvB,iBAAiB,EACjB,KAAK,iBAAiB,EACtB,KAAK,KAAK,EACb,MAAM,UAAU,CAAC;AAElB,OAAgB,EACZ,KAAK,OAAO,EACZ,KAAK,SAAS,IAAI,aAAa,EAC/B,KAAK,UAAU,IAAI,cAAc,EACpC,MAAM,yBAAyB,CAAC;AAGjC;;;GAGG;AACH,cAAM,SAAS;IAqCC,QAAQ,CAAC,GAAG,EAAE,MAAM;IApChC,IAAI,KAAK,IAAI,aAAa,CAGzB;IAED,IAAI,WAAW,IAAI,iBAAiB,CAGnC;IAED,IAAI,MAAM,IAAI,cAAc,CAG3B;IAED,IAAI,IAAI,IAAI,iBAAiB,CAK5B;IAED,IAAI,GAAG,IAAI,OAAO,CAMjB;IAED,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAgB;IACvC,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAoB;IACjD,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAiB;IACzC,OAAO,CAAC,KAAK,CAAgC;IAC7C,OAAO,CAAC,IAAI,CAAsB;IAElC,YAAqB,GAAG,EAAE,MAAM,EAK/B;IAED,gBAAgB,CAAC,QAAQ,EAAE,kBAAkB,CAAC,KAAK,CAAC,GAAG,IAAI,CAI1D;IAED,oBAAoB,IAAI,IAAI,CAI3B;IAED,eAAe,CAAC,YAAY,EAAE,kBAAkB,GAAG,IAAI,CAItD;IAED,OAAO,CAAC,0BAA0B;CAIrC;AAED;;;;GAIG;AACH,qBAAa,UAAW,SAAQ,SAAS;IACrC,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,MAAM,CAA4B;IAE1D,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAEpC;IAED,6FAA6F;IAC7F,MAAM,CAAC,SAAS,CAAC,YAAY,EAAE,MAAM,GAAG,MAAM,CAE7C;IAED,YAAY,GAAG,EAAE,MAAM,EAAE,uBAAuB,UAAQ,EAKvD;IAED,IAAI,MAAM,IAAI,MAAM,CAEnB;CACJ;AAED;;GAEG;AACH,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAEvD"}
+{"version":3,"file":"parseMaql.d.ts","sourceRoot":"","sources":["../src/parseMaql.ts"],"names":[],"mappings":"AAEA,OAAO,EACH,KAAK,kBAAkB,EACvB,iBAAiB,EACjB,KAAK,oBAAoB,EACzB,KAAK,iBAAiB,EACzB,MAAM,UAAU,CAAC;AAElB,OAAO,EACH,KAAK,OAAO,EAIZ,KAAK,SAAS,IAAI,aAAa,EAE/B,KAAK,UAAU,IAAI,cAAc,EACpC,MAAM,yBAAyB,CAAC;AAEjC;;;GAGG;AACH,cAAM,SAAS;IAqCC,QAAQ,CAAC,GAAG,EAAE,MAAM;IApChC,IAAI,KAAK,IAAI,aAAa,CAGzB;IAED,IAAI,WAAW,IAAI,iBAAiB,CAGnC;IAED,IAAI,MAAM,IAAI,cAAc,CAG3B;IAED,IAAI,IAAI,IAAI,iBAAiB,CAK5B;IAED,IAAI,GAAG,IAAI,OAAO,CAMjB;IAED,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAgB;IACvC,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAoB;IACjD,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAiB;IACzC,OAAO,CAAC,KAAK,CAAgC;IAC7C,OAAO,CAAC,IAAI,CAAsB;IAElC,YAAqB,GAAG,EAAE,MAAM,EAK/B;IAED,gBAAgB,CAAC,QAAQ,EAAE,kBAAkB,GAAG,IAAI,CAInD;IAED,oBAAoB,IAAI,IAAI,CAI3B;IAED,eAAe,CAAC,YAAY,EAAE,oBAAoB,GAAG,IAAI,CAIxD;IAED,OAAO,CAAC,0BAA0B;CAIrC;AAED;;;;GAIG;AACH,qBAAa,UAAW,SAAQ,SAAS;IACrC,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,MAAM,CAA4B;IAE1D,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAEpC;IAED,6FAA6F;IAC7F,MAAM,CAAC,SAAS,CAAC,YAAY,EAAE,MAAM,GAAG,MAAM,CAE7C;IAED,YAAY,GAAG,EAAE,MAAM,EAAE,uBAAuB,UAAQ,EAKvD;IAED,IAAI,MAAM,IAAI,MAAM,CAEnB;CACJ;AAED;;GAEG;AACH,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAEvD"}

package/esm/parseMaql.js

@@ -1,7 +1,6 @@
 // (C) 2022-2026 GoodData Corporation
-import { CommonTokenStream, } from "antlr4ts";
-import MaqlPkg from "@gooddata/maql-antlr4ts";
-const { CaseInsensitiveCharStream, MaqlAstVisitor, MaqlLexer, MaqlParser } = MaqlPkg;
+import { CommonTokenStream, } from "antlr4ng";
+import { CaseInsensitiveCharStream, MaqlAstVisitor, MaqlLexer, MaqlParser, } from "@gooddata/maql-antlr4ts";
 /**
  * Class holding different representations of a MAQL query
  * Raw string, ANTLR4 classes (Lexer, TokenStream, Parser, parse tree), abstract syntax tree (AST)

package/esm/tokenRanges.d.ts

@@ -1,6 +1,6 @@
-import { type Token } from "antlr4ts";
-import { type Range } from "vscode-languageserver";
-import { type IRange } from "@gooddata/maql-antlr4ts";
+import type { Token } from "antlr4ng";
+import type { Range } from "vscode-languageserver";
+import type { IRange } from "@gooddata/maql-antlr4ts";
 import { type ITigerMetadataObject, type ITigerMetadataObjectStub } from "./metadata/model.js";
 export type MetadataObjectAndRange = ITigerMetadataObject & {
     range: Range;
@@ -23,7 +23,7 @@ export declare function isMaqlString(obj: IOperand): obj is IMaqlString;
 export declare function isMaqlTimeMacro(obj: IOperand): obj is IMaqlTimeMacro;
 export declare function tokenRange(token: Token): Range;
 export declare function defaultRange(line: number, character: number, endLine?: number, endCharacter?: number): Range;
-export declare function antlrContextRange(start: Token, stop?: Token): AntlrRange;
+export declare function antlrContextRange(start: Token, stop?: Token | null): AntlrRange;
 export declare class AntlrRange {
     readonly startLine: number;
     readonly startCharacter: number;

package/esm/tokenRanges.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tokenRanges.d.ts","sourceRoot":"","sources":["../src/tokenRanges.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,KAAK,EAAE,MAAM,UAAU,CAAC;AACtC,OAAO,EAAE,KAAK,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAEnD,OAAO,EAAE,KAAK,MAAM,EAAE,MAAM,yBAAyB,CAAC;AAEtD,OAAO,EAAE,KAAK,oBAAoB,EAAE,KAAK,wBAAwB,EAAE,MAAM,qBAAqB,CAAC;AAE/F,MAAM,MAAM,sBAAsB,GAAG,oBAAoB,GAAG;IAAE,KAAK,EAAE,KAAK,CAAA;CAAE,CAAC;AAE7E,MAAM,WAAW,QAAQ;IACrB,QAAQ,CAAC,KAAK,EAAE,UAAU,CAAC;CAC9B;AACD,MAAM,WAAW,WAAY,SAAQ,QAAQ,EAAE,wBAAwB;IACnE,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;CAC/B;AAED,MAAM,WAAW,WAAY,SAAQ,QAAQ;IACzC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;CAC3B;AAED,MAAM,WAAW,cAAe,SAAQ,QAAQ;IAC5C,QAAQ,CAAC,sBAAsB,EAAE,MAAM,CAAC;IACxC,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;CAChC;AAED,wBAAgB,YAAY,CAAC,GAAG,EAAE,QAAQ,GAAG,GAAG,IAAI,WAAW,CAE9D;AAED,wBAAgB,YAAY,CAAC,GAAG,EAAE,QAAQ,GAAG,GAAG,IAAI,WAAW,CAE9D;AAED,wBAAgB,eAAe,CAAC,GAAG,EAAE,QAAQ,GAAG,GAAG,IAAI,cAAc,CAEpE;AAED,wBAAgB,UAAU,CAAC,KAAK,EAAE,KAAK,GAAG,KAAK,CAY9C;AAED,wBAAgB,YAAY,CACxB,IAAI,EAAE,MAAM,EACZ,SAAS,EAAE,MAAM,EACjB,OAAO,GAAE,MAAa,EACtB,YAAY,GAAE,MAAkB,GACjC,KAAK,CASP;AAED,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,GAAE,KAAa,GAAG,UAAU,CAO/E;AAED,qBAAa,UAAU;IAEf,QAAQ,CAAC,SAAS,EAAE,MAAM;IAC1B,QAAQ,CAAC,cAAc,EAAE,MAAM;IAC/B,QAAQ,CAAC,OAAO,EAAE,MAAM;IACxB,QAAQ,CAAC,YAAY,EAAE,MAAM;IAJjC,YACa,SAAS,EAAE,MAAM,EACjB,cAAc,EAAE,MAAM,EACtB,OAAO,GAAE,MAAkB,EAC3B,YAAY,GAAE,MAAuB,EAC9C;IAEJ,MAAM,CAAC,YAAY,CAAC,QAAQ,EAAE,MAAM,cAOnC;IAED,OAAO,IAAI,KAAK,CAEf;CACJ"}
+{"version":3,"file":"tokenRanges.d.ts","sourceRoot":"","sources":["../src/tokenRanges.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,UAAU,CAAC;AACtC,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAEnD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAC;AAEtD,OAAO,EAAE,KAAK,oBAAoB,EAAE,KAAK,wBAAwB,EAAE,MAAM,qBAAqB,CAAC;AAE/F,MAAM,MAAM,sBAAsB,GAAG,oBAAoB,GAAG;IAAE,KAAK,EAAE,KAAK,CAAA;CAAE,CAAC;AAE7E,MAAM,WAAW,QAAQ;IACrB,QAAQ,CAAC,KAAK,EAAE,UAAU,CAAC;CAC9B;AACD,MAAM,WAAW,WAAY,SAAQ,QAAQ,EAAE,wBAAwB;IACnE,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;CAC/B;AAED,MAAM,WAAW,WAAY,SAAQ,QAAQ;IACzC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;CAC3B;AAED,MAAM,WAAW,cAAe,SAAQ,QAAQ;IAC5C,QAAQ,CAAC,sBAAsB,EAAE,MAAM,CAAC;IACxC,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;CAChC;AAED,wBAAgB,YAAY,CAAC,GAAG,EAAE,QAAQ,GAAG,GAAG,IAAI,WAAW,CAE9D;AAED,wBAAgB,YAAY,CAAC,GAAG,EAAE,QAAQ,GAAG,GAAG,IAAI,WAAW,CAE9D;AAED,wBAAgB,eAAe,CAAC,GAAG,EAAE,QAAQ,GAAG,GAAG,IAAI,cAAc,CAEpE;AAED,wBAAgB,UAAU,CAAC,KAAK,EAAE,KAAK,GAAG,KAAK,CAY9C;AAED,wBAAgB,YAAY,CACxB,IAAI,EAAE,MAAM,EACZ,SAAS,EAAE,MAAM,EACjB,OAAO,GAAE,MAAa,EACtB,YAAY,GAAE,MAAkB,GACjC,KAAK,CASP;AAED,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,GAAE,KAAK,GAAG,IAAY,GAAG,UAAU,CAGtF;AAED,qBAAa,UAAU;IAEf,QAAQ,CAAC,SAAS,EAAE,MAAM;IAC1B,QAAQ,CAAC,cAAc,EAAE,MAAM;IAC/B,QAAQ,CAAC,OAAO,EAAE,MAAM;IACxB,QAAQ,CAAC,YAAY,EAAE,MAAM;IAJjC,YACa,SAAS,EAAE,MAAM,EACjB,cAAc,EAAE,MAAM,EACtB,OAAO,GAAE,MAAkB,EAC3B,YAAY,GAAE,MAAuB,EAC9C;IAEJ,MAAM,CAAC,YAAY,CAAC,QAAQ,EAAE,MAAM,cAOnC;IAED,OAAO,IAAI,KAAK,CAEf;CACJ"}

package/esm/tokenRanges.js

@@ -12,7 +12,7 @@ export function tokenRange(token) {
     // subtract one line to change to indexing from zero
     // subtract one more for the added "parse metric" line
     const startLine = token.line - 2;
-    const startCharacter = token.charPositionInLine;
+    const startCharacter = token.column;
     const lines = token.text?.split("\n") ?? [""];
     const endLine = startLine + lines.length - 1;
     const endCharacter = lines[lines.length - 1].length + (startLine === endLine ? startCharacter : 0);
@@ -32,7 +32,8 @@ export function defaultRange(line, character, endLine = line, endCharacter = cha
     };
 }
 export function antlrContextRange(start, stop = start) {
-    return new AntlrRange(start.line, start.charPositionInLine, stop.line, stop.charPositionInLine + (stop.text?.length ?? 1));
+    const end = stop ?? start;
+    return new AntlrRange(start.line, start.column, end.line, end.column + (end.text?.length ?? 1));
 }
 export class AntlrRange {
     startLine;

package/esm/types/signatures.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"signatures.d.ts","sourceRoot":"","sources":["../../src/types/signatures.ts"],"names":[],"mappings":"AAEA,OAAgB,EACZ,KAAK,OAAO,EACZ,KAAK,eAAe,EACpB,KAAK,kBAAkB,EAG1B,MAAM,yBAAyB,CAAC;AAGjC,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAE1C,MAAM,WAAW,kBAAkB;IAC/B,IAAI,EAAE,QAAQ,CAAC;CAClB;AAED,oBAAY,YAAY;IACpB,QAAQ,IAAA;IACR,MAAM,IAAA;IACN,KAAK,IAAA;IACL,OAAO,IAAA;CACV;AAED;;GAEG;AACH,qBAAa,iBAAiB;IAKtB,QAAQ,CAAC,UAAU,EAAE,kBAAkB,EAAE;IACzC,QAAQ,CAAC,QAAQ,EAAE,YAAY;IALnC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IAEtB,YACI,IAAI,EAAE,MAAM,EACH,UAAU,EAAE,kBAAkB,EAAE,EAChC,QAAQ,EAAE,YAAY,EAGlC;IAED,QAAQ,IAAI,MAAM,CAcjB;CACJ;AAED;;GAEG;AACH,qBAAa,kBAAmB,SAAQ,iBAAiB;IAIjD,QAAQ,CAAC,OAAO,EAAE,kBAAkB;IAEpC,QAAQ,CAAC,MAAM,EAAE,OAAO;IAL5B,YACI,IAAI,EAAE,MAAM,EACZ,UAAU,EAAE,kBAAkB,EAAE,EACvB,OAAO,EAAE,kBAAkB,EACpC,QAAQ,EAAE,YAAY,EACb,MAAM,EAAE,OAAO,EAG3B;IAED,MAAM,CAAC,MAAM,CACT,IAAI,EAAE,MAAM,EACZ,UAAU,EAAE,QAAQ,EACpB,cAAc,EAAE,QAAQ,EAAE,EAC1B,QAAQ,eAAwB,EAChC,MAAM,UAAQ,GACf,kBAAkB,CAQpB;IAEQ,QAAQ,IAAI,MAAM,CAI1B;CACJ;AAED;;;;GAIG;AACH,wBAAgB,uBAAuB,CAAC,OAAO,EAAE,eAAe,EAAE,IAAI,EAAE,MAAM,GAAG,kBAAkB,EAAE,CASpG;AAED,wBAAgB,2BAA2B,CACvC,UAAU,EAAE,kBAAkB,EAC9B,IAAI,EAAE,MAAM,GACb,kBAAkB,CAQpB;AAED,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,OAAO,GAAG,kBAAkB,EAAE,CA2E3E"}
+{"version":3,"file":"signatures.d.ts","sourceRoot":"","sources":["../../src/types/signatures.ts"],"names":[],"mappings":"AAEA,OAAO,EACH,KAAK,OAAO,EACZ,KAAK,eAAe,EACpB,KAAK,kBAAkB,EAK1B,MAAM,yBAAyB,CAAC;AAEjC,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAE1C,MAAM,WAAW,kBAAkB;IAC/B,IAAI,EAAE,QAAQ,CAAC;CAClB;AAED,oBAAY,YAAY;IACpB,QAAQ,IAAA;IACR,MAAM,IAAA;IACN,KAAK,IAAA;IACL,OAAO,IAAA;CACV;AAED;;GAEG;AACH,qBAAa,iBAAiB;IAKtB,QAAQ,CAAC,UAAU,EAAE,kBAAkB,EAAE;IACzC,QAAQ,CAAC,QAAQ,EAAE,YAAY;IALnC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IAEtB,YACI,IAAI,EAAE,MAAM,EACH,UAAU,EAAE,kBAAkB,EAAE,EAChC,QAAQ,EAAE,YAAY,EAGlC;IAED,QAAQ,IAAI,MAAM,CAcjB;CACJ;AAED;;GAEG;AACH,qBAAa,kBAAmB,SAAQ,iBAAiB;IAIjD,QAAQ,CAAC,OAAO,EAAE,kBAAkB;IAEpC,QAAQ,CAAC,MAAM,EAAE,OAAO;IAL5B,YACI,IAAI,EAAE,MAAM,EACZ,UAAU,EAAE,kBAAkB,EAAE,EACvB,OAAO,EAAE,kBAAkB,EACpC,QAAQ,EAAE,YAAY,EACb,MAAM,EAAE,OAAO,EAG3B;IAED,MAAM,CAAC,MAAM,CACT,IAAI,EAAE,MAAM,EACZ,UAAU,EAAE,QAAQ,EACpB,cAAc,EAAE,QAAQ,EAAE,EAC1B,QAAQ,eAAwB,EAChC,MAAM,UAAQ,GACf,kBAAkB,CAQpB;IAEQ,QAAQ,IAAI,MAAM,CAI1B;CACJ;AAED;;;;GAIG;AACH,wBAAgB,uBAAuB,CAAC,OAAO,EAAE,eAAe,EAAE,IAAI,EAAE,MAAM,GAAG,kBAAkB,EAAE,CASpG;AAED,wBAAgB,2BAA2B,CACvC,UAAU,EAAE,kBAAkB,EAC9B,IAAI,EAAE,MAAM,GACb,kBAAkB,CAQpB;AAED,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,OAAO,GAAG,kBAAkB,EAAE,CA2E3E"}

package/esm/types/signatures.js

@@ -1,6 +1,5 @@
 // (C) 2021-2026 GoodData Corporation
-import MaqlPkg from "@gooddata/maql-antlr4ts";
-const { functionDefinitions, isMaqlFunctionName } = MaqlPkg;
+import { functionDefinitions, isMaqlFunctionName, } from "@gooddata/maql-antlr4ts";
 import { MaqlType } from "./hierarchy.js";
 export var CallNotation;
 (function (CallNotation) {

package/esm/types/typeChecking.d.ts

@@ -1,5 +1,4 @@
-import MaqlPkg, { type AstNode, type BooleanLiteralNode, type CaseNode, type ConditionalNode, type EmptyNode, type ExpressionNode, type FilterNode, type FunctionNode, type GranularityNode, type IRange, type IdentifierNode, type LastFirstValueFunctionNode, type ListNode, type NullLiteralNode, type NumberLiteralNode, type OperatorNode, type OrderByElementNode, type RankFunctionNode, type RankingFilterNode, type RunningFunctionNode, type SelectNode, type StringLiteralNode } from "@gooddata/maql-antlr4ts";
-declare const AbstractAstVisitor: typeof MaqlPkg.AbstractAstVisitor;
+import { AbstractAstVisitor, type AstNode, type BooleanLiteralNode, type CaseNode, type ConditionalNode, type EmptyNode, type ExpressionNode, type FilterNode, type FunctionNode, type GranularityNode, type IRange, type IdentifierNode, type LastFirstValueFunctionNode, type ListNode, type NullLiteralNode, type NumberLiteralNode, type OperatorNode, type OrderByElementNode, type RankFunctionNode, type RankingFilterNode, type RunningFunctionNode, type SelectNode, type StringLiteralNode } from "@gooddata/maql-antlr4ts";
 import { MaqlType } from "./hierarchy.js";
 import { type TypeModel } from "./typeModel.js";
 export interface ITypeConstraintsViolation {
@@ -52,5 +51,4 @@ export declare class AstTypeChecker extends AbstractAstVisitor<TypedAstNode> {
     private logUnexpectedOperandCount;
     private logViolation;
 }
-export {};
 //# sourceMappingURL=typeChecking.d.ts.map

package/esm/types/typeChecking.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"typeChecking.d.ts","sourceRoot":"","sources":["../../src/types/typeChecking.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"typeChecking.d.ts","sourceRoot":"","sources":["../../src/types/typeChecking.ts"],"names":[],"mappings":"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"}

package/esm/types/typeChecking.js

@@ -1,6 +1,5 @@
 // (C) 2022-2026 GoodData Corporation
-import MaqlPkg from "@gooddata/maql-antlr4ts";
-const { AbstractAstVisitor } = MaqlPkg;
+import { AbstractAstVisitor, } from "@gooddata/maql-antlr4ts";
 import { isTigerType } from "@gooddata/sdk-backend-tiger";
 import { normalizeMaqlObjectType } from "../maqlObjectTypes.js";
 import { MaqlType, abstractValueTypes, isSubtype, lowestCommonAncestor } from "./hierarchy.js";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gooddata/sdk-maql-language-server",
-  "version": "11.65.0-alpha.9",
+  "version": "11.65.1",
   "license": "MIT",
   "author": {
     "name": "Stellar",
@@ -20,18 +20,16 @@
   "types": "esm/index.d.ts",
   "exports": "./esm/index.js",
   "dependencies": {
-    "@gooddata/maql-antlr4ts": "0.5.1-02977c25.0",
-    "antlr4-c3": "1.1.16",
-    "antlr4ts": "0.5.0-alpha.4",
-    "assert": "2.1.0",
+    "@gooddata/maql-antlr4ts": "0.7.2",
+    "antlr4-c3": "3.4.4",
+    "antlr4ng": "3.0.16",
     "lodash-es": "^4.17.23",
-    "util": "0.12.5",
     "vscode-languageserver": "8.1.0",
     "vscode-languageserver-textdocument": "1.0.12",
-    "@gooddata/sdk-backend-base": "11.65.0-alpha.9",
-    "@gooddata/sdk-backend-spi": "11.65.0-alpha.9",
-    "@gooddata/sdk-model": "11.65.0-alpha.9",
-    "@gooddata/sdk-backend-tiger": "11.65.0-alpha.9"
+    "@gooddata/sdk-backend-base": "11.65.1",
+    "@gooddata/sdk-model": "11.65.1",
+    "@gooddata/sdk-backend-spi": "11.65.1",
+    "@gooddata/sdk-backend-tiger": "11.65.1"
   },
   "devDependencies": {
     "@microsoft/api-documenter": "7.30.16",
@@ -57,14 +55,13 @@
     "oxlint": "1.83.0",
     "oxlint-plugin-eslint": "1.82.0",
     "oxlint-tsgolint": "7.0.2001",
-    "process": "0.11.10",
     "ts-dedent": "2.3.0",
     "typescript": "7.0.2",
     "vitest": "5.0.4",
-    "@gooddata/eslint-config": "11.65.0-alpha.9",
-    "@gooddata/api-client-tiger": "11.65.0-alpha.9",
-    "@gooddata/oxlint-config": "11.65.0-alpha.9",
-    "@gooddata/stylelint-config": "11.65.0-alpha.9"
+    "@gooddata/api-client-tiger": "11.65.1",
+    "@gooddata/eslint-config": "11.65.1",
+    "@gooddata/oxlint-config": "11.65.1",
+    "@gooddata/stylelint-config": "11.65.1"
   },
   "scripts": {
     "_phase:build": "npm run build",