@sap-ux/cds-annotation-parser 0.1.13 → 0.2.1

package/dist/transformer/ast.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.buildAst = exports.locationToRange = void 0;
-const vscode_languageserver_types_1 = require("vscode-languageserver-types");
+const text_document_utils_1 = require("@sap-ux/text-document-utils");
 const annotation_ast_nodes_1 = require("./annotation-ast-nodes");
 const factory_1 = require("../parser/factory");
 const expressions_1 = require("./expressions");
@@ -16,19 +16,18 @@ const utils_1 = require("../utils");
  * @returns Qualifier node
  */
 const createQualifier = (term) => {
-    var _a, _b;
     const segment = term.segments.find((item) => item.value.includes('#'));
     let qRange;
     let qualifierValue = '';
     if ((0, utils_1.isDefined)(segment)) {
         const tokens = segment.value.split('#');
-        segment.value = (_a = tokens.shift()) !== null && _a !== void 0 ? _a : '';
-        qualifierValue = (_b = tokens.pop()) !== null && _b !== void 0 ? _b : '';
+        segment.value = tokens.shift() ?? '';
+        qualifierValue = tokens.pop() ?? '';
         const len = qualifierValue.length;
         if (segment.range) {
             qRange = {
-                start: Object.assign(Object.assign({}, segment.range.end), { character: segment.range.end.character - len }),
-                end: Object.assign({}, segment.range.end)
+                start: { ...segment.range.end, character: segment.range.end.character - len },
+                end: { ...segment.range.end }
             };
             segment.range.end.character = segment.range.end.character - len - 1;
         }
@@ -42,15 +41,14 @@ const createQualifier = (term) => {
 const compareTokensByPosition = (a, b) => {
     return a.startOffset - b.startOffset;
 };
-const adjustPosition = (position, offset) => vscode_languageserver_types_1.Position.create(position.line + offset.line, position.line === 0 ? position.character + offset.character : position.character);
+const adjustPosition = (position, offset) => text_document_utils_1.Position.create(position.line + offset.line, position.line === 0 ? position.character + offset.character : position.character);
 const locationToRange = (location) => {
-    var _a, _b, _c;
     return location
-        ? vscode_languageserver_types_1.Range.create(location.startLine - 1, ((_a = location.startColumn) !== null && _a !== void 0 ? _a : 0) - 1, ((_b = location.endLine) !== null && _b !== void 0 ? _b : 0) - 1, (_c = location.endColumn) !== null && _c !== void 0 ? _c : 0)
+        ? text_document_utils_1.Range.create(location.startLine - 1, (location.startColumn ?? 0) - 1, (location.endLine ?? 0) - 1, location.endColumn ?? 0)
         : undefined;
 };
 exports.locationToRange = locationToRange;
-const existsAndNotRecovered = (nodes) => { var _a; return (0, utils_1.hasItems)(nodes) && !((_a = nodes[0]) === null || _a === void 0 ? void 0 : _a.isInsertedInRecovery); };
+const existsAndNotRecovered = (nodes) => (0, utils_1.hasItems)(nodes) && !nodes[0]?.isInsertedInRecovery;
 const vocabularyService = new odata_vocabularies_1.VocabularyService(true, true);
 const vocabularyAliases = [...vocabularyService.getVocabularies().values()].map((vocabulary) => vocabulary.defaultAlias);
 const supportedVocabularyAliases = new Set([...vocabularyAliases, ...vocabularyService.cdsVocabulary.groupNames]);
@@ -84,7 +82,7 @@ class CstToAstVisitor extends factory_1.Visitor {
     locationToRange(location) {
         const range = (0, exports.locationToRange)(location);
         if (this.startPosition && range) {
-            return vscode_languageserver_types_1.Range.create(adjustPosition(range.start, this.startPosition), adjustPosition(range.end, this.startPosition));
+            return text_document_utils_1.Range.create(adjustPosition(range.start, this.startPosition), adjustPosition(range.end, this.startPosition));
         }
         return range;
     }
@@ -95,17 +93,16 @@ class CstToAstVisitor extends factory_1.Visitor {
      * @returns Range object
      */
     tokenToRange(token) {
-        var _a, _b, _c, _d, _e, _f;
-        const start = vscode_languageserver_types_1.Position.create(((_a = token.startLine) !== null && _a !== void 0 ? _a : 0) - 1, ((_b = token.startColumn) !== null && _b !== void 0 ? _b : 0) - 1);
-        const line = (0, utils_1.hasNaNOrUndefined)(token.endLine) ? ((_c = token.startLine) !== null && _c !== void 0 ? _c : 0) - 1 : ((_d = token.endLine) !== null && _d !== void 0 ? _d : 0) - 1;
+        const start = text_document_utils_1.Position.create((token.startLine ?? 0) - 1, (token.startColumn ?? 0) - 1);
+        const line = (0, utils_1.hasNaNOrUndefined)(token.endLine) ? (token.startLine ?? 0) - 1 : (token.endLine ?? 0) - 1;
         const char = (0, utils_1.hasNaNOrUndefined)(token.endColumn)
-            ? ((_e = token.startColumn) !== null && _e !== void 0 ? _e : 0) - 1 + token.image.length
-            : (_f = token.endColumn) !== null && _f !== void 0 ? _f : 0;
-        const end = vscode_languageserver_types_1.Position.create(line, char);
+            ? (token.startColumn ?? 0) - 1 + token.image.length
+            : token.endColumn ?? 0;
+        const end = text_document_utils_1.Position.create(line, char);
         if (this.startPosition) {
-            return vscode_languageserver_types_1.Range.create(adjustPosition(start, this.startPosition), adjustPosition(end, this.startPosition));
+            return text_document_utils_1.Range.create(adjustPosition(start, this.startPosition), adjustPosition(end, this.startPosition));
         }
-        return vscode_languageserver_types_1.Range.create(start, end);
+        return text_document_utils_1.Range.create(start, end);
     }
     /**
      * Converts CST token to AST token.
@@ -201,9 +198,7 @@ class CstToAstVisitor extends factory_1.Visitor {
      * @returns Annotation group object
      */
     toTopLevelAnnotationPathGroup(path, assignment, location) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
-        const items = ((_c = (_b = (_a = assignment.children.value) === null || _a === void 0 ? void 0 : _a[0].children.struct) === null || _b === void 0 ? void 0 : _b[0].children.assignment) !== null && _c !== void 0 ? _c : []).map((childAssignment, index, childAssignments) => {
-            var _a, _b, _c, _d;
+        const items = (assignment.children.value?.[0].children.struct?.[0].children.assignment ?? []).map((childAssignment, index, childAssignments) => {
             const annotation = this.visit(childAssignment);
             // check for specific situation where current child has no value and separating comma to next child is missing
             // then: current child value is represented by a path and next child path is empty
@@ -215,34 +210,34 @@ class CstToAstVisitor extends factory_1.Visitor {
                 childAssignment.children.value[0].children.path) {
                 // current child has no value (separating comma to next child is missing)
                 const start = this.tokenToRange(childAssignment.children.Colon[0]).end;
-                const end = (_d = (_c = this.locationToRange((_b = (_a = childAssignment.children.value) === null || _a === void 0 ? void 0 : _a[0]) === null || _b === void 0 ? void 0 : _b.location)) === null || _c === void 0 ? void 0 : _c.start) !== null && _d !== void 0 ? _d : start;
+                const end = this.locationToRange(childAssignment.children.value?.[0]?.location)?.start ?? start;
                 annotation.value = {
                     type: annotation_ast_nodes_1.EMPTY_VALUE_TYPE,
-                    range: vscode_languageserver_types_1.Range.create(start, end)
+                    range: text_document_utils_1.Range.create(start, end)
                 };
             }
             return annotation;
         });
-        const commas = this.getCommaToken((_f = (_e = (_d = assignment.children.value) === null || _d === void 0 ? void 0 : _d[0].children) === null || _e === void 0 ? void 0 : _e.struct) === null || _f === void 0 ? void 0 : _f[0].children.Comma);
+        const commas = this.getCommaToken(assignment.children.value?.[0].children?.struct?.[0].children.Comma);
         const ast = {
             type: annotation_ast_nodes_1.ANNOTATION_GROUP_TYPE,
             name: path.segments[0],
             items: {
                 type: annotation_ast_nodes_1.ANNOTATION_GROUP_ITEMS_TYPE,
                 items,
-                range: this.locationToRange((_h = (_g = assignment.children.value) === null || _g === void 0 ? void 0 : _g[0]) === null || _h === void 0 ? void 0 : _h.location),
+                range: this.locationToRange(assignment.children.value?.[0]?.location),
                 commas
             },
             range: this.locationToRange(location)
         };
-        if ((_j = assignment.children.Colon) === null || _j === void 0 ? void 0 : _j.length) {
+        if (assignment.children.Colon?.length) {
             ast.colon = {
                 type: annotation_ast_nodes_1.TOKEN_TYPE,
                 value: assignment.children.Colon[0].image,
                 range: this.tokenToRange(assignment.children.Colon[0])
             };
         }
-        if ((_l = (_k = assignment.children.value) === null || _k === void 0 ? void 0 : _k[0]) === null || _l === void 0 ? void 0 : _l.children.struct) {
+        if (assignment.children.value?.[0]?.children.struct) {
             const struct = assignment.children.value[0].children.struct[0];
             if (existsAndNotRecovered(struct.children.LCurly)) {
                 ast.items.openToken = this.createToken(struct.children.LCurly[0]);
@@ -260,8 +255,7 @@ class CstToAstVisitor extends factory_1.Visitor {
      * @returns Colon ast token or undefined if not found
      */
     getColon(assignment) {
-        var _a;
-        if ((_a = assignment.children.Colon) === null || _a === void 0 ? void 0 : _a.length) {
+        if (assignment.children.Colon?.length) {
             return {
                 type: annotation_ast_nodes_1.TOKEN_TYPE,
                 range: this.tokenToRange(assignment.children.Colon[0]),
@@ -313,7 +307,6 @@ class CstToAstVisitor extends factory_1.Visitor {
      * @returns Annotation ast node
      */
     toTopLevelAnnotation(assignment, location) {
-        var _a;
         if ((0, utils_1.isDefined)(assignment.location) &&
             isNaN(assignment.location.startOffset) &&
             assignment.recoveredNode === true) {
@@ -342,7 +335,7 @@ class CstToAstVisitor extends factory_1.Visitor {
                 },
                 range: (0, range_1.copyRange)(range)
             };
-            if ((_a = assignment.children.Colon) === null || _a === void 0 ? void 0 : _a.length) {
+            if (assignment.children.Colon?.length) {
                 ast.colon = {
                     type: annotation_ast_nodes_1.TOKEN_TYPE,
                     range: this.tokenToRange(assignment.children.Colon[0]),
@@ -570,7 +563,6 @@ class CstToAstVisitor extends factory_1.Visitor {
      * @returns Expression value ast node
      */
     expression(context, location) {
-        var _a, _b;
         /**
          * Builds operator.
          *
@@ -585,8 +577,8 @@ class CstToAstVisitor extends factory_1.Visitor {
         const openToken = existsAndNotRecovered(context.LParen) ? this.createToken(context.LParen[0]) : undefined;
         const closeToken = existsAndNotRecovered(context.RParen) ? this.createToken(context.RParen[0]) : undefined;
         const range = this.locationToRange(location);
-        const operators = ((_a = context.Operator) !== null && _a !== void 0 ? _a : []).map((token) => buildOperator(token, this.tokenToRange(token)));
-        const operands = ((_b = context.value) !== null && _b !== void 0 ? _b : []).map((token) => this.visit(token));
+        const operators = (context.Operator ?? []).map((token) => buildOperator(token, this.tokenToRange(token)));
+        const operands = (context.value ?? []).map((token) => this.visit(token));
         const expression = { operators, operands, openToken, closeToken, range };
         const unsupportedOperator = operators.find((operator) => {
             const operatorNames = expressions_1.operatorImageMap[operator.value.toUpperCase()];
@@ -594,7 +586,7 @@ class CstToAstVisitor extends factory_1.Visitor {
         });
         if (unsupportedOperator || !range) {
             const type = annotation_ast_nodes_1.UNSUPPORTED_OPERATOR_EXPRESSION_TYPE;
-            return Object.assign(Object.assign({}, expression), { type, unsupportedOperator });
+            return { ...expression, type, unsupportedOperator };
         }
         try {
             const protoExpression = (0, expressions_1.rebuildNumberSigns)({ operators, operands, range });
@@ -612,7 +604,7 @@ class CstToAstVisitor extends factory_1.Visitor {
         }
         catch (e) {
             // expression did not follow grammar rules - return expression with empty operatorName
-            return Object.assign(Object.assign({}, expression), { type: annotation_ast_nodes_1.INCORRECT_EXPRESSION_TYPE, message: e.toString() });
+            return { ...expression, type: annotation_ast_nodes_1.INCORRECT_EXPRESSION_TYPE, message: e.toString() };
         }
     }
     /**
@@ -623,12 +615,11 @@ class CstToAstVisitor extends factory_1.Visitor {
      * @returns Enum value ast node
      */
     enum(context, location) {
-        var _a;
         const range = this.locationToRange(location);
         if (range) {
             range.start.character++;
         }
-        const path = ((_a = context.path) === null || _a === void 0 ? void 0 : _a.length) === 1
+        const path = context.path?.length === 1
             ? this.visit(context.path[0])
             : {
                 type: annotation_ast_nodes_1.PATH_TYPE,
@@ -651,9 +642,8 @@ class CstToAstVisitor extends factory_1.Visitor {
      * @returns String literal ast node
      */
     string(context, location) {
-        var _a;
         const range = this.locationToRange(location);
-        const value = ((_a = context.String) === null || _a === void 0 ? void 0 : _a.length) === 1 ? context.String[0].image : '';
+        const value = context.String?.length === 1 ? context.String[0].image : '';
         const ast = {
             type: annotation_ast_nodes_1.STRING_LITERAL_TYPE,
             value,
@@ -675,9 +665,8 @@ class CstToAstVisitor extends factory_1.Visitor {
      * @returns Multi line string literal ast node
      */
     multiLineString(context, location) {
-        var _a;
         const range = this.locationToRange(location);
-        const value = ((_a = context.MultiLineString) === null || _a === void 0 ? void 0 : _a.length) === 1 ? context.MultiLineString[0].image : '';
+        const value = context.MultiLineString?.length === 1 ? context.MultiLineString[0].image : '';
         const ast = {
             type: annotation_ast_nodes_1.MULTI_LINE_STRING_LITERAL_TYPE,
             stripIndentation: false,
@@ -700,9 +689,8 @@ class CstToAstVisitor extends factory_1.Visitor {
      * @returns Multi line string literal ast node
      */
     multiLineStringStripIndent(context, location) {
-        var _a;
         const range = this.locationToRange(location);
-        const value = ((_a = context.MultiLineString) === null || _a === void 0 ? void 0 : _a.length) === 1 ? context.MultiLineString[0].image : '';
+        const value = context.MultiLineString?.length === 1 ? context.MultiLineString[0].image : '';
         const ast = {
             type: annotation_ast_nodes_1.MULTI_LINE_STRING_LITERAL_TYPE,
             stripIndentation: true,
@@ -726,7 +714,7 @@ class CstToAstVisitor extends factory_1.Visitor {
      */
     collection(context, location) {
         const range = this.locationToRange(location);
-        const commas = this.getCommaToken(context === null || context === void 0 ? void 0 : context.Comma);
+        const commas = this.getCommaToken(context?.Comma);
         const ast = {
             type: annotation_ast_nodes_1.COLLECTION_TYPE,
             items: (0, utils_1.hasItems)(context.collectionValue)
@@ -801,19 +789,18 @@ class CstToAstVisitor extends factory_1.Visitor {
      * @returns Identifier CST token with empty image nd adjusted range
      */
     identifierFromSeparatorToken(token) {
-        var _a, _b;
         // Adjust range so it is the next character after separator
         return {
             image: '',
             startOffset: token.startOffset + 1,
             startLine: token.startLine,
-            startColumn: ((_a = token.startColumn) !== null && _a !== void 0 ? _a : 0) + 1,
+            startColumn: (token.startColumn ?? 0) + 1,
             endOffset: token.endOffset,
             endLine: token.endLine,
             endColumn: token.endColumn,
             tokenType: tokens_1.tokenMap.Identifier,
             isInsertedInRecovery: true,
-            tokenTypeIdx: (_b = tokens_1.tokenMap.Identifier.tokenTypeIdx) !== null && _b !== void 0 ? _b : -1
+            tokenTypeIdx: tokens_1.tokenMap.Identifier.tokenTypeIdx ?? -1
         };
     }
     /**
@@ -824,18 +811,17 @@ class CstToAstVisitor extends factory_1.Visitor {
      * @returns Empty identifier CST token
      */
     createEmptyIdentifier(start, end) {
-        var _a, _b, _c, _d;
         return {
             image: '',
-            startOffset: ((_a = start.endOffset) !== null && _a !== void 0 ? _a : 0) + 1,
+            startOffset: (start.endOffset ?? 0) + 1,
             startLine: start.endLine,
-            startColumn: ((_b = start.endColumn) !== null && _b !== void 0 ? _b : 0) + 1,
+            startColumn: (start.endColumn ?? 0) + 1,
             endOffset: end.startOffset - 1,
             endLine: end.startLine,
-            endColumn: ((_c = end.startColumn) !== null && _c !== void 0 ? _c : 0) - 1,
+            endColumn: (end.startColumn ?? 0) - 1,
             tokenType: tokens_1.tokenMap.Identifier,
             isInsertedInRecovery: true,
-            tokenTypeIdx: (_d = tokens_1.tokenMap.Identifier.tokenTypeIdx) !== null && _d !== void 0 ? _d : -1
+            tokenTypeIdx: tokens_1.tokenMap.Identifier.tokenTypeIdx ?? -1
         };
     }
     /**
@@ -845,7 +831,6 @@ class CstToAstVisitor extends factory_1.Visitor {
      * @returns Array of objects consisting of identifier token and delimiter
      */
     getIdentifierToken(segment) {
-        var _a;
         if ((0, utils_1.hasItems)(segment.children.NumberSign)) {
             if ((0, utils_1.hasItems)(segment.children.Identifier)) {
                 segment.children.Identifier[0].image += '#';
@@ -880,7 +865,7 @@ class CstToAstVisitor extends factory_1.Visitor {
                 ];
             }
         }
-        return ((_a = segment.children.Identifier) !== null && _a !== void 0 ? _a : []).map((token) => ({
+        return (segment.children.Identifier ?? []).map((token) => ({
             token,
             delimiter: annotation_ast_nodes_1.Delimiter.none
         }));
@@ -894,11 +879,10 @@ class CstToAstVisitor extends factory_1.Visitor {
      * @returns Updated path segment node
      */
     setNewRangeForIdentifier(segment, index, key) {
-        var _a, _b, _c;
         if ((0, utils_1.hasItems)(segment.children.Identifier)) {
-            segment.children.Identifier[0].endColumn = (_a = segment.children[key]) === null || _a === void 0 ? void 0 : _a[index].endColumn;
-            segment.children.Identifier[0].endLine = (_b = segment.children[key]) === null || _b === void 0 ? void 0 : _b[index].endLine;
-            segment.children.Identifier[0].endOffset = (_c = segment.children[key]) === null || _c === void 0 ? void 0 : _c[index].endOffset;
+            segment.children.Identifier[0].endColumn = segment.children[key]?.[index].endColumn;
+            segment.children.Identifier[0].endLine = segment.children[key]?.[index].endLine;
+            segment.children.Identifier[0].endOffset = segment.children[key]?.[index].endOffset;
         }
         return segment;
     }
@@ -929,23 +913,18 @@ class CstToAstVisitor extends factory_1.Visitor {
      * @returns Path AST node
      */
     path(context, location) {
-        var _a, _b, _c;
-        const segments = ((_a = context.pathSegment) !== null && _a !== void 0 ? _a : [])
+        const segments = (context.pathSegment ?? [])
             .map((segment, i) => {
-            var _a, _b, _c, _d, _e;
-            const quotedIdentifiers = (_b = (_a = segment.children.quotedIdentifier) === null || _a === void 0 ? void 0 : _a.reduce((acc, quotedIdentifier) => {
+            const quotedIdentifiers = segment.children.quotedIdentifier?.reduce((acc, quotedIdentifier) => {
                 return [
                     ...acc,
-                    ...(quotedIdentifier.children.QuotedIdentifier || []).map((token, j) => {
-                        var _a;
-                        return ({
-                            token: this.recoverIdentifiers(token, j, (_a = quotedIdentifier.children.PathSegmentSeparator) !== null && _a !== void 0 ? _a : []),
-                            delimiter: annotation_ast_nodes_1.Delimiter.quoted
-                        });
-                    })
+                    ...(quotedIdentifier.children.QuotedIdentifier || []).map((token, j) => ({
+                        token: this.recoverIdentifiers(token, j, quotedIdentifier.children.PathSegmentSeparator ?? []),
+                        delimiter: annotation_ast_nodes_1.Delimiter.quoted
+                    }))
                 ];
-            }, [])) !== null && _b !== void 0 ? _b : [];
-            const delimitedIdentifiers = ((_d = (_c = segment.children.delimitedIdentifier) === null || _c === void 0 ? void 0 : _c.reduce((acc, delimitedIdentifier) => {
+            }, []) ?? [];
+            const delimitedIdentifiers = (segment.children.delimitedIdentifier?.reduce((acc, delimitedIdentifier) => {
                 if (!delimitedIdentifier.children.DelimitedIdentifier) {
                     return [
                         ...acc,
@@ -957,16 +936,13 @@ class CstToAstVisitor extends factory_1.Visitor {
                 }
                 return [
                     ...acc,
-                    ...(delimitedIdentifier.children.DelimitedIdentifier || []).map((token, j) => {
-                        var _a;
-                        return ({
-                            token: this.recoverIdentifiers(token, j, (_a = delimitedIdentifier.children.PathSegmentSeparator) !== null && _a !== void 0 ? _a : []),
-                            delimiter: annotation_ast_nodes_1.Delimiter.exclamationSquareBrackets
-                        });
-                    })
+                    ...(delimitedIdentifier.children.DelimitedIdentifier || []).map((token, j) => ({
+                        token: this.recoverIdentifiers(token, j, delimitedIdentifier.children.PathSegmentSeparator ?? []),
+                        delimiter: annotation_ast_nodes_1.Delimiter.exclamationSquareBrackets
+                    }))
                 ];
-            }, [])) !== null && _d !== void 0 ? _d : []).map((identifier) => identifier);
-            const separator = ((_e = context.PathSegmentSeparator) !== null && _e !== void 0 ? _e : [])[i - 1];
+            }, []) ?? []).map((identifier) => identifier);
+            const separator = (context.PathSegmentSeparator ?? [])[i - 1];
             const fromErrorRecovery = segment.recoveredNode && separator
                 ? [{ token: this.identifierFromSeparatorToken(separator), delimiter: annotation_ast_nodes_1.Delimiter.none }]
                 : [];
@@ -977,11 +953,9 @@ class CstToAstVisitor extends factory_1.Visitor {
             .sort((a, b) => compareTokensByPosition(a.token, b.token))
             .map(({ token, delimiter }) => this.tokenToIdentifier(token, delimiter));
         const separators = [
-            ...((_b = context.pathSegment) !== null && _b !== void 0 ? _b : []).map((segment) => {
-                var _a, _b, _c, _d;
-                const quotedIdentifiers = (_b = (_a = segment.children.quotedIdentifier) === null || _a === void 0 ? void 0 : _a.reduce((acc, quotedIdentifier) => {
-                    var _a;
-                    const childrenSeparators = (_a = quotedIdentifier.children.PathSegmentSeparator) !== null && _a !== void 0 ? _a : [];
+            ...(context.pathSegment ?? []).map((segment) => {
+                const quotedIdentifiers = segment.children.quotedIdentifier?.reduce((acc, quotedIdentifier) => {
+                    const childrenSeparators = quotedIdentifier.children.PathSegmentSeparator ?? [];
                     return [
                         ...acc,
                         ...childrenSeparators.map((token) => ({
@@ -989,9 +963,8 @@ class CstToAstVisitor extends factory_1.Visitor {
                             delimiter: annotation_ast_nodes_1.Delimiter.quoted
                         }))
                     ];
-                }, [])) !== null && _b !== void 0 ? _b : [];
-                const delimitedIdentifiers = (_d = (_c = segment.children.delimitedIdentifier) === null || _c === void 0 ? void 0 : _c.reduce((acc, delimitedIdentifier) => {
-                    var _a;
+                }, []) ?? [];
+                const delimitedIdentifiers = segment.children.delimitedIdentifier?.reduce((acc, delimitedIdentifier) => {
                     if (!delimitedIdentifier.children.DelimitedIdentifier) {
                         return [
                             ...acc,
@@ -1001,7 +974,7 @@ class CstToAstVisitor extends factory_1.Visitor {
                             }
                         ];
                     }
-                    const childrenSeparators = (_a = delimitedIdentifier.children.PathSegmentSeparator) !== null && _a !== void 0 ? _a : [];
+                    const childrenSeparators = delimitedIdentifier.children.PathSegmentSeparator ?? [];
                     return [
                         ...acc,
                         ...childrenSeparators.map((token) => ({
@@ -1009,10 +982,10 @@ class CstToAstVisitor extends factory_1.Visitor {
                             delimiter: annotation_ast_nodes_1.Delimiter.exclamationSquareBrackets
                         }))
                     ];
-                }, [])) !== null && _d !== void 0 ? _d : [];
+                }, []) ?? [];
                 return [...quotedIdentifiers, ...delimitedIdentifiers];
             }),
-            ((_c = context.PathSegmentSeparator) !== null && _c !== void 0 ? _c : []).map((token) => ({
+            (context.PathSegmentSeparator ?? []).map((token) => ({
                 token,
                 delimiter: annotation_ast_nodes_1.Delimiter.none
             }))
@@ -1075,14 +1048,12 @@ class CstToAstVisitor extends factory_1.Visitor {
      * @returns AST record node
      */
     struct(context, location) {
-        var _a;
         const range = this.locationToRange(location);
-        const { properties: allProperties, annotations: allAnnotations } = ((_a = context.assignment) !== null && _a !== void 0 ? _a : [])
+        const { properties: allProperties, annotations: allAnnotations } = (context.assignment ?? [])
             .filter((assignment) => {
             return (0, utils_1.hasItems)(assignment.children.path) || (0, utils_1.hasItems)(assignment.children.value);
         })
             .reduce(({ annotations, properties }, assignment, assignmentIndex, assignments) => {
-            var _a, _b, _c, _d, _e, _f, _g, _h;
             const { property, kind } = this.getRecordProperty(assignment);
             if (kind === 'annotation') {
                 annotations.push(property);
@@ -1092,26 +1063,26 @@ class CstToAstVisitor extends factory_1.Visitor {
             }
             if ((0, utils_1.hasItems)(assignment.children.Colon) &&
                 (!(0, utils_1.hasItems)(assignment.children.value) ||
-                    (0, utils_1.hasNaNOrUndefined)((_b = (_a = assignment.children.value[0]) === null || _a === void 0 ? void 0 : _a.location) === null || _b === void 0 ? void 0 : _b.startOffset))) {
+                    (0, utils_1.hasNaNOrUndefined)(assignment.children.value[0]?.location?.startOffset))) {
                 this.recoverFromMissingValue(assignment.children.Colon[0], property);
             }
-            else if (((_c = assignment.children) === null || _c === void 0 ? void 0 : _c.value) &&
-                ((_d = assignment.children) === null || _d === void 0 ? void 0 : _d.value.length) &&
-                ((_f = (_e = assignment.children.value[0]) === null || _e === void 0 ? void 0 : _e.children) === null || _f === void 0 ? void 0 : _f.path) &&
+            else if (assignment.children?.value &&
+                assignment.children?.value.length &&
+                assignment.children.value[0]?.children?.path &&
                 assignments[assignmentIndex + 1] &&
-                !((_g = assignments[assignmentIndex + 1].children) === null || _g === void 0 ? void 0 : _g.path)) {
+                !assignments[assignmentIndex + 1].children?.path) {
                 // missing value and comma: path for next property has been wrongly consumed as value for current property
                 const start = this.tokenToRange(assignment.children.Colon[0]).end;
-                const end = (_h = this.locationToRange(assignment.children.value[0].location)) === null || _h === void 0 ? void 0 : _h.start;
+                const end = this.locationToRange(assignment.children.value[0].location)?.start;
                 property.value = {
                     type: annotation_ast_nodes_1.EMPTY_VALUE_TYPE,
-                    range: vscode_languageserver_types_1.Range.create(start, end !== null && end !== void 0 ? end : start)
+                    range: text_document_utils_1.Range.create(start, end ?? start)
                 };
             }
             property.colon = this.getColon(assignment);
             return { properties, annotations };
         }, { annotations: [], properties: [] });
-        const commas = this.getCommaToken(context === null || context === void 0 ? void 0 : context.Comma);
+        const commas = this.getCommaToken(context?.Comma);
         const ast = {
             type: annotation_ast_nodes_1.RECORD_TYPE,
             properties: allProperties,
@@ -1137,14 +1108,13 @@ class CstToAstVisitor extends factory_1.Visitor {
      * @returns Annotation AST node
      */
     assignment(context, location) {
-        var _a, _b, _c;
         const range = this.locationToRange(location);
         const ast = {
             type: annotation_ast_nodes_1.ANNOTATION_TYPE,
             term: this.getAssignmentKey(context, range),
             range
         };
-        if ((_a = context.Colon) === null || _a === void 0 ? void 0 : _a.length) {
+        if (context.Colon?.length) {
             ast.colon = {
                 type: annotation_ast_nodes_1.TOKEN_TYPE,
                 value: context.Colon[0].image,
@@ -1158,7 +1128,7 @@ class CstToAstVisitor extends factory_1.Visitor {
         if (!ast.qualifier && ast.term.segments.length && ast.term.segments[0].value.includes('#')) {
             ast.qualifier = createQualifier(ast.term);
         }
-        if ((0, utils_1.hasItems)(context.value) && !(0, utils_1.hasNaNOrUndefined)((_c = (_b = context.value[0]) === null || _b === void 0 ? void 0 : _b.location) === null || _c === void 0 ? void 0 : _c.startOffset)) {
+        if ((0, utils_1.hasItems)(context.value) && !(0, utils_1.hasNaNOrUndefined)(context.value[0]?.location?.startOffset)) {
             ast.value = this.visit(context.value[0]);
         }
         else if ((0, utils_1.hasItems)(context.Colon)) {
@@ -1186,7 +1156,7 @@ class CstToAstVisitor extends factory_1.Visitor {
             segments: [],
             separators: [],
             value: '',
-            range: vscode_languageserver_types_1.Range.create(start, end)
+            range: text_document_utils_1.Range.create(start, end)
         };
     }
     /**
@@ -1198,7 +1168,7 @@ class CstToAstVisitor extends factory_1.Visitor {
     recoverFromMissingValue(colonToken, ast) {
         // adjust range
         const nextToken = findNextToken(this.tokenVector, colonToken.endOffset);
-        if (((nextToken === null || nextToken === void 0 ? void 0 : nextToken.image) === ',' || (nextToken === null || nextToken === void 0 ? void 0 : nextToken.image) === '}') && (nextToken === null || nextToken === void 0 ? void 0 : nextToken.startColumn)) {
+        if ((nextToken?.image === ',' || nextToken?.image === '}') && nextToken?.startColumn) {
             if (ast.range) {
                 // annotation range should end before comma
                 ast.range.end = this.tokenToRange(nextToken).start;
@@ -1208,7 +1178,7 @@ class CstToAstVisitor extends factory_1.Visitor {
             const nextTokenRange = this.tokenToRange(nextToken);
             ast.value = {
                 type: annotation_ast_nodes_1.EMPTY_VALUE_TYPE,
-                range: vscode_languageserver_types_1.Range.create(colonRange.end, nextTokenRange.start)
+                range: text_document_utils_1.Range.create(colonRange.end, nextTokenRange.start)
             };
         }
     }