@sap-ux/fiori-annotation-api 0.11.1 → 1.0.0

package/dist/xml/writer.js

@@ -1,19 +1,16 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.XMLWriter = void 0;
-const odata_annotation_core_1 = require("@sap-ux/odata-annotation-core");
-const cds_annotation_parser_1 = require("@sap-ux/cds-annotation-parser");
-const odata_annotation_core_types_1 = require("@sap-ux/odata-annotation-core-types");
-const xml_odata_annotation_converter_1 = require("@sap-ux/xml-odata-annotation-converter");
-const ast_1 = require("@xml-tools/ast");
-const utils_1 = require("../utils");
-const changes_1 = require("./changes");
-const pointer_1 = require("./pointer");
-const printOptions = { ...odata_annotation_core_types_1.printOptions, useSnippetSyntax: false };
+import { getIndentLevel, indentWithTabs, indentWithSpaces, isBefore, rangeContained } from '@sap-ux/odata-annotation-core';
+import { copyPosition, copyRange } from '@sap-ux/cds-annotation-parser';
+import { createElementNode, Position, printOptions as defaultPrintOptions, TextEdit, Range, EDMX_NAMESPACE_ALIAS, EDM_NAMESPACE_ALIAS } from '@sap-ux/odata-annotation-core-types';
+import { printCsdlNodeToXmlString, transformRange, escapeAttribute, EDMX_V4_NAMESPACE, EDM_V4_NAMESPACE } from '@sap-ux/xml-odata-annotation-converter';
+import { DEFAULT_NS } from '@xml-tools/ast';
+import { compareByRange } from '../utils/index.js';
+import { DELETE_ELEMENT, REPLACE_ELEMENT_CONTENT } from './changes.js';
+import { getNodeFromPointer } from './pointer.js';
+const printOptions = { ...defaultPrintOptions, useSnippetSyntax: false };
 /**
  * Translates changes objects to XML text edits.
  */
-class XMLWriter {
+export class XMLWriter {
     document;
     comments;
     textDocument;
@@ -50,7 +47,7 @@ class XMLWriter {
         for (const pointer of Object.keys(batches)) {
             edits.push(...this.getTextEditsForPointer(pointer, batches[pointer], changes));
         }
-        edits.sort(utils_1.compareByRange);
+        edits.sort(compareByRange);
         return edits;
     }
     getContent(element) {
@@ -63,7 +60,7 @@ class XMLWriter {
     }
     getTextEditsForPointer(pointer, byType, changes) {
         const edits = [];
-        const element = (0, pointer_1.getNodeFromPointer)(this.document, pointer);
+        const element = getNodeFromPointer(this.document, pointer);
         const childIndentLevel = getIndentFromElement(element);
         const inserts = (byType.get('insert-element') ?? []);
         const insertEdits = convertInsertElementToTextEdits(this.comments, element, inserts, childIndentLevel);
@@ -74,7 +71,7 @@ class XMLWriter {
             case 'XMLElement': {
                 const elementChanges = {
                     replacements: (byType.get('replace-element') ?? []),
-                    contentReplacements: (byType.get(changes_1.REPLACE_ELEMENT_CONTENT) ?? []),
+                    contentReplacements: (byType.get(REPLACE_ELEMENT_CONTENT) ?? []),
                     elementDeletions: (byType.get('delete-element') ?? []),
                     attributeInserts: (byType.get('insert-attribute') ?? []),
                     moveInCollection: (byType.get('move-collection-value') ?? [])
@@ -138,53 +135,52 @@ class XMLWriter {
             }
             text.push(this.textDocument.getText(range));
             if (changes.some((change) => {
-                if (change.type !== changes_1.DELETE_ELEMENT) {
+                if (change.type !== DELETE_ELEMENT) {
                     return false;
                 }
-                const element = (0, pointer_1.getNodeFromPointer)(this.document, change.pointer);
-                const changeRange = element?.type === 'XMLElement' && (0, xml_odata_annotation_converter_1.transformRange)(element.position);
-                return changeRange && (0, odata_annotation_core_1.rangeContained)(changeRange, range);
+                const element = getNodeFromPointer(this.document, change.pointer);
+                const changeRange = element?.type === 'XMLElement' && transformRange(element.position);
+                return changeRange && rangeContained(changeRange, range);
             })) {
                 continue;
             }
-            textEdits.push(odata_annotation_core_types_1.TextEdit.del(range));
+            textEdits.push(TextEdit.del(range));
         }
         return { textEdits, text };
     }
 }
-exports.XMLWriter = XMLWriter;
 function handleXmlAttributeChanges(attributeChanges, element) {
     const edits = [];
     const { attributeDeletions, attributeNameUpdates, attributeValueUpdates } = attributeChanges;
     if (attributeDeletions.length > 0) {
-        const attributeRange = (0, xml_odata_annotation_converter_1.transformRange)(element.position);
+        const attributeRange = transformRange(element.position);
         if (attributeRange) {
             // There must be a space character before attribute and we should remove it with attribute.
             attributeRange.start.character--;
-            edits.push(odata_annotation_core_types_1.TextEdit.del(attributeRange));
+            edits.push(TextEdit.del(attributeRange));
         }
     }
     else {
         // if attribute is deleted, then we can ignore updates
-        const nameRange = (0, xml_odata_annotation_converter_1.transformRange)(element.syntax.key);
+        const nameRange = transformRange(element.syntax.key);
         if (nameRange && attributeNameUpdates.length > 0) {
             const newName = attributeNameUpdates[attributeNameUpdates.length - 1].newName;
-            edits.push(odata_annotation_core_types_1.TextEdit.replace(nameRange, newName));
+            edits.push(TextEdit.replace(nameRange, newName));
         }
-        const valueRange = (0, xml_odata_annotation_converter_1.transformRange)(element.syntax.value);
+        const valueRange = transformRange(element.syntax.value);
         if (valueRange && attributeValueUpdates.length > 0) {
             const newValue = attributeValueUpdates[attributeValueUpdates.length - 1].newValue;
             // shift from start quote
             valueRange.start.character++;
             // shift from end quote
             valueRange.end.character--;
-            edits.push(odata_annotation_core_types_1.TextEdit.replace(valueRange, newValue));
+            edits.push(TextEdit.replace(valueRange, newValue));
         }
     }
     return edits;
 }
 function handleXmlElementAttributeInserts(element, attributeInserts) {
-    const openTagRange = (0, xml_odata_annotation_converter_1.transformRange)(element.syntax.openBody);
+    const openTagRange = transformRange(element.syntax.openBody);
     if (!openTagRange) {
         return [];
     }
@@ -207,11 +203,11 @@ function handleXmlElementAttributeInserts(element, attributeInserts) {
         }
         for (const attributeInsert of inserts) {
             // insert before open tag
-            attributes.push(`${attributeInsert.name}="${(0, xml_odata_annotation_converter_1.escapeAttribute)(attributeInsert.value)}"`);
+            attributes.push(`${attributeInsert.name}="${escapeAttribute(attributeInsert.value)}"`);
         }
         if (attributes.length > 0) {
             const text = ` ${attributes.join(' ')}`;
-            edits.push(odata_annotation_core_types_1.TextEdit.insert(position, text));
+            edits.push(TextEdit.insert(position, text));
         }
     }
     return edits;
@@ -251,50 +247,50 @@ function adjustFragmentIndentation(text, requiredIndent) {
 }
 function handleXmlElementMoveChange(element, childIndentLevel, text, insertPosition) {
     const edits = [];
-    const openTagRange = (0, xml_odata_annotation_converter_1.transformRange)(element.syntax.openBody);
+    const openTagRange = transformRange(element.syntax.openBody);
     const textWithNewIndentation = adjustFragmentIndentation(text.join(''), childIndentLevel);
     if (element.syntax.isSelfClosing && openTagRange) {
         const indent = '    '.repeat(childIndentLevel - 1);
-        edits.push(odata_annotation_core_types_1.TextEdit.replace(odata_annotation_core_types_1.Range.create(openTagRange.end.line, openTagRange.end.character - 2, openTagRange.end.line, openTagRange.end.character), `>${textWithNewIndentation}\n${indent}</${element.name}>`));
+        edits.push(TextEdit.replace(Range.create(openTagRange.end.line, openTagRange.end.character - 2, openTagRange.end.line, openTagRange.end.character), `>${textWithNewIndentation}\n${indent}</${element.name}>`));
     }
     else {
-        edits.push(odata_annotation_core_types_1.TextEdit.insert(insertPosition, textWithNewIndentation));
+        edits.push(TextEdit.insert(insertPosition, textWithNewIndentation));
     }
     return edits;
 }
 function handleXmlElementContentReplacements(element, contentReplacements, childIndentLevel) {
     const edits = [];
-    const openTagRange = (0, xml_odata_annotation_converter_1.transformRange)(element.syntax.openBody);
-    const closeTagRange = (0, xml_odata_annotation_converter_1.transformRange)(element.syntax.closeBody);
+    const openTagRange = transformRange(element.syntax.openBody);
+    const closeTagRange = transformRange(element.syntax.closeBody);
     const lastChange = contentReplacements.slice(-1)[0];
     const namespaceMap = getNamespaceMap(element);
     const text = replaceElementContentToText(lastChange, childIndentLevel - 1, namespaceMap);
     if (element.syntax.isSelfClosing && openTagRange) {
-        edits.push(odata_annotation_core_types_1.TextEdit.replace(odata_annotation_core_types_1.Range.create(openTagRange.end.line, openTagRange.end.character - 2, openTagRange.end.line, openTagRange.end.character), `>${text}</${element.name}>`));
+        edits.push(TextEdit.replace(Range.create(openTagRange.end.line, openTagRange.end.character - 2, openTagRange.end.line, openTagRange.end.character), `>${text}</${element.name}>`));
     }
     else if (openTagRange && closeTagRange) {
-        edits.push(odata_annotation_core_types_1.TextEdit.replace(odata_annotation_core_types_1.Range.create(openTagRange.end, closeTagRange.start), text));
+        edits.push(TextEdit.replace(Range.create(openTagRange.end, closeTagRange.start), text));
     }
     return edits;
 }
 function handleXmlElementReplacements(element, replacements, childIndentLevel) {
     const edits = [];
-    const openTagRange = (0, xml_odata_annotation_converter_1.transformRange)(element.syntax.openBody);
-    const closeTagRange = (0, xml_odata_annotation_converter_1.transformRange)(element.syntax.closeBody);
+    const openTagRange = transformRange(element.syntax.openBody);
+    const closeTagRange = transformRange(element.syntax.closeBody);
     const lastChange = replacements.slice(-1)[0];
     const namespaceMap = getNamespaceMap(element);
     const text = replaceElementToText(lastChange, childIndentLevel - 1, namespaceMap);
     if (element.syntax.isSelfClosing && openTagRange) {
-        edits.push(odata_annotation_core_types_1.TextEdit.replace(openTagRange, text));
+        edits.push(TextEdit.replace(openTagRange, text));
     }
     else if (openTagRange && closeTagRange) {
-        edits.push(odata_annotation_core_types_1.TextEdit.replace(odata_annotation_core_types_1.Range.create(openTagRange.start, closeTagRange.end), text));
+        edits.push(TextEdit.replace(Range.create(openTagRange.start, closeTagRange.end), text));
     }
     return edits;
 }
 function handleXmlElementDeletions(parent, pointer, content, element) {
     const edits = [];
-    const openTagRange = (0, xml_odata_annotation_converter_1.transformRange)(element.syntax.openBody);
+    const openTagRange = transformRange(element.syntax.openBody);
     if (parent.type === 'XMLElement') {
         const index = Number.parseInt(pointer.split('/').slice(-1)[0], 10);
         const { previousContentIndex, startContentIndex } = findContentIndices(index, index, content);
@@ -302,22 +298,22 @@ function handleXmlElementDeletions(parent, pointer, content, element) {
         if (anchor) {
             const previousElement = content[previousContentIndex];
             const nextElement = content.find((item, i) => item.type === 'element' && i > startContentIndex);
-            const parentCloseTagRange = (0, xml_odata_annotation_converter_1.transformRange)(parent.syntax.closeBody);
+            const parentCloseTagRange = transformRange(parent.syntax.closeBody);
             if (!nextElement && !previousElement && parentCloseTagRange) {
                 updatePosition(anchor.end, parentCloseTagRange.start);
             }
-            edits.push(odata_annotation_core_types_1.TextEdit.del(anchor));
+            edits.push(TextEdit.del(anchor));
         }
     }
     else if (element.syntax.isSelfClosing && openTagRange) {
         // empty root element
-        edits.push(odata_annotation_core_types_1.TextEdit.del(openTagRange));
+        edits.push(TextEdit.del(openTagRange));
     }
     else {
         // root element with content
-        const closeTagRange = (0, xml_odata_annotation_converter_1.transformRange)(element.syntax.closeBody);
+        const closeTagRange = transformRange(element.syntax.closeBody);
         if (openTagRange && closeTagRange) {
-            edits.push(odata_annotation_core_types_1.TextEdit.del(odata_annotation_core_types_1.Range.create(openTagRange.start, closeTagRange.end)));
+            edits.push(TextEdit.del(Range.create(openTagRange.start, closeTagRange.end)));
         }
     }
     return edits;
@@ -326,17 +322,17 @@ function convertUpdateElementNameToTextEdits(elementNameUpdates, element) {
     const edits = [];
     if (elementNameUpdates.length > 0 && element?.type === 'XMLElement') {
         const newName = elementNameUpdates[elementNameUpdates.length - 1].newName;
-        const openTagRange = (0, xml_odata_annotation_converter_1.transformRange)(element.syntax.openBody);
-        const closeTagRange = (0, xml_odata_annotation_converter_1.transformRange)(element.syntax.closeBody);
+        const openTagRange = transformRange(element.syntax.openBody);
+        const closeTagRange = transformRange(element.syntax.closeBody);
         if (openTagRange) {
             const nameLength = element.name?.length ?? 0;
             openTagRange.start.character++; // <
             openTagRange.end.character = openTagRange.start.character + nameLength;
-            edits.push(odata_annotation_core_types_1.TextEdit.replace(openTagRange, newName));
+            edits.push(TextEdit.replace(openTagRange, newName));
             if (closeTagRange) {
                 closeTagRange.start.character += 2; // </
                 closeTagRange.end.character--; // >
-                edits.push(odata_annotation_core_types_1.TextEdit.replace(closeTagRange, newName));
+                edits.push(TextEdit.replace(closeTagRange, newName));
             }
         }
     }
@@ -363,18 +359,18 @@ function getAttributeInsertPosition(element, openTagRange, index) {
     if (index === undefined) {
         // /> or >
         const characterOffset = element.syntax.isSelfClosing === true ? 2 : 1;
-        return odata_annotation_core_types_1.Position.create(openTagRange.end.line, openTagRange.end.character - characterOffset);
+        return Position.create(openTagRange.end.line, openTagRange.end.character - characterOffset);
     }
     const attribute = element.attributes[index];
     if (!attribute) {
         return undefined;
     }
-    const range = (0, xml_odata_annotation_converter_1.transformRange)(attribute.position);
+    const range = transformRange(attribute.position);
     if (!range) {
         return undefined;
     }
     // There must be a space character before attribute and the insert position should be before it
-    return odata_annotation_core_types_1.Position.create(range.start.line, range.start.character - 1);
+    return Position.create(range.start.line, range.start.character - 1);
 }
 function convertInsertElementToTextEdits(comments, element, changes, childIndentLevel) {
     if (!(element === undefined || element.type === 'XMLElement')) {
@@ -387,11 +383,11 @@ function convertInsertElementToTextEdits(comments, element, changes, childIndent
         const change = changes.slice(-1)[0];
         const namespaceMap = getNamespaceMapForNewRootNode(change.element);
         const newElements = insertElementToText([change], childIndentLevel, namespaceMap);
-        return [odata_annotation_core_types_1.TextEdit.insert(odata_annotation_core_types_1.Position.create(0, 0), newElements)];
+        return [TextEdit.insert(Position.create(0, 0), newElements)];
     }
     else {
         const namespaceMap = getNamespaceMap(element);
-        const openTagRange = (0, xml_odata_annotation_converter_1.transformRange)(element.syntax.openBody);
+        const openTagRange = transformRange(element.syntax.openBody);
         if (element.syntax.isSelfClosing && openTagRange) {
             const newElements = insertElementToText(changes, childIndentLevel, namespaceMap);
             const fragments = ['>', '\n', newElements];
@@ -400,7 +396,7 @@ function convertInsertElementToTextEdits(comments, element, changes, childIndent
             const indent = '    '.repeat(indentLevel);
             fragments.push(`${indent}</${element.name}>`);
             return [
-                odata_annotation_core_types_1.TextEdit.replace(odata_annotation_core_types_1.Range.create(openTagRange.end.line, openTagRange.end.character - 2, openTagRange.end.line, openTagRange.end.character), fragments.join(''))
+                TextEdit.replace(Range.create(openTagRange.end.line, openTagRange.end.character - 2, openTagRange.end.line, openTagRange.end.character), fragments.join(''))
             ];
         }
         else {
@@ -419,8 +415,8 @@ function buildInsertFragments(element, anchor, newElements, childIndentLevel) {
     fragments.push(newElements);
     if (anchor.requiresNewLine) {
         const childIndent = printOptions.useTabs
-            ? (0, odata_annotation_core_1.indentWithTabs)(childIndentLevel)
-            : (0, odata_annotation_core_1.indentWithSpaces)(printOptions.tabWidth, childIndentLevel);
+            ? indentWithTabs(childIndentLevel)
+            : indentWithSpaces(printOptions.tabWidth, childIndentLevel);
         fragments.push(childIndent);
     }
     return fragments;
@@ -440,13 +436,13 @@ function insertIntoElementWithContent(comments, element, changes, childIndentLev
         const newElements = insertElementToText(changeSet, childIndentLevel, namespaceMap) + '\n';
         const fragments = buildInsertFragments(element, anchor, newElements, childIndentLevel);
         if (!anchor.requiresNewLine) {
-            edits.push(odata_annotation_core_types_1.TextEdit.insert(anchor.position, fragments.join('')));
+            edits.push(TextEdit.insert(anchor.position, fragments.join('')));
             continue;
         }
         if (anchor.redundantWhitespace) {
-            edits.push(odata_annotation_core_types_1.TextEdit.del(anchor.redundantWhitespace));
+            edits.push(TextEdit.del(anchor.redundantWhitespace));
         }
-        edits.push(odata_annotation_core_types_1.TextEdit.insert(anchor.position, fragments.join('')));
+        edits.push(TextEdit.insert(anchor.position, fragments.join('')));
     }
     return edits;
 }
@@ -466,20 +462,20 @@ function indexInserts(changes) {
 }
 function insertElementToText(inserts, childIndentLevel, namespaceMap) {
     return inserts
-        .map((change) => (0, xml_odata_annotation_converter_1.printCsdlNodeToXmlString)((0, odata_annotation_core_types_1.createElementNode)(change.element), printOptions, {
+        .map((change) => printCsdlNodeToXmlString(createElementNode(change.element), printOptions, {
         namespaces: namespaceMap,
         cursorIndentLevel: childIndentLevel
     }))
         .join('\n');
 }
 function replaceElementToText(change, childIndentLevel, namespaceMap) {
-    return (0, xml_odata_annotation_converter_1.printCsdlNodeToXmlString)((0, odata_annotation_core_types_1.createElementNode)(change.newElement), printOptions, {
+    return printCsdlNodeToXmlString(createElementNode(change.newElement), printOptions, {
         namespaces: namespaceMap,
         cursorIndentLevel: childIndentLevel
     }).trim();
 }
 function replaceElementContentToText(change, childIndentLevel, namespaceMap) {
-    return (0, xml_odata_annotation_converter_1.printCsdlNodeToXmlString)(change.newValue, printOptions, {
+    return printCsdlNodeToXmlString(change.newValue, printOptions, {
         namespaces: namespaceMap,
         cursorIndentLevel: childIndentLevel
     }).trim();
@@ -499,16 +495,16 @@ function findInsertPosition(comments, element, index = -1) {
         // If we are not on the same line as the starting anchor,
         // then it means there should be only whitespace until the start of the line
         // and we can insert the snippet there
-        const position = requiresNewLine ? anchorPosition : odata_annotation_core_types_1.Position.create(anchorPosition.line, 0);
-        const redundantWhitespace = requiresNewLine ? odata_annotation_core_types_1.Range.create(startAnchorRange.end, anchorPosition) : undefined;
+        const position = requiresNewLine ? anchorPosition : Position.create(anchorPosition.line, 0);
+        const redundantWhitespace = requiresNewLine ? Range.create(startAnchorRange.end, anchorPosition) : undefined;
         return { type: 'child', position, requiresNewLine, redundantWhitespace };
     }
-    const closeTagRange = (0, xml_odata_annotation_converter_1.transformRange)(element.syntax.closeBody);
+    const closeTagRange = transformRange(element.syntax.closeBody);
     const startAnchorRange = findStartAnchorRange(element, element.subElements.length);
     if (closeTagRange && startAnchorRange) {
         const anchorPosition = closeTagRange.start;
         const requiresNewLine = anchorPosition.line === startAnchorRange.end.line;
-        const position = requiresNewLine ? anchorPosition : odata_annotation_core_types_1.Position.create(anchorPosition.line, 0);
+        const position = requiresNewLine ? anchorPosition : Position.create(anchorPosition.line, 0);
         return { type: 'parent', position, requiresNewLine: false };
     }
     return { type: 'none' };
@@ -524,7 +520,7 @@ function findInsertPosition(comments, element, index = -1) {
 function findStartAnchorRange(parent, index) {
     const previousElement = parent.subElements[index - 1];
     if (index === 0) {
-        return (0, xml_odata_annotation_converter_1.transformRange)(parent.syntax.openBody);
+        return transformRange(parent.syntax.openBody);
     }
     if (previousElement) {
         return sourcePositionToRange(previousElement.position);
@@ -549,13 +545,13 @@ function findComment(comments, range) {
     return undefined;
 }
 function sourcePositionToRange(position) {
-    return odata_annotation_core_types_1.Range.create(position.startLine - 1, position.startColumn - 1, position.endLine - 1, position.endColumn);
+    return Range.create(position.startLine - 1, position.startColumn - 1, position.endLine - 1, position.endColumn);
 }
 function getIndentFromElement(element) {
     if (element?.type === 'XMLElement') {
-        const openTagRange = (0, xml_odata_annotation_converter_1.transformRange)(element.syntax.openBody);
+        const openTagRange = transformRange(element.syntax.openBody);
         if (openTagRange) {
-            return (0, odata_annotation_core_1.getIndentLevel)(openTagRange.start.character, printOptions.tabWidth) + 1;
+            return getIndentLevel(openTagRange.start.character, printOptions.tabWidth) + 1;
         }
     }
     return 0;
@@ -577,7 +573,7 @@ function createElementRanges(document, pointers) {
         return acc;
     }, new Map());
     for (const [containerPath, indices] of groups) {
-        const parent = (0, pointer_1.getNodeFromPointer)(document, containerPath);
+        const parent = getNodeFromPointer(document, containerPath);
         if (parent?.type === 'XMLElement') {
             indices.sort((index1, index2) => index1 - index2);
             for (let i = 1, start = indices[0], end = indices[0]; i <= indices.length; i++) {
@@ -601,7 +597,7 @@ function createElementRanges(document, pointers) {
     return ranges;
 }
 function getElementContent(element, comments) {
-    const range = (0, xml_odata_annotation_converter_1.transformRange)(element.position);
+    const range = transformRange(element.position);
     if (!range) {
         return [];
     }
@@ -614,7 +610,7 @@ function getElementContent(element, comments) {
             content.push(item);
             continue;
         }
-        const range = (0, xml_odata_annotation_converter_1.transformRange)(item.position);
+        const range = transformRange(item.position);
         if (!range) {
             continue;
         }
@@ -622,7 +618,7 @@ function getElementContent(element, comments) {
             type: 'element',
             element: item,
             elementRange: range,
-            range: (0, cds_annotation_parser_1.copyRange)(range)
+            range: copyRange(range)
         };
         const previousItem = content[content.length - 1];
         const previousLine = element.range.start.line - 1;
@@ -643,28 +639,28 @@ function getElementContent(element, comments) {
     return content;
 }
 function isCommentInContent(range, comment, element) {
-    return ((0, odata_annotation_core_1.rangeContained)(range, comment.range) &&
+    return (rangeContained(range, comment.range) &&
         !element.subElements.some((item) => {
-            const subElementRange = (0, xml_odata_annotation_converter_1.transformRange)(item.position);
+            const subElementRange = transformRange(item.position);
             if (!subElementRange) {
                 return false;
             }
-            return (0, odata_annotation_core_1.rangeContained)(subElementRange, comment.range);
+            return rangeContained(subElementRange, comment.range);
         }));
 }
 function compareRange(a, b) {
-    const aRange = a.range ?? (0, xml_odata_annotation_converter_1.transformRange)(a.syntax?.closeBody ?? a.syntax?.openBody);
-    const bRange = b.range ?? (0, xml_odata_annotation_converter_1.transformRange)(b.syntax?.closeBody ?? b.syntax?.openBody);
+    const aRange = a.range ?? transformRange(a.syntax?.closeBody ?? a.syntax?.openBody);
+    const bRange = b.range ?? transformRange(b.syntax?.closeBody ?? b.syntax?.openBody);
     if (!aRange) {
         return 1;
     }
     if (!bRange) {
         return -1;
     }
-    if ((0, odata_annotation_core_1.isBefore)(aRange.start, bRange.start)) {
+    if (isBefore(aRange.start, bRange.start)) {
         return -1;
     }
-    else if ((0, odata_annotation_core_1.isBefore)(bRange.start, aRange.start)) {
+    else if (isBefore(bRange.start, aRange.start)) {
         return 1;
     }
     return 0;
@@ -701,22 +697,22 @@ function getRangeForMove(content, parent, start, end) {
     let startPosition = getStartAnchor(content, parent, previousContentIndex, startContentIndex)?.start;
     let endPosition = endElement?.range?.end;
     if (startPosition) {
-        startPosition = (0, cds_annotation_parser_1.copyPosition)(startPosition);
+        startPosition = copyPosition(startPosition);
     }
     if (endPosition) {
-        endPosition = (0, cds_annotation_parser_1.copyPosition)(endPosition);
+        endPosition = copyPosition(endPosition);
     }
     if (!startPosition || !endElement) {
         return undefined;
     }
-    return odata_annotation_core_types_1.Range.create(startPosition, endPosition);
+    return Range.create(startPosition, endPosition);
 }
 function getStartAnchor(content, parent, previous, index) {
     const previousElement = content[previous];
-    let startPosition = index === 0 ? (0, xml_odata_annotation_converter_1.transformRange)(parent.syntax.openBody)?.end : previousElement?.range?.end;
+    let startPosition = index === 0 ? transformRange(parent.syntax.openBody)?.end : previousElement?.range?.end;
     const item = content[index];
     if (startPosition) {
-        startPosition = (0, cds_annotation_parser_1.copyPosition)(startPosition);
+        startPosition = copyPosition(startPosition);
     }
     if (!startPosition || !item) {
         return undefined;
@@ -726,7 +722,7 @@ function getStartAnchor(content, parent, previous, index) {
         // multiple comments between previous item and starting item -> ignore them
         updatePosition(startPosition, previousItem.range.end);
     }
-    return odata_annotation_core_types_1.Range.create(startPosition, (0, cds_annotation_parser_1.copyPosition)(item.range.end));
+    return Range.create(startPosition, copyPosition(item.range.end));
 }
 function updatePosition(a, b) {
     a.line = b.line;
@@ -751,7 +747,7 @@ function adjustRangeByComments(comments, range) {
 }
 function findInsertPositionForMove(index, element, comments) {
     if (index === 0) {
-        const range = (0, xml_odata_annotation_converter_1.transformRange)(element.syntax.openBody);
+        const range = transformRange(element.syntax.openBody);
         return range?.end;
     }
     else if (index === undefined || index >= element.subElements.length) {
@@ -760,7 +756,7 @@ function findInsertPositionForMove(index, element, comments) {
             return undefined;
         }
         // self closed elements only have "openBody"
-        const range = (0, xml_odata_annotation_converter_1.transformRange)(child.syntax.closeBody ?? child.syntax.openBody);
+        const range = transformRange(child.syntax.closeBody ?? child.syntax.openBody);
         adjustRangeByComments(comments, range);
         return range?.end;
     }
@@ -768,7 +764,7 @@ function findInsertPositionForMove(index, element, comments) {
         const child = element.subElements[index - 1];
         // end of the previous element
         // self closed elements only have "openBody"
-        const range = (0, xml_odata_annotation_converter_1.transformRange)(child.syntax.closeBody ?? child.syntax.openBody);
+        const range = transformRange(child.syntax.closeBody ?? child.syntax.openBody);
         adjustRangeByComments(comments, range);
         return range?.end;
     }
@@ -777,15 +773,15 @@ function findInsertPositionForMove(index, element, comments) {
 function getNamespaceMap(parent) {
     const map = {};
     for (const alias of Object.keys(parent.namespaces)) {
-        if (alias === ast_1.DEFAULT_NS) {
+        if (alias === DEFAULT_NS) {
             continue;
         }
         const namespace = parent.namespaces[alias];
-        if (namespace === xml_odata_annotation_converter_1.EDMX_V4_NAMESPACE) {
-            map[odata_annotation_core_types_1.EDMX_NAMESPACE_ALIAS] = alias;
+        if (namespace === EDMX_V4_NAMESPACE) {
+            map[EDMX_NAMESPACE_ALIAS] = alias;
         }
-        else if (namespace === xml_odata_annotation_converter_1.EDM_V4_NAMESPACE) {
-            map[odata_annotation_core_types_1.EDM_NAMESPACE_ALIAS] = alias;
+        else if (namespace === EDM_V4_NAMESPACE) {
+            map[EDM_NAMESPACE_ALIAS] = alias;
         }
     }
     return map;
@@ -801,11 +797,11 @@ function getNamespaceMapForNewRootNode(element) {
         if (alias === undefined) {
             continue;
         }
-        if (namespace === xml_odata_annotation_converter_1.EDMX_V4_NAMESPACE) {
-            map[odata_annotation_core_types_1.EDMX_NAMESPACE_ALIAS] = alias;
+        if (namespace === EDMX_V4_NAMESPACE) {
+            map[EDMX_NAMESPACE_ALIAS] = alias;
         }
-        else if (namespace === xml_odata_annotation_converter_1.EDM_V4_NAMESPACE) {
-            map[odata_annotation_core_types_1.EDM_NAMESPACE_ALIAS] = alias;
+        else if (namespace === EDM_V4_NAMESPACE) {
+            map[EDM_NAMESPACE_ALIAS] = alias;
         }
     }
     return map;
@@ -827,7 +823,7 @@ function combineInsertsWithDeletions(changes, document) {
             continue;
         }
         // merge inserts and deletions
-        const element = (0, pointer_1.getNodeFromPointer)(document, change.pointer);
+        const element = getNodeFromPointer(document, change.pointer);
         if (element?.type !== 'XMLElement') {
             continue;
         }