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

package/dist/change-converter.js

@@ -1,17 +1,14 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ChangeConverter = void 0;
-const odata_annotation_core_types_1 = require("@sap-ux/odata-annotation-core-types");
-const odata_annotation_core_1 = require("@sap-ux/odata-annotation-core");
-const avt_1 = require("./avt");
-const vocabularies_1 = require("./vocabularies");
-const types_1 = require("./types");
-const utils_1 = require("./utils");
-const error_1 = require("./error");
+import { ELEMENT_TYPE, ATTRIBUTE_TYPE, createElementNode, createTextNode, Edm, createTarget, TEXT_TYPE, ANNOTATION_FILE_TYPE } from '@sap-ux/odata-annotation-core-types';
+import { getAliasInformation, getAllNamespacesAndReferences, toAliasQualifiedName } from '@sap-ux/odata-annotation-core';
+import { convertAnnotationToInternal, convertPointerInAnnotationToInternal, convertExpressionToInternal, convertPrimitiveValueToInternal, findAnnotationByReference, getAvtNodeFromPointer, convertCollectionToInternal, convertPropertyValueToInternal, convertRecordToInternal, findAnnotation } from './avt/index.js';
+import { addAllVocabulariesToAliasInformation } from './vocabularies.js';
+import { ChangeType, DELETE_ATTRIBUTE, DELETE_ELEMENT, ExpressionType, INSERT_ATTRIBUTE, INSERT_ELEMENT, INSERT_TARGET, UPDATE_ATTRIBUTE_VALUE, MOVE_ELEMENT, REPLACE_ATTRIBUTE, REPLACE_ELEMENT, REPLACE_ELEMENT_CONTENT, REPLACE_TEXT } from './types/index.js';
+import { annotationReferenceToString, getGenericNodeFromPointer } from './utils/index.js';
+import { ApiError, ApiErrorCode } from './error.js';
 /**
  * Converts changes to the internal change format.
  */
-class ChangeConverter {
+export class ChangeConverter {
     serviceName;
     vocabularyAPI;
     metadataService;
@@ -50,22 +47,22 @@ class ChangeConverter {
         for (const change of mergedChanges) {
             const file = this.getFile(compiledService, change.uri);
             const aliasInfoMod = this.getAliasInformation(file);
-            if (change.kind === types_1.ChangeType.InsertAnnotation) {
+            if (change.kind === ChangeType.InsertAnnotation) {
                 this.insertAnnotation(compiledService, aliasInfoMod, change);
             }
-            else if (change.kind === types_1.ChangeType.InsertEmbeddedAnnotation) {
+            else if (change.kind === ChangeType.InsertEmbeddedAnnotation) {
                 this.insertEmbeddedAnnotation(file, fileMergeMaps, aliasInfoMod, change);
             }
-            else if (change.kind === types_1.ChangeType.Insert) {
+            else if (change.kind === ChangeType.Insert) {
                 this.convertInsert(file, fileMergeMaps, aliasInfoMod, change);
             }
-            else if (change.kind === types_1.ChangeType.Delete) {
+            else if (change.kind === ChangeType.Delete) {
                 this.convertDelete(file, fileMergeMaps, aliasInfoMod, change);
             }
-            else if (change.kind === types_1.ChangeType.Update) {
+            else if (change.kind === ChangeType.Update) {
                 this.convertUpdate(file, fileMergeMaps, aliasInfoMod, schemaProvider, change);
             }
-            else if (change.kind === types_1.ChangeType.Move) {
+            else if (change.kind === ChangeType.Move) {
                 this.convertMove(file, fileMergeMaps, aliasInfoMod, change);
             }
         }
@@ -77,7 +74,7 @@ class ChangeConverter {
         if (!file) {
             if (this.ignoreChangedFileInitialContent) {
                 return {
-                    type: odata_annotation_core_types_1.ANNOTATION_FILE_TYPE,
+                    type: ANNOTATION_FILE_TYPE,
                     uri,
                     references: [],
                     targets: []
@@ -89,8 +86,8 @@ class ChangeConverter {
     }
     insertAnnotation(compiledService, aliasInfo, change) {
         const annotationFile = compiledService.annotationFiles.find((file) => file.uri === change.uri);
-        const targetName = (0, odata_annotation_core_1.toAliasQualifiedName)(change.content.target, aliasInfo);
-        const targetIndex = annotationFile?.targets.findIndex((target) => (0, odata_annotation_core_1.toAliasQualifiedName)(target.name, aliasInfo) === targetName);
+        const targetName = toAliasQualifiedName(change.content.target, aliasInfo);
+        const targetIndex = annotationFile?.targets.findIndex((target) => toAliasQualifiedName(target.name, aliasInfo) === targetName);
         if (targetIndex === -1 || targetIndex === undefined) {
             // no existing target found, we need to create one
             const changesForUri = this.newTargetChanges.get(change.uri);
@@ -110,23 +107,23 @@ class ChangeConverter {
         else {
             // add annotation to existing target
             const internal = {
-                type: types_1.INSERT_ELEMENT,
+                type: INSERT_ELEMENT,
                 uri: change.uri,
                 target: targetName,
                 pointer: `/targets/${targetIndex}`,
-                element: (0, avt_1.convertAnnotationToInternal)(change.content.value, aliasInfo)
+                element: convertAnnotationToInternal(change.content.value, aliasInfo)
             };
             this.annotationFileChanges.push(internal);
         }
     }
     insertEmbeddedAnnotation(file, fileMergeMaps, aliasInfo, change) {
         const { reference, content } = change;
-        const { targetPointer, internalPointer } = (0, avt_1.findAnnotationByReference)(aliasInfo, file, fileMergeMaps[change.uri], reference, change.pointer, this.splitAnnotationSupport);
+        const { targetPointer, internalPointer } = findAnnotationByReference(aliasInfo, file, fileMergeMaps[change.uri], reference, change.pointer, this.splitAnnotationSupport);
         const internal = {
-            type: types_1.INSERT_ELEMENT,
+            type: INSERT_ELEMENT,
             uri: change.uri,
             target: change.reference.target,
-            element: (0, avt_1.convertAnnotationToInternal)(content.value, aliasInfo),
+            element: convertAnnotationToInternal(content.value, aliasInfo),
             pointer: targetPointer + internalPointer,
             index: change.index
         };
@@ -134,37 +131,37 @@ class ChangeConverter {
     }
     convertInsert(file, fileMergeMaps, aliasInfo, change) {
         const { reference, content } = change;
-        const { element, targetPointer: pointer, internalPointer } = (0, avt_1.findAnnotationByReference)(aliasInfo, file, fileMergeMaps[change.uri], reference, change.pointer, this.splitAnnotationSupport);
-        const index = change.kind === types_1.ChangeType.Insert ? change.index : undefined;
+        const { element, targetPointer: pointer, internalPointer } = findAnnotationByReference(aliasInfo, file, fileMergeMaps[change.uri], reference, change.pointer, this.splitAnnotationSupport);
+        const index = change.kind === ChangeType.Insert ? change.index : undefined;
         if (content.type === 'record') {
             const internal = {
-                type: types_1.INSERT_ELEMENT,
+                type: INSERT_ELEMENT,
                 uri: change.uri,
                 target: change.reference.target,
                 pointer: pointer + internalPointer,
-                element: (0, avt_1.convertRecordToInternal)(aliasInfo, content.value),
+                element: convertRecordToInternal(aliasInfo, content.value),
                 index
             };
             this.annotationFileChanges.push(internal);
         }
         else if (content.type === 'property-value') {
             const internal = {
-                type: types_1.INSERT_ELEMENT,
+                type: INSERT_ELEMENT,
                 uri: change.uri,
                 target: change.reference.target,
                 pointer: pointer + internalPointer,
-                element: (0, avt_1.convertPropertyValueToInternal)(aliasInfo, content.value),
+                element: convertPropertyValueToInternal(aliasInfo, content.value),
                 index
             };
             this.annotationFileChanges.push(internal);
         }
         else if (content.type === 'collection') {
             const internal = {
-                type: types_1.INSERT_ELEMENT,
+                type: INSERT_ELEMENT,
                 uri: change.uri,
                 target: change.reference.target,
                 pointer: pointer + internalPointer,
-                element: (0, avt_1.convertCollectionToInternal)(aliasInfo, content.value),
+                element: convertCollectionToInternal(aliasInfo, content.value),
                 index
             };
             this.annotationFileChanges.push(internal);
@@ -177,12 +174,12 @@ class ChangeConverter {
         }
     }
     convertInsertExpression(file, aliasInfoMod, pointer, change, content, index) {
-        const node = (0, utils_1.getGenericNodeFromPointer)(file, pointer);
-        if (node?.type === odata_annotation_core_types_1.ELEMENT_TYPE && node.name === "Collection" /* Edm.Collection */) {
-            const expression = (0, avt_1.convertExpressionToInternal)(aliasInfoMod, content.value);
+        const node = getGenericNodeFromPointer(file, pointer);
+        if (node?.type === ELEMENT_TYPE && node.name === Edm.Collection) {
+            const expression = convertExpressionToInternal(aliasInfoMod, content.value);
             if (expression) {
                 const internal = {
-                    type: types_1.INSERT_ELEMENT,
+                    type: INSERT_ELEMENT,
                     uri: change.uri,
                     target: change.reference.target,
                     pointer: pointer,
@@ -193,12 +190,12 @@ class ChangeConverter {
             }
         }
         else {
-            const container = (0, avt_1.convertExpressionToInternal)(aliasInfoMod, content.value, (0, odata_annotation_core_types_1.createElementNode)({ name: 'placeholder' }));
+            const container = convertExpressionToInternal(aliasInfoMod, content.value, createElementNode({ name: 'placeholder' }));
             if (container) {
                 const expression = container.content[0];
-                if (expression?.type === odata_annotation_core_types_1.ELEMENT_TYPE) {
+                if (expression?.type === ELEMENT_TYPE) {
                     const internal = {
-                        type: types_1.INSERT_ELEMENT,
+                        type: INSERT_ELEMENT,
                         uri: change.uri,
                         target: change.reference.target,
                         pointer: pointer,
@@ -211,7 +208,7 @@ class ChangeConverter {
                 else if (Object.keys(container.attributes).length > 0) {
                     const attribute = container.attributes[Object.keys(container.attributes)[0]];
                     const internal = {
-                        type: types_1.INSERT_ATTRIBUTE,
+                        type: INSERT_ATTRIBUTE,
                         uri: change.uri,
                         pointer: pointer,
                         name: attribute.name,
@@ -224,15 +221,15 @@ class ChangeConverter {
         }
     }
     convertInsertPrimitive(element, aliasInfoMod, pointer, internalPointer, change, content, index) {
-        if (content.expressionType === types_1.ExpressionType.Unknown) {
-            const attributePointer = (0, avt_1.convertPointerInAnnotationToInternal)(element, 
+        if (content.expressionType === ExpressionType.Unknown) {
+            const attributePointer = convertPointerInAnnotationToInternal(element, 
             // last segment is used to determine attribute name
             change.pointer.split('/').slice(0, -1).join('/'));
             const attributeName = getAttributeNameFromPointer(change.pointer);
             if (attributeName) {
-                const value = (0, avt_1.convertPrimitiveValueToInternal)(attributeName, content.value, aliasInfoMod);
+                const value = convertPrimitiveValueToInternal(attributeName, content.value, aliasInfoMod);
                 const internal = {
-                    type: types_1.INSERT_ATTRIBUTE,
+                    type: INSERT_ATTRIBUTE,
                     uri: change.uri,
                     pointer: pointer + attributePointer,
                     name: attributeName,
@@ -241,20 +238,20 @@ class ChangeConverter {
                 this.annotationFileChanges.push(internal);
             }
         }
-        else if (content.expressionType === types_1.ExpressionType.Null) {
+        else if (content.expressionType === ExpressionType.Null) {
             const internal = {
-                type: types_1.INSERT_ELEMENT,
+                type: INSERT_ELEMENT,
                 uri: change.uri,
                 target: change.reference.target,
                 pointer: pointer + internalPointer,
-                element: (0, odata_annotation_core_types_1.createElementNode)({ name: "Null" /* Edm.Null */ }),
+                element: createElementNode({ name: Edm.Null }),
                 index
             };
             this.annotationFileChanges.push(internal);
         }
         else if (typeof content.expressionType === 'string') {
             const internal = {
-                type: types_1.INSERT_ATTRIBUTE,
+                type: INSERT_ATTRIBUTE,
                 uri: change.uri,
                 pointer: pointer + internalPointer,
                 name: content.expressionType,
@@ -265,7 +262,7 @@ class ChangeConverter {
     }
     convertDelete(file, fileMergeMaps, aliasInfo, change) {
         const { reference } = change;
-        const { target, targetPointer: pointer, internalPointer } = (0, avt_1.findAnnotationByReference)(aliasInfo, file, fileMergeMaps[change.uri], reference, change.pointer, this.splitAnnotationSupport);
+        const { target, targetPointer: pointer, internalPointer } = findAnnotationByReference(aliasInfo, file, fileMergeMaps[change.uri], reference, change.pointer, this.splitAnnotationSupport);
         // look for attribute pointer suffix e.g attributes/Qualifier/value
         const suffix = internalPointer.split('/').slice(-3);
         if (suffix[0] === 'attributes' && suffix.length === 3) {
@@ -273,7 +270,7 @@ class ChangeConverter {
             const [, , property] = suffix;
             if (property === 'value') {
                 const internal = {
-                    type: types_1.DELETE_ATTRIBUTE,
+                    type: DELETE_ATTRIBUTE,
                     uri: change.uri,
                     pointer: pointer + internalPointer.split('/').slice(0, -1).join('/')
                 };
@@ -282,7 +279,7 @@ class ChangeConverter {
         }
         else if (change.pointer === '') {
             const internal = {
-                type: types_1.DELETE_ELEMENT,
+                type: DELETE_ELEMENT,
                 target: target.name,
                 uri: change.uri,
                 pointer: pointer
@@ -291,7 +288,7 @@ class ChangeConverter {
         }
         else if (internalPointer !== '') {
             const internal = {
-                type: types_1.DELETE_ELEMENT,
+                type: DELETE_ELEMENT,
                 uri: change.uri,
                 target: target.name,
                 pointer: pointer + internalPointer
@@ -302,7 +299,7 @@ class ChangeConverter {
     convertUpdate(file, fileMergeMaps, aliasInfo, schemaProvider, change) {
         const { reference, content } = change;
         const valueType = this.getValueType(schemaProvider, change);
-        const { element, targetPointer: pointer, internalPointer } = (0, avt_1.findAnnotationByReference)(aliasInfo, file, fileMergeMaps[change.uri], reference, change.pointer, this.splitAnnotationSupport, valueType);
+        const { element, targetPointer: pointer, internalPointer } = findAnnotationByReference(aliasInfo, file, fileMergeMaps[change.uri], reference, change.pointer, this.splitAnnotationSupport, valueType);
         if (internalPointer === '') {
             // value does not exist, treat this as insert
             this.convertInsert(file, fileMergeMaps, aliasInfo, change);
@@ -316,11 +313,11 @@ class ChangeConverter {
             this.convertUpdateAttribute(aliasInfo, attributeName, property, pointer, internalPointer, change);
         }
         else if (content.type === 'expression' && content.value.type === 'Collection') {
-            const node = (0, utils_1.getGenericNodeFromPointer)(file, pointer + internalPointer);
-            const newElement = (0, avt_1.convertExpressionToInternal)(aliasInfo, content.value);
-            if (node?.type === odata_annotation_core_types_1.ELEMENT_TYPE && newElement) {
+            const node = getGenericNodeFromPointer(file, pointer + internalPointer);
+            const newElement = convertExpressionToInternal(aliasInfo, content.value);
+            if (node?.type === ELEMENT_TYPE && newElement) {
                 const internalChange = {
-                    type: types_1.REPLACE_ELEMENT,
+                    type: REPLACE_ELEMENT,
                     uri: change.uri,
                     pointer: pointer + internalPointer,
                     newElement
@@ -332,7 +329,7 @@ class ChangeConverter {
             this.convertUpdateExpression(file, aliasInfo, content, pointer + internalPointer, valueType, reference.target);
         }
         else if (content.type === 'primitive' && content.value !== undefined) {
-            const internalPointerForPrimitiveValues = (0, avt_1.convertPointerInAnnotationToInternal)(element, change.pointer, content.expressionType);
+            const internalPointerForPrimitiveValues = convertPointerInAnnotationToInternal(element, change.pointer, content.expressionType);
             const replaceTextPointer = pointer + internalPointerForPrimitiveValues + '/text';
             this.convertUpdatePrimitiveValue(file, aliasInfo, content, pointer + internalPointer, replaceTextPointer);
         }
@@ -340,7 +337,7 @@ class ChangeConverter {
             const element = convertChangeToElement(aliasInfo, file, change);
             if (element) {
                 const internal = {
-                    type: types_1.REPLACE_ELEMENT,
+                    type: REPLACE_ELEMENT,
                     uri: change.uri,
                     pointer: pointer + internalPointer,
                     newElement: element
@@ -353,9 +350,9 @@ class ChangeConverter {
         const value = this.getAttributeValue(change.content);
         if (property === 'value' && value !== undefined) {
             const type = this.getPrimitiveValueType(change.content) ?? attributeName;
-            const newValue = (0, avt_1.convertPrimitiveValueToInternal)(type, value, aliasInfo);
+            const newValue = convertPrimitiveValueToInternal(type, value, aliasInfo);
             const internal = {
-                type: types_1.UPDATE_ATTRIBUTE_VALUE,
+                type: UPDATE_ATTRIBUTE_VALUE,
                 uri: change.uri,
                 pointer: pointer + internalPointer.split('/').slice(0, -1).join('/'),
                 newValue
@@ -365,13 +362,13 @@ class ChangeConverter {
     }
     getPrimitiveValueType(content) {
         if (content.type === 'primitive') {
-            if (content.expressionType === types_1.ExpressionType.Unknown) {
+            if (content.expressionType === ExpressionType.Unknown) {
                 return undefined;
             }
             return content.expressionType;
         }
         if (content.type === 'expression') {
-            if (content.value.type === types_1.ExpressionType.Unknown) {
+            if (content.value.type === ExpressionType.Unknown) {
                 return undefined;
             }
             return content.value.type;
@@ -392,15 +389,15 @@ class ChangeConverter {
     }
     convertUpdateExpression(file, aliasInfo, content, pointer, valueType, targetName) {
         const rawPrimitiveValue = this.getExpressionValue(content);
-        const newValue = (0, avt_1.convertPrimitiveValueToInternal)(content.value.type, rawPrimitiveValue, aliasInfo);
+        const newValue = convertPrimitiveValueToInternal(content.value.type, rawPrimitiveValue, aliasInfo);
         const type = valueType ?? content.value.type;
-        const node = (0, utils_1.getGenericNodeFromPointer)(file, pointer);
-        if (node?.type === odata_annotation_core_types_1.ELEMENT_TYPE) {
+        const node = getGenericNodeFromPointer(file, pointer);
+        if (node?.type === ELEMENT_TYPE) {
             const onlyChangeValue = content.previousType === undefined && content.value.type === valueType;
             if (onlyChangeValue && node.attributes[type]) {
                 // attribute notation
                 const internalChange = {
-                    type: types_1.UPDATE_ATTRIBUTE_VALUE,
+                    type: UPDATE_ATTRIBUTE_VALUE,
                     uri: file.uri,
                     pointer: pointer + `/attributes/${type}`,
                     newValue
@@ -410,17 +407,17 @@ class ChangeConverter {
             else if (onlyChangeValue && node.name === valueType) {
                 // element notation
                 const internalChange = {
-                    type: types_1.REPLACE_ELEMENT_CONTENT,
+                    type: REPLACE_ELEMENT_CONTENT,
                     uri: file.uri,
                     pointer: pointer,
-                    newValue: [(0, odata_annotation_core_types_1.createTextNode)(newValue)]
+                    newValue: [createTextNode(newValue)]
                 };
                 this.annotationFileChanges.push(internalChange);
             }
             else if (node.attributes[type]) {
                 // attribute notation
                 this.annotationFileChanges.push({
-                    type: types_1.REPLACE_ATTRIBUTE,
+                    type: REPLACE_ATTRIBUTE,
                     uri: file.uri,
                     pointer: pointer + `/attributes/${type}`,
                     newAttributeName: content.value.type,
@@ -430,14 +427,14 @@ class ChangeConverter {
             else if (node.name === valueType) {
                 // element notation
                 const childContent = [];
-                if (content.value.type !== "Null" /* Edm.Null */) {
-                    childContent.push((0, odata_annotation_core_types_1.createTextNode)(newValue));
+                if (content.value.type !== Edm.Null) {
+                    childContent.push(createTextNode(newValue));
                 }
                 const internalChange = {
-                    type: types_1.REPLACE_ELEMENT,
+                    type: REPLACE_ELEMENT,
                     uri: file.uri,
                     pointer: pointer,
-                    newElement: (0, odata_annotation_core_types_1.createElementNode)({
+                    newElement: createElementNode({
                         name: content.value.type,
                         content: childContent
                     })
@@ -445,7 +442,7 @@ class ChangeConverter {
                 this.annotationFileChanges.push(internalChange);
             }
         }
-        else if (node?.type === odata_annotation_core_types_1.ATTRIBUTE_TYPE) {
+        else if (node?.type === ATTRIBUTE_TYPE) {
             this.convertUpdateExpressionForAttrributeType(file.uri, targetName, valueType, content, pointer, newValue);
         }
     }
@@ -453,31 +450,31 @@ class ChangeConverter {
         if (content.previousType === undefined && content.value.type === valueType) {
             // attribute notation
             const internalChange = {
-                type: types_1.UPDATE_ATTRIBUTE_VALUE,
+                type: UPDATE_ATTRIBUTE_VALUE,
                 uri: fileUri,
                 pointer: pointer,
                 newValue
             };
             this.annotationFileChanges.push(internalChange);
         }
-        else if (content.value.type === "Null" /* Edm.Null */) {
+        else if (content.value.type === Edm.Null) {
             this.annotationFileChanges.push({
-                type: types_1.DELETE_ATTRIBUTE,
+                type: DELETE_ATTRIBUTE,
                 uri: fileUri,
                 pointer: pointer
             });
             this.annotationFileChanges.push({
-                type: types_1.INSERT_ELEMENT,
+                type: INSERT_ELEMENT,
                 uri: fileUri,
                 target: targetName,
                 pointer: pointer.split('/').slice(0, -2).join('/'),
-                element: (0, odata_annotation_core_types_1.createElementNode)({ name: "Null" /* Edm.Null */ })
+                element: createElementNode({ name: Edm.Null })
             });
         }
         else {
             // attribute notation
             const internalChange = {
-                type: types_1.REPLACE_ATTRIBUTE,
+                type: REPLACE_ATTRIBUTE,
                 uri: fileUri,
                 pointer: pointer,
                 newAttributeName: content.value.type,
@@ -487,34 +484,34 @@ class ChangeConverter {
         }
     }
     convertUpdatePrimitiveValue(file, aliasInfo, content, pointer, replaceTextPointer) {
-        const newValue = (0, avt_1.convertPrimitiveValueToInternal)(content.expressionType ?? '', content.value, aliasInfo);
-        const node = (0, utils_1.getGenericNodeFromPointer)(file, pointer);
-        if (node?.type === odata_annotation_core_types_1.TEXT_TYPE) {
+        const newValue = convertPrimitiveValueToInternal(content.expressionType ?? '', content.value, aliasInfo);
+        const node = getGenericNodeFromPointer(file, pointer);
+        if (node?.type === TEXT_TYPE) {
             const containerPointer = pointer.split('/').slice(0, -2).join('/');
-            const container = (0, utils_1.getGenericNodeFromPointer)(file, containerPointer);
-            if (container?.type === odata_annotation_core_types_1.ELEMENT_TYPE &&
+            const container = getGenericNodeFromPointer(file, containerPointer);
+            if (container?.type === ELEMENT_TYPE &&
                 content.expressionType &&
                 container.name !== content.expressionType) {
                 const internal = {
-                    type: types_1.REPLACE_ELEMENT,
+                    type: REPLACE_ELEMENT,
                     uri: file.uri,
                     pointer: containerPointer,
-                    newElement: (0, odata_annotation_core_types_1.createElementNode)({
+                    newElement: createElementNode({
                         name: content.expressionType,
-                        content: [(0, odata_annotation_core_types_1.createTextNode)(newValue)]
+                        content: [createTextNode(newValue)]
                     })
                 };
                 this.annotationFileChanges.push(internal);
                 return;
             }
         }
-        else if (node?.type === odata_annotation_core_types_1.ELEMENT_TYPE &&
+        else if (node?.type === ELEMENT_TYPE &&
             content.expressionType &&
             replaceTextPointer.split('/').includes('attributes')) {
             const oldAttributeName = replaceTextPointer.split('/').slice(-2)[0];
             if (node.attributes[content.expressionType]) {
                 const internal = {
-                    type: types_1.UPDATE_ATTRIBUTE_VALUE,
+                    type: UPDATE_ATTRIBUTE_VALUE,
                     uri: file.uri,
                     pointer: `${pointer}/attributes/${content.expressionType}`,
                     newValue
@@ -524,7 +521,7 @@ class ChangeConverter {
             }
             else {
                 const internal = {
-                    type: types_1.REPLACE_ATTRIBUTE,
+                    type: REPLACE_ATTRIBUTE,
                     uri: file.uri,
                     pointer: `${pointer}/attributes/${oldAttributeName}`,
                     newAttributeName: content.expressionType,
@@ -535,24 +532,24 @@ class ChangeConverter {
             }
         }
         const internal = {
-            type: types_1.REPLACE_TEXT,
+            type: REPLACE_TEXT,
             uri: file.uri,
             pointer: replaceTextPointer,
-            text: (0, odata_annotation_core_types_1.createTextNode)(newValue)
+            text: createTextNode(newValue)
         };
         this.annotationFileChanges.push(internal);
     }
     convertMove(file, fileMergeMaps, aliasInfo, change) {
         const { reference, index, moveReference } = change;
-        const { targetPointer: pointer, internalPointer } = (0, avt_1.findAnnotationByReference)(aliasInfo, file, fileMergeMaps[change.uri], reference, change.pointer, this.splitAnnotationSupport);
+        const { targetPointer: pointer, internalPointer } = findAnnotationByReference(aliasInfo, file, fileMergeMaps[change.uri], reference, change.pointer, this.splitAnnotationSupport);
         const internal = {
-            type: types_1.MOVE_ELEMENT,
+            type: MOVE_ELEMENT,
             uri: change.uri,
             pointer: pointer + internalPointer,
             index: index,
             fromPointers: moveReference.reduce((acc, moveRef) => {
                 acc.push(...moveRef.fromPointer.map((fromPointer) => {
-                    const { targetPointer: fromTargetPointer, internalPointer: internalFromPointer } = (0, avt_1.findAnnotationByReference)(aliasInfo, file, fileMergeMaps[change.uri], moveRef.reference ?? change.reference, fromPointer, this.splitAnnotationSupport);
+                    const { targetPointer: fromTargetPointer, internalPointer: internalFromPointer } = findAnnotationByReference(aliasInfo, file, fileMergeMaps[change.uri], moveRef.reference ?? change.reference, fromPointer, this.splitAnnotationSupport);
                     return fromTargetPointer + internalFromPointer;
                 }));
                 return acc;
@@ -566,10 +563,10 @@ class ChangeConverter {
             const file = this.getFile(compiledService, uri);
             const aliasInfoMod = this.getAliasInformation(file);
             for (const [targetName, inserts] of changesForUri) {
-                const target = (0, odata_annotation_core_types_1.createTarget)(targetName);
-                target.terms = inserts.map((change) => (0, avt_1.convertAnnotationToInternal)(change.content.value, aliasInfoMod));
+                const target = createTarget(targetName);
+                target.terms = inserts.map((change) => convertAnnotationToInternal(change.content.value, aliasInfoMod));
                 const internal = {
-                    type: types_1.INSERT_TARGET,
+                    type: INSERT_TARGET,
                     uri: uri,
                     target
                 };
@@ -597,15 +594,15 @@ class ChangeConverter {
     getValueTypeFromSchema(schemaProvider, change) {
         const { reference, uri, pointer } = change;
         const annotationLists = schemaProvider().schema.annotations[uri] ?? [];
-        const annotation = (0, avt_1.findAnnotation)(annotationLists, reference);
+        const annotation = findAnnotation(annotationLists, reference);
         if (!annotation) {
-            const refString = (0, utils_1.annotationReferenceToString)(reference, uri);
-            throw new error_1.ApiError(`Could not find annotation '${refString}' in file '${uri}'.`, error_1.ApiErrorCode.General);
+            const refString = annotationReferenceToString(reference, uri);
+            throw new ApiError(`Could not find annotation '${refString}' in file '${uri}'.`, ApiErrorCode.General);
         }
-        const node = (0, avt_1.getAvtNodeFromPointer)(annotation, pointer);
+        const node = getAvtNodeFromPointer(annotation, pointer);
         if (!node) {
-            const refString = (0, utils_1.annotationReferenceToString)(reference, uri);
-            throw new error_1.ApiError(`Could not resolve pointer '${pointer}' from annotation '${refString}'.`, error_1.ApiErrorCode.General);
+            const refString = annotationReferenceToString(reference, uri);
+            throw new ApiError(`Could not resolve pointer '${pointer}' from annotation '${refString}'.`, ApiErrorCode.General);
         }
         if (this.isExpression(node)) {
             return node.type;
@@ -620,9 +617,9 @@ class ChangeConverter {
         if (cachedValue) {
             return cachedValue;
         }
-        const namespaces = (0, odata_annotation_core_1.getAllNamespacesAndReferences)(file.namespace ?? { name: this.serviceName, type: 'namespace' }, file.references);
-        const aliasInfo = (0, odata_annotation_core_1.getAliasInformation)(namespaces, this.metadataService.getNamespaces());
-        const aliasInfoWithAllVocabularies = (0, vocabularies_1.addAllVocabulariesToAliasInformation)(aliasInfo, this.vocabularyAPI.getVocabularies());
+        const namespaces = getAllNamespacesAndReferences(file.namespace ?? { name: this.serviceName, type: 'namespace' }, file.references);
+        const aliasInfo = getAliasInformation(namespaces, this.metadataService.getNamespaces());
+        const aliasInfoWithAllVocabularies = addAllVocabulariesToAliasInformation(aliasInfo, this.vocabularyAPI.getVocabularies());
         this.aliasInfoCache[file.uri] = aliasInfoWithAllVocabularies;
         return aliasInfoWithAllVocabularies;
     }
@@ -632,28 +629,27 @@ class ChangeConverter {
         this.annotationFileChanges = [];
     }
 }
-exports.ChangeConverter = ChangeConverter;
 function mergeChanges(changes) {
     const result = [];
     const inserts = changes
-        .filter((change) => change.kind === types_1.ChangeType.InsertAnnotation)
+        .filter((change) => change.kind === ChangeType.InsertAnnotation)
         .reduce((acc, change) => {
         const reference = {
             target: change.content.target,
             term: change.content.value.term,
             qualifier: change.content.value.qualifier
         };
-        const key = (0, utils_1.annotationReferenceToString)(reference, change.uri);
+        const key = annotationReferenceToString(reference, change.uri);
         acc.set(key, change);
         return acc;
     }, new Map());
     for (const change of changes) {
-        if (change.kind === types_1.ChangeType.InsertAnnotation) {
+        if (change.kind === ChangeType.InsertAnnotation) {
             // don't do anything with annotation inserts
             result.push(change);
             continue;
         }
-        const key = (0, utils_1.annotationReferenceToString)(change.reference, change.uri);
+        const key = annotationReferenceToString(change.reference, change.uri);
         const insert = inserts.get(key);
         if (!insert) {
             // reference should exist -> continue normally
@@ -666,9 +662,9 @@ function mergeChanges(changes) {
     return result;
 }
 function mergeChange(target, source) {
-    const reference = (0, utils_1.annotationReferenceToString)(source.reference, source.uri);
+    const reference = annotationReferenceToString(source.reference, source.uri);
     switch (source.kind) {
-        case types_1.ChangeType.InsertEmbeddedAnnotation: {
+        case ChangeType.InsertEmbeddedAnnotation: {
             if (target.content.value.annotations) {
                 target.content.value.annotations.push(source.content.value);
             }
@@ -677,10 +673,10 @@ function mergeChange(target, source) {
             }
             return;
         }
-        case types_1.ChangeType.Insert: {
-            const node = (0, avt_1.getAvtNodeFromPointer)(target.content.value, source.pointer);
+        case ChangeType.Insert: {
+            const node = getAvtNodeFromPointer(target.content.value, source.pointer);
             if (!node) {
-                throw new error_1.ApiError(`Change merge for '${reference}' failed! Could not resolve '${source.pointer}'.`, error_1.ApiErrorCode.General);
+                throw new ApiError(`Change merge for '${reference}' failed! Could not resolve '${source.pointer}'.`, ApiErrorCode.General);
             }
             if (Array.isArray(node) && source.content.type === 'record') {
                 if (source.index === undefined || source.index >= node.length) {
@@ -691,34 +687,34 @@ function mergeChange(target, source) {
                 }
                 return;
             }
-            throw new error_1.ApiError(`Change merge for '${reference}' failed! Change value type '${source.content.type}' is not supported.`, error_1.ApiErrorCode.General);
+            throw new ApiError(`Change merge for '${reference}' failed! Change value type '${source.content.type}' is not supported.`, ApiErrorCode.General);
         }
         default:
             break;
     }
-    throw new error_1.ApiError(`Change merge for '${reference}' failed! Change type '${source.kind}' is not supported.`, error_1.ApiErrorCode.General);
+    throw new ApiError(`Change merge for '${reference}' failed! Change type '${source.kind}' is not supported.`, ApiErrorCode.General);
 }
 function convertChangeToElement(aliasInfoMod, file, change) {
     if (change.content.type === 'record') {
         const { content } = change;
-        return (0, avt_1.convertRecordToInternal)(aliasInfoMod, content.value);
+        return convertRecordToInternal(aliasInfoMod, content.value);
     }
     else if (change.content.type === 'property-value') {
         const { content } = change;
-        return (0, avt_1.convertPropertyValueToInternal)(aliasInfoMod, content.value);
+        return convertPropertyValueToInternal(aliasInfoMod, content.value);
     }
     else if (change.content.type === 'collection') {
         const { content } = change;
-        return (0, avt_1.convertCollectionToInternal)(aliasInfoMod, content.value);
+        return convertCollectionToInternal(aliasInfoMod, content.value);
     }
     else if (change.content.type === 'expression') {
         const { content } = change;
-        return (0, avt_1.convertExpressionToInternal)(aliasInfoMod, content.value);
+        return convertExpressionToInternal(aliasInfoMod, content.value);
     }
     else if (change.content.type === 'primitive') {
         const { content } = change;
-        if (content.expressionType === types_1.ExpressionType.Null) {
-            return (0, odata_annotation_core_types_1.createElementNode)({ name: "Null" /* Edm.Null */ });
+        if (content.expressionType === ExpressionType.Null) {
+            return createElementNode({ name: Edm.Null });
         }
     }
     return undefined;