@sap/ux-specification 1.71.118 → 1.71.120

package/dist/specification/src/sync/common/utils.js

@@ -3,9 +3,37 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getErrorMessage = exports.replaceNamespaces = exports.removeNamespaces = exports.updatePropertyIndices = exports.convertActionKeyToStableId = exports.convertEnumToCSV = exports.arrayCombineMerge = exports.getNextTargetDefinition = exports.generatePageId = exports.getSchemaFilePath = exports.deleteEmptyStructure = exports.getObjectPageFacetSection = exports.createDefaultSection = exports.addTargetTitleAndSectionDescription = exports.addSectionTitleAndDescription = exports.getTemplateTypeFromManifest = exports.determineV2Template = exports.getODataVersionFromManifest = exports.getMainService = exports.getFEVersionFromManifest = exports.getObjectPageFacets = exports.getObjectPageHeaderFacets = exports.getSchemaKeyOfLineItemRecord = exports.getManifestSectionByPathV4 = exports.getSectionFacet = exports.findAlias = exports.getPageTypeV2 = exports.prepareRef = exports.getDatafieldDescription = exports.getLabelForDataField = exports.getLabelForPropertyPath = exports.evaluateCommonLabel = exports.getAnnotationPropertyValue = exports.parseAndMergeAndConvert = exports.createAnnotationPath = exports.arrayIncludes = exports.DEFINITION_LINK_PREFIX = void 0;
+exports.arrayCombineMerge = exports.getSchemaFilePath = exports.deleteEmptyStructure = exports.getManifestSectionByPathV4 = exports.getAnnotationPropertyValue = exports.createAnnotationPath = exports.arrayIncludes = exports.DEFINITION_LINK_PREFIX = void 0;
+exports.parseAndMergeAndConvert = parseAndMergeAndConvert;
+exports.evaluateCommonLabel = evaluateCommonLabel;
+exports.getLabelForPropertyPath = getLabelForPropertyPath;
+exports.getLabelForDataField = getLabelForDataField;
+exports.getDatafieldDescription = getDatafieldDescription;
+exports.prepareRef = prepareRef;
+exports.getPageTypeV2 = getPageTypeV2;
+exports.findAlias = findAlias;
+exports.getSectionFacet = getSectionFacet;
+exports.getSchemaKeyOfLineItemRecord = getSchemaKeyOfLineItemRecord;
+exports.getObjectPageHeaderFacets = getObjectPageHeaderFacets;
+exports.getObjectPageFacets = getObjectPageFacets;
+exports.getFEVersionFromManifest = getFEVersionFromManifest;
+exports.getMainService = getMainService;
+exports.getODataVersionFromManifest = getODataVersionFromManifest;
+exports.determineV2Template = determineV2Template;
+exports.getTemplateTypeFromManifest = getTemplateTypeFromManifest;
+exports.addSectionTitleAndDescription = addSectionTitleAndDescription;
+exports.addTargetTitleAndSectionDescription = addTargetTitleAndSectionDescription;
+exports.createDefaultSection = createDefaultSection;
+exports.getObjectPageFacetSection = getObjectPageFacetSection;
+exports.generatePageId = generatePageId;
+exports.getNextTargetDefinition = getNextTargetDefinition;
+exports.convertEnumToCSV = convertEnumToCSV;
+exports.convertActionKeyToStableId = convertActionKeyToStableId;
+exports.updatePropertyIndices = updatePropertyIndices;
+exports.removeNamespaces = removeNamespaces;
+exports.replaceNamespaces = replaceNamespaces;
+exports.getErrorMessage = getErrorMessage;
 const ux_specification_types_1 = require("@sap/ux-specification-types");
-const ux_specification_types_2 = require("@sap/ux-specification-types");
 const i18next_1 = __importDefault(require("i18next"));
 const deepmerge_1 = __importDefault(require("deepmerge"));
 const annotation_converter_1 = require("@sap-ux/annotation-converter");
@@ -60,7 +88,6 @@ function parseAndMergeAndConvert(annotationFiles, logger) {
     }
     return converterOutput;
 }
-exports.parseAndMergeAndConvert = parseAndMergeAndConvert;
 const getAnnotationPropertyValue = (annotationProperty) => annotationProperty?.value || annotationProperty?.path;
 exports.getAnnotationPropertyValue = getAnnotationPropertyValue;
 /**
@@ -89,7 +116,6 @@ function evaluateCommonLabel(annotations, entityType, label) {
     }
     return label;
 }
-exports.evaluateCommonLabel = evaluateCommonLabel;
 /**
  * Determines the label for a property path
  * @param {PropertyPath} propertyPath - property path
@@ -103,7 +129,6 @@ function getLabelForPropertyPath(propertyPath, entityType) {
     }
     return label;
 }
-exports.getLabelForPropertyPath = getLabelForPropertyPath;
 /**
  * Determines the label for a LineItem record
  * @param {DataFieldAbstractType} field - Line item record
@@ -131,7 +156,6 @@ function getLabelForDataField(field, entityType) {
     }
     return label;
 }
-exports.getLabelForDataField = getLabelForDataField;
 /**
  * Function to resolve the dataField label
  * @param dataFieldLabel - Given dataField label; might be of type string, or an object in case of a path reference
@@ -221,31 +245,29 @@ function getDatafieldDescription(dataFieldAbstract, entityType) {
         }
         return title;
     }
-    catch (error) {
+    catch {
         return title;
     }
 }
-exports.getDatafieldDescription = getDatafieldDescription;
 /**
  * Prepare string for reference use in schema
  * @param refInput string to be character checked and replaced
  * @returns string with replaced characters
  */
+//@typescript-eslint/no-wrapper-object-types turned off tor prevent conversion String > string; String is used by AVT
 function prepareRef(refInput) {
     return refInput.replace('#', '::').replace(/\//g, ':2f');
 }
-exports.prepareRef = prepareRef;
 /**
  * Return the page type for a given V2 page in manifest
  * @param name - page component name
  */
 function getPageTypeV2(name) {
     if (name) {
-        const templatePart = `${ux_specification_types_2.v2.FE_TEMPLATE_V2}.`;
+        const templatePart = `${ux_specification_types_1.v2.FE_TEMPLATE_V2}.`;
         return name.split(templatePart)[1];
     }
 }
-exports.getPageTypeV2 = getPageTypeV2;
 function getTargetAnnotationName(targetAnnotation, keyForRelatedFacetKeys = false) {
     const termWithQualifier = `${targetAnnotation.term}#${targetAnnotation.qualifier}`;
     return `${!keyForRelatedFacetKeys ? '@' : ''}${targetAnnotation.qualifier ? termWithQualifier : targetAnnotation.term}`;
@@ -276,7 +298,6 @@ function findAlias(namespace, oDataServiceAVT) {
     }
     return aliasReference?.alias;
 }
-exports.findAlias = findAlias;
 /**
  * Determines the target annotation
  * @param navigationParts - parts of the target annotation path
@@ -304,11 +325,11 @@ function adjustKey(key, navigationParts, keyForRelatedFacetKeys) {
         key = pathParts.join('::');
     }
     else {
-        key = uiClass.replace('@UI', `${!keyForRelatedFacetKeys ? '@' : ''}${ux_specification_types_2.UIVOCABULARY}`);
+        key = uiClass.replace('@UI', `${!keyForRelatedFacetKeys ? '@' : ''}${ux_specification_types_1.UIVOCABULARY}`);
     }
     return key;
 }
-function getKeyAndEntityTypeOfReferenceFacet(oDataServiceAVT, key, entityType, propertyValue, oDataVersion = ux_specification_types_2.FioriElementsVersion.v2, keyForRelatedFacetKeys = false) {
+function getKeyAndEntityTypeOfReferenceFacet(oDataServiceAVT, key, entityType, propertyValue, oDataVersion = ux_specification_types_1.FioriElementsVersion.v2, keyForRelatedFacetKeys = false) {
     let stopProcessing = false;
     let namespace;
     const navigationParts = propertyValue.split('/');
@@ -319,7 +340,7 @@ function getKeyAndEntityTypeOfReferenceFacet(oDataServiceAVT, key, entityType, p
     key = adjustKey(key, navigationParts, keyForRelatedFacetKeys);
     const targetAnnotation = determineTargetAnnotation(navigationParts, entityType, oDataServiceAVT);
     if (targetAnnotation) {
-        const separator = oDataVersion === ux_specification_types_2.FioriElementsVersion.v2 ? '::' : '#';
+        const separator = oDataVersion === ux_specification_types_1.FioriElementsVersion.v2 ? '::' : '#';
         key = getTargetAnnotationName(targetAnnotation, keyForRelatedFacetKeys).replace('#', separator);
         namespace = targetAnnotation.fullyQualifiedName?.split('@')[0];
     }
@@ -328,7 +349,7 @@ function getKeyAndEntityTypeOfReferenceFacet(oDataServiceAVT, key, entityType, p
         return { key, entityType, stopProcessing, namespace };
     }
     if (navigation) {
-        const navSeparator = oDataVersion === ux_specification_types_2.FioriElementsVersion.v2 ? '::' : '/';
+        const navSeparator = oDataVersion === ux_specification_types_1.FioriElementsVersion.v2 ? '::' : '/';
         navigationParts.pop();
         const navigationIDs = [...navigationParts].join(navSeparator);
         key = `${navigationIDs}${navSeparator}${key}`;
@@ -344,7 +365,7 @@ function getKeyAndEntityTypeOfReferenceFacet(oDataServiceAVT, key, entityType, p
  * @param {ExtensionLogger} logger - Logger class for logging messages
  * @returns {FacetSection} - object comprising the relevant facet information
  */
-function getSectionFacet(facetDefinition, sourceEntityType, oDataServiceAVT, logger, oDataVersion = ux_specification_types_2.FioriElementsVersion.v2, keyForRelatedFacetKeys = false) {
+function getSectionFacet(facetDefinition, sourceEntityType, oDataServiceAVT, logger, oDataVersion = ux_specification_types_1.FioriElementsVersion.v2, keyForRelatedFacetKeys = false) {
     //Take facet ID as fallback
     const facetName = facetDefinition.fullyQualifiedName?.substring(facetDefinition.fullyQualifiedName?.lastIndexOf('@'));
     let key = facetDefinition.ID ? facetDefinition.ID.toString() : facetName;
@@ -382,7 +403,6 @@ function getSectionFacet(facetDefinition, sourceEntityType, oDataServiceAVT, log
         return undefined;
     }
 }
-exports.getSectionFacet = getSectionFacet;
 /**
  * Finds the alias for a given namespace in the references' section of the converted service metadata.
  * An empty object is created if the path element does not exist yet.
@@ -440,7 +460,7 @@ function getSchemaKeyOfLineItemRecord(lineItemRecord) {
                 schemaKey =
                     'DataFieldForAnnotation:::sTarget::' +
                         target
-                            .replace('@UI', `@${ux_specification_types_2.UIVOCABULARY}`)
+                            .replace('@UI', `@${ux_specification_types_1.UIVOCABULARY}`)
                             .replace('@Communication', '@com.sap.vocabularies.Communication.v1')
                             .replace('@Contact', '@com.sap.vocabularies.Contact.v1');
             }
@@ -469,7 +489,6 @@ function getSchemaKeyOfLineItemRecord(lineItemRecord) {
     }
     return schemaKey;
 }
-exports.getSchemaKeyOfLineItemRecord = getSchemaKeyOfLineItemRecord;
 /**
  * Determines if type of given annotation term is of UIAnnotationTerm
  * @param {string} path path in manifest
@@ -536,20 +555,20 @@ function getAnnotationTerm(path, alias, entityType) {
  * @param {ConvertedMetadata} oDataServiceAVT - complete service information, as returned by annotation vocabularies tool
  */
 function evaluateTargetAnnotation(section, annotationRecord, facets, entityType, oDataServiceAVT) {
-    const alias = findAlias(ux_specification_types_2.UIVOCABULARY, oDataServiceAVT);
+    const alias = findAlias(ux_specification_types_1.UIVOCABULARY, oDataServiceAVT);
     let path = section ? section.key : '';
     const targetEntityType = section.entityType;
     const annotationTerm = getAnnotationTerm(path, alias, entityType);
     switch (annotationTerm) {
         case "com.sap.vocabularies.UI.v1.Chart" /* UIAnnotationTerms.Chart */: {
-            facets[path] = { base: ux_specification_types_2.FacetBase.Chart };
+            facets[path] = { base: ux_specification_types_1.FacetBase.Chart };
             facets[path].target = annotationRecord?.Target?.$target;
             facets[path].entityType = targetEntityType;
             facets[path].namespace = section.namespace;
             break;
         }
         case "com.sap.vocabularies.UI.v1.Identification" /* UIAnnotationTerms.Identification */: {
-            facets[path] = { base: ux_specification_types_2.FacetBase.Identification };
+            facets[path] = { base: ux_specification_types_1.FacetBase.Identification };
             facets[path].target = annotationRecord?.Target?.$target;
             facets[path].entityType = targetEntityType;
             facets[path].namespace = section.namespace;
@@ -561,21 +580,21 @@ function evaluateTargetAnnotation(section, annotationRecord, facets, entityType,
                 pathParts[pathParts.length - 1] = `@${"com.sap.vocabularies.UI.v1.LineItem" /* UIAnnotationTerms.LineItem */}`;
                 path = pathParts.join('::');
             }
-            facets[path] = { base: ux_specification_types_2.FacetBase.LineItem };
+            facets[path] = { base: ux_specification_types_1.FacetBase.LineItem };
             facets[path].target = annotationRecord?.Target?.$target;
             facets[path].entityType = targetEntityType;
             facets[path].namespace = section.namespace;
             break;
         }
         case "com.sap.vocabularies.UI.v1.FieldGroup" /* UIAnnotationTerms.FieldGroup */: {
-            facets[path] = { base: ux_specification_types_2.FacetBase.Form };
+            facets[path] = { base: ux_specification_types_1.FacetBase.Form };
             facets[path].target = annotationRecord?.Target?.$target;
             facets[path].entityType = targetEntityType;
             facets[path].namespace = section.namespace;
             break;
         }
         case "com.sap.vocabularies.UI.v1.DataPoint" /* UIAnnotationTerms.DataPoint */: {
-            facets[path] = { base: ux_specification_types_2.FacetBase.DataPoint };
+            facets[path] = { base: ux_specification_types_1.FacetBase.DataPoint };
             facets[path].Label = annotationRecord?.Target?.$target['Title'];
             facets[path].target = annotationRecord?.Target?.$target;
             facets[path].entityType = targetEntityType;
@@ -583,32 +602,32 @@ function evaluateTargetAnnotation(section, annotationRecord, facets, entityType,
             break;
         }
         case "com.sap.vocabularies.UI.v1.PresentationVariant" /* UIAnnotationTerms.PresentationVariant */: {
-            facets[path] = { base: ux_specification_types_2.FacetBase.PresentationVariant };
+            facets[path] = { base: ux_specification_types_1.FacetBase.PresentationVariant };
             facets[path].target = annotationRecord?.Target?.$target;
             facets[path].entityType = targetEntityType;
             facets[path].namespace = section.namespace;
             break;
         }
         case "com.sap.vocabularies.Communication.v1.Contact" /* CommunicationAnnotationTerms.Contact */: {
-            facets[path] = { base: ux_specification_types_2.FacetBase.Contact };
+            facets[path] = { base: ux_specification_types_1.FacetBase.Contact };
             facets[path].target = annotationRecord?.Target?.$target;
             facets[path].entityType = targetEntityType;
             facets[path].namespace = section.namespace;
             break;
         }
         case "com.sap.vocabularies.Communication.v1.Address" /* CommunicationAnnotationTerms.Address */: {
-            facets[path] = { base: ux_specification_types_2.FacetBase.Address };
+            facets[path] = { base: ux_specification_types_1.FacetBase.Address };
             facets[path].target = annotationRecord?.Target?.$target;
             facets[path].entityType = targetEntityType;
             facets[path].namespace = section.namespace;
             break;
         }
         default: {
-            facets[path] = { base: ux_specification_types_2.FacetBase.Unknown };
+            facets[path] = { base: ux_specification_types_1.FacetBase.Unknown };
         }
     }
     if (facets[path]) {
-        facets[path].annotationPath = `/${annotationRecord.fullyQualifiedName.replace('@com.sap.vocabularies', ux_specification_types_2.VOCWITHSLASH)}`;
+        facets[path].annotationPath = `/${annotationRecord.fullyQualifiedName.replace('@com.sap.vocabularies', ux_specification_types_1.VOCWITHSLASH)}`;
         if (annotationRecord.Label) {
             facets[path].Label = annotationRecord.Label;
         }
@@ -631,7 +650,7 @@ function evaluateTargetAnnotation(section, annotationRecord, facets, entityType,
  * @param {FioriElementsVersion} oDataVersion - OData version
  * @param {ExtensionLogger} logger - Logger class for logging messages
  */
-function addFacetToConfig(annotationRecord, oDataServiceAVT, serviceName, entityType, facets, oDataVersion = ux_specification_types_2.FioriElementsVersion.v2, logger) {
+function addFacetToConfig(annotationRecord, oDataServiceAVT, serviceName, entityType, facets, oDataVersion = ux_specification_types_1.FioriElementsVersion.v2, logger) {
     const section = getSectionFacet(annotationRecord, entityType, oDataServiceAVT, logger, oDataVersion, false);
     if (section) {
         switch (annotationRecord.$Type) {
@@ -642,7 +661,7 @@ function addFacetToConfig(annotationRecord, oDataServiceAVT, serviceName, entity
             case "com.sap.vocabularies.UI.v1.CollectionFacet" /* UIAnnotationTypes.CollectionFacet */: {
                 const annotationPath = `/${entityType.fullyQualifiedName}/${annotationRecord.fullyQualifiedName.split(entityType.fullyQualifiedName)[1]}`;
                 const facet = (facets[section.key] = {
-                    base: ux_specification_types_2.FacetBase.CollectionFacet,
+                    base: ux_specification_types_1.FacetBase.CollectionFacet,
                     facets: {},
                     ID: section.ID,
                     annotationPath: annotationPath,
@@ -664,12 +683,12 @@ function addFacetToConfig(annotationRecord, oDataServiceAVT, serviceName, entity
  * @param {FioriElementsVersion} oDataVersion - OData version
  * @param {ExtensionLogger} logger - Logger class for logging messages
  */
-function getObjectPageHeaderFacets(entityType, oDataServiceAVT, oDataVersion = ux_specification_types_2.FioriElementsVersion.v2, logger) {
+function getObjectPageHeaderFacets(entityType, oDataServiceAVT, oDataVersion = ux_specification_types_1.FioriElementsVersion.v2, logger) {
     const facets = {};
     if (!entityType || !entityType.annotations) {
         return;
     }
-    const alias = findAlias(ux_specification_types_2.UIVOCABULARY, oDataServiceAVT);
+    const alias = findAlias(ux_specification_types_1.UIVOCABULARY, oDataServiceAVT);
     const facetAnnotation = alias && entityType?.annotations?.[alias]?.HeaderFacets;
     if (facetAnnotation) {
         const lastDot = entityType && entityType.fullyQualifiedName.lastIndexOf('.');
@@ -681,7 +700,6 @@ function getObjectPageHeaderFacets(entityType, oDataServiceAVT, oDataVersion = u
     }
     return facets;
 }
-exports.getObjectPageHeaderFacets = getObjectPageHeaderFacets;
 /**
  * Retrieve facet configurations that can be used to generate ObjectPage schemas
  * @param {QualifiedName} entityTypeName - the name of the actual entity type
@@ -689,12 +707,12 @@ exports.getObjectPageHeaderFacets = getObjectPageHeaderFacets;
  * @param {FioriElementsVersion} oDataVersion - OData version
  * @param {ExtensionLogger} logger - Logger class for logging messages
  */
-function getObjectPageFacets(entityType, oDataServiceAVT, oDataVersion = ux_specification_types_2.FioriElementsVersion.v2, logger) {
+function getObjectPageFacets(entityType, oDataServiceAVT, oDataVersion = ux_specification_types_1.FioriElementsVersion.v2, logger) {
     const facets = {};
     if (!entityType || !entityType.annotations) {
         return;
     }
-    const alias = findAlias(ux_specification_types_2.UIVOCABULARY, oDataServiceAVT);
+    const alias = findAlias(ux_specification_types_1.UIVOCABULARY, oDataServiceAVT);
     const facetAnnotation = alias && entityType?.annotations[alias]?.Facets;
     if (facetAnnotation) {
         const lastDot = entityType && entityType.fullyQualifiedName.lastIndexOf('.');
@@ -706,20 +724,18 @@ function getObjectPageFacets(entityType, oDataServiceAVT, oDataVersion = ux_spec
     }
     return facets;
 }
-exports.getObjectPageFacets = getObjectPageFacets;
 /**
  * Returns the version of Fiori elements (v2/v4) from a given manifest
  * @param manifest - the manifest.json file
  */
 function getFEVersionFromManifest(manifest) {
-    if (manifest[ux_specification_types_2.ManifestSection.generic] || manifest[ux_specification_types_2.ManifestSection.ovp]) {
-        return ux_specification_types_2.FioriElementsVersion.v2;
+    if (manifest[ux_specification_types_1.ManifestSection.generic] || manifest[ux_specification_types_1.ManifestSection.ovp]) {
+        return ux_specification_types_1.FioriElementsVersion.v2;
     }
     else {
-        return ux_specification_types_2.FioriElementsVersion.v4;
+        return ux_specification_types_1.FioriElementsVersion.v4;
     }
 }
-exports.getFEVersionFromManifest = getFEVersionFromManifest;
 /**
  * Get the main service name from the manifest.
  * LROP: by definition the service name can be read from the UI5 model with "" as name.
@@ -729,14 +745,13 @@ exports.getFEVersionFromManifest = getFEVersionFromManifest;
  * @returns - main service name
  */
 function getMainService(manifest) {
-    const model = typeof manifest?.[ux_specification_types_2.ManifestSection.ovp]?.globalFilterModel === 'string'
-        ? manifest[ux_specification_types_2.ManifestSection.ovp].globalFilterModel
+    const model = typeof manifest?.[ux_specification_types_1.ManifestSection.ovp]?.globalFilterModel === 'string'
+        ? manifest[ux_specification_types_1.ManifestSection.ovp].globalFilterModel
         : '';
-    return typeof manifest?.[ux_specification_types_2.ManifestSection.ui5]?.models?.[model]?.dataSource === 'string'
-        ? manifest[ux_specification_types_2.ManifestSection.ui5].models[model].dataSource
+    return typeof manifest?.[ux_specification_types_1.ManifestSection.ui5]?.models?.[model]?.dataSource === 'string'
+        ? manifest[ux_specification_types_1.ManifestSection.ui5].models[model].dataSource
         : undefined;
 }
-exports.getMainService = getMainService;
 /**
  * Returns the oData version of the service (if any) from a given manifest
  * @param manifest - the manifest.json file
@@ -747,10 +762,9 @@ function getODataVersionFromManifest(manifest) {
     if (!mainService) {
         return ux_specification_types_1.OdataVersion.v2;
     }
-    const dataSource = manifest[ux_specification_types_2.ManifestSection.app].dataSources?.[mainService];
+    const dataSource = manifest[ux_specification_types_1.ManifestSection.app].dataSources?.[mainService];
     return dataSource?.settings?.odataVersion === '4.0' ? ux_specification_types_1.OdataVersion.v4 : ux_specification_types_1.OdataVersion.v2;
 }
-exports.getODataVersionFromManifest = getODataVersionFromManifest;
 /**
  * Determines the template type of a V2 app
  * @param manifest - the manifest.json file
@@ -759,27 +773,27 @@ exports.getODataVersionFromManifest = getODataVersionFromManifest;
  */
 function determineV2Template(manifest, logger) {
     let templateType;
-    if (manifest[ux_specification_types_2.ManifestSection.generic]) {
-        const v2Pages = manifest[ux_specification_types_2.ManifestSection.generic].pages;
+    if (manifest[ux_specification_types_1.ManifestSection.generic]) {
+        const v2Pages = manifest[ux_specification_types_1.ManifestSection.generic].pages;
         if (!v2Pages) {
             (0, extensionLogger_1.log)(logger, {
                 severity: "error" /* LogSeverity.Error */,
                 message: i18next_1.default.t('NOPAGES', { appId: manifest['sap.app']['id'] }),
                 location: {
-                    path: ux_specification_types_2.MANIFESTPATH,
-                    range: [ux_specification_types_2.ManifestSection.generic]
+                    path: ux_specification_types_1.MANIFESTPATH,
+                    range: [ux_specification_types_1.ManifestSection.generic]
                 }
             });
             return;
         }
         for (const pageKey in v2Pages) {
             const v2Page = v2Pages[pageKey];
-            if (getPageTypeV2(v2Page.component?.name) === ux_specification_types_2.PageTypeV2.AnalyticalListPage) {
-                templateType = ux_specification_types_2.TemplateType.AnalyticalListPageV2;
+            if (getPageTypeV2(v2Page.component?.name) === ux_specification_types_1.PageTypeV2.AnalyticalListPage) {
+                templateType = ux_specification_types_1.TemplateType.AnalyticalListPageV2;
                 break;
             }
-            else if (getPageTypeV2(v2Page.component?.name) === ux_specification_types_2.PageTypeV2.ListReport) {
-                templateType = ux_specification_types_2.TemplateType.ListReportObjectPageV2;
+            else if (getPageTypeV2(v2Page.component?.name) === ux_specification_types_1.PageTypeV2.ListReport) {
+                templateType = ux_specification_types_1.TemplateType.ListReportObjectPageV2;
                 break;
             }
         }
@@ -788,17 +802,16 @@ function determineV2Template(manifest, logger) {
         if (!templateType) {
             (0, extensionLogger_1.log)(logger, {
                 severity: "error" /* LogSeverity.Error */,
-                message: i18next_1.default.t('NOTEMPLATE', { section: ux_specification_types_2.ManifestSection.generic }),
+                message: i18next_1.default.t('NOTEMPLATE', { section: ux_specification_types_1.ManifestSection.generic }),
                 location: {
-                    path: ux_specification_types_2.MANIFESTPATH,
-                    range: [ux_specification_types_2.ManifestSection.generic]
+                    path: ux_specification_types_1.MANIFESTPATH,
+                    range: [ux_specification_types_1.ManifestSection.generic]
                 }
             });
         }
     }
     return templateType;
 }
-exports.determineV2Template = determineV2Template;
 /**
  * Determines the template type, based on the given manifest entries of the app
  * @param manifest - the manifest.json file
@@ -808,15 +821,14 @@ exports.determineV2Template = determineV2Template;
  */
 function getTemplateTypeFromManifest(manifest, fioriElementsVersion, logger) {
     let templateType;
-    if (manifest[ux_specification_types_2.ManifestSection.ovp]) {
-        templateType = ux_specification_types_2.TemplateType.OverviewPageV2;
+    if (manifest[ux_specification_types_1.ManifestSection.ovp]) {
+        templateType = ux_specification_types_1.TemplateType.OverviewPageV2;
     }
-    else if (fioriElementsVersion === ux_specification_types_2.FioriElementsVersion.v2) {
+    else if (fioriElementsVersion === ux_specification_types_1.FioriElementsVersion.v2) {
         templateType = determineV2Template(manifest, logger);
     }
     return templateType;
 }
-exports.getTemplateTypeFromManifest = getTemplateTypeFromManifest;
 /**
  * Adds title and description to a section or header section in an app schema
  * @param facet - intermediate facet structure comprising annotation information
@@ -825,12 +837,12 @@ exports.getTemplateTypeFromManifest = getTemplateTypeFromManifest;
  */
 function addSectionTitleAndDescription(facet, section, facetKey) {
     if (facet?.ID) {
-        section.title = ux_specification_types_2.FacetTitlePrefix + facet.ID;
-        section[ux_specification_types_2.SchemaTag.keys] = [{ name: ux_specification_types_2.SchemaKeyName.id, value: facet.ID }];
+        section.title = ux_specification_types_1.FACETTITLEPREFIX + facet.ID;
+        section[ux_specification_types_1.SchemaTag.keys] = [{ name: ux_specification_types_1.SchemaKeyName.id, value: facet.ID }];
     }
     else {
         section.title = facetKey.replace(/@com.sap/g, 'com.sap');
-        section[ux_specification_types_2.SchemaTag.keys] = [{ name: ux_specification_types_2.SchemaKeyName.id, value: facetKey.replace(ux_specification_types_2.UIVOCABULARYALPHADOT, '') }];
+        section[ux_specification_types_1.SchemaTag.keys] = [{ name: ux_specification_types_1.SchemaKeyName.id, value: facetKey.replace(ux_specification_types_1.UIVOCABULARYALPHADOT, '') }];
     }
     // Description
     if (facet?.Label) {
@@ -843,7 +855,6 @@ function addSectionTitleAndDescription(facet, section, facetKey) {
         section.description = facetKey.substring(facetKey.lastIndexOf('.') + 1);
     }
 }
-exports.addSectionTitleAndDescription = addSectionTitleAndDescription;
 /**
  * Adds target title or description to a section or header section in an app schema
  * @param facet - intermediate facet structure comprising annotation information
@@ -865,7 +876,6 @@ function addTargetTitleAndSectionDescription(facet, section, facetKey) {
         section.description = facet.target['Label'];
     }
 }
-exports.addTargetTitleAndSectionDescription = addTargetTitleAndSectionDescription;
 /**
  * Creates a default object for a new section or subsection, and adds the ID as title if present.
  * @param facet Facet configuration, to be analyzed
@@ -877,12 +887,11 @@ function createDefaultSection(appSchema, facet, facetKey) {
         properties: {},
         additionalProperties: false
     };
-    section[ux_specification_types_2.SchemaTag.isViewNode] = true;
-    section[ux_specification_types_2.SchemaTag.annotationPath] = facet.annotationPath;
+    section[ux_specification_types_1.SchemaTag.isViewNode] = true;
+    section[ux_specification_types_1.SchemaTag.annotationPath] = facet.annotationPath;
     addTargetTitleAndSectionDescription(facet, section, facetKey);
     return section;
 }
-exports.createDefaultSection = createDefaultSection;
 /**
  * Retrieve page section data(so far id/key and label/description).
  * @param {EntityType} entityType The actual entityType
@@ -892,8 +901,8 @@ exports.createDefaultSection = createDefaultSection;
  * @param {boolean} [checkUnresolvableFacets=false] - Check and avoid facets and sections without ID and Target.
  * @returns {FacetSection[]} - Array of facets or sections
  */
-function getObjectPageFacetSection(entityType, oDataServiceAVT, logger, oDataVersion = ux_specification_types_2.FioriElementsVersion.v2, checkUnresolvableFacets = false) {
-    const alias = findAlias(ux_specification_types_2.UIVOCABULARY, oDataServiceAVT);
+function getObjectPageFacetSection(entityType, oDataServiceAVT, logger, oDataVersion = ux_specification_types_1.FioriElementsVersion.v2, checkUnresolvableFacets = false) {
+    const alias = findAlias(ux_specification_types_1.UIVOCABULARY, oDataServiceAVT);
     let sections = [];
     if (entityType) {
         const facetAnnotation = alias && entityType?.annotations?.[alias]?.Facets;
@@ -912,7 +921,6 @@ function getObjectPageFacetSection(entityType, oDataServiceAVT, logger, oDataVer
         return sections;
     }
 }
-exports.getObjectPageFacetSection = getObjectPageFacetSection;
 /**
  * Cleans empty sub-structures from the export result for manifest
  * @param {object} manifest - manifest.json part of the export result
@@ -930,11 +938,16 @@ const deleteEmptyStructure = (manifest, path, deletionRequest, entityPathArray,
     let manifestSection = manifest;
     const pathArray = path.split('/');
     pathArray.forEach(function (element) {
-        const decodedElement = targetAnnotationEncoded && targetAnnotationEncoded === element
+        let decodedElement = targetAnnotationEncoded && targetAnnotationEncoded === element
             ? targetAnnotation
             : element.replace('??', '/');
         if (!manifestSection[decodedElement]) {
-            return;
+            if (targetAnnotationEncoded === element) {
+                decodedElement = targetAnnotationEncoded;
+            }
+            if (!manifestSection[decodedElement]) {
+                return;
+            }
         }
         if (Object.keys(manifestSection[decodedElement]).length === 0 ||
             //deletion explicitly requested by using entityPath
@@ -974,20 +987,20 @@ const getSchemaFilePath = (schemaType, entitySet) => {
     };
     switch (schemaType) {
         // Application schema
-        case ux_specification_types_2.SchemaType.Application: {
+        case ux_specification_types_1.SchemaType.Application: {
             // File name
             schemaFile.filename = `App`;
             // Full path
-            schemaFile.path = `./${ux_specification_types_2.DirName.Schemas}/${schemaFile.filename}`;
+            schemaFile.path = `./${ux_specification_types_1.DirName.Schemas}/${schemaFile.filename}`;
             break;
         }
         // List report and object page
-        case ux_specification_types_2.SchemaType.ListReport:
-        case ux_specification_types_2.SchemaType.ObjectPage: {
+        case ux_specification_types_1.SchemaType.ListReport:
+        case ux_specification_types_1.SchemaType.ObjectPage: {
             // File name
             schemaFile.filename = entitySet ? `${schemaType}_${entitySet}` : getGenericSchemaFileName(schemaType);
             // Full path
-            schemaFile.path = `../${ux_specification_types_2.DirName.Schemas}/${schemaFile.filename}`;
+            schemaFile.path = `../${ux_specification_types_1.DirName.Schemas}/${schemaFile.filename}`;
             break;
         }
         // Other page configs
@@ -995,7 +1008,7 @@ const getSchemaFilePath = (schemaType, entitySet) => {
             // File name
             schemaFile.filename = getGenericSchemaFileName(schemaType);
             // Full path
-            schemaFile.path = `../${ux_specification_types_2.DirName.Schemas}/${schemaFile.filename}`;
+            schemaFile.path = `../${ux_specification_types_1.DirName.Schemas}/${schemaFile.filename}`;
             break;
         }
     }
@@ -1013,7 +1026,7 @@ exports.getSchemaFilePath = getSchemaFilePath;
  * @returns {string} Generated page id
  */
 function generatePageId(pageType, entitySet, viewId, pageName) {
-    if (pageType === ux_specification_types_2.PageTypeV2.CustomPage) {
+    if (pageType === ux_specification_types_1.PageTypeV2.CustomPage) {
         const names = viewId && viewId.split('.');
         return names && names[names.length - 1] + 'Page';
     }
@@ -1027,7 +1040,6 @@ function generatePageId(pageType, entitySet, viewId, pageName) {
     }
     return parts.join('_');
 }
-exports.generatePageId = generatePageId;
 function fillArrayFromAnyOfReference(element, appSchema, currentConfigObject, definitionArray) {
     const $ref = element.$ref;
     if ($ref) {
@@ -1088,7 +1100,6 @@ function determineNextDefinitionFromDefinitionArray(definitionArray, appSchema,
         const lastDefinition = definitionArray[definitionArray.length - 1];
         nextDefinition.targetDefinition = appSchema['definitions'][lastDefinition];
         if (nextDefinition?.targetDefinition?.['$ref'] || nextDefinition?.targetDefinition?.['type'] === 'array') {
-            // eslint-disable-next-line @typescript-eslint/no-use-before-define
             nextDefinition = getNextTargetDefinition(appSchema, title, currentConfigObject, nextDefinition.targetDefinition, key, factory, pageType);
             return nextDefinition;
         }
@@ -1142,7 +1153,6 @@ function getNextTargetDefinition(appSchema, title, currentConfigObject, property
     nextDefinition = determineNextDefinitionFromDefinitionArray(definitionArray, appSchema, title, currentConfigObject, key, factory, pageType, propertyDefinition);
     return nextDefinition;
 }
-exports.getNextTargetDefinition = getNextTargetDefinition;
 /**
  * Custom array merge function called by deepmerge's merge function
  *
@@ -1179,7 +1189,6 @@ function convertEnumToCSV(manifestSection, configPart, key) {
     const field = configPart[key];
     manifestSection[key] = field.join();
 }
-exports.convertEnumToCSV = convertEnumToCSV;
 /**
  * Converts an action ID from the internal format (schema, config) to the stable ID representation
  * @param actionId - the (unique) internal format of the action ID
@@ -1191,7 +1200,6 @@ function convertActionKeyToStableId(actionId) {
     }
     return (actionId.indexOf('??') > -1 ? actionId.split('??')[1] : actionId).replace(/@/g, '::');
 }
-exports.convertActionKeyToStableId = convertActionKeyToStableId;
 /**
  * Method adds indices (propertyIndex property) to app-specific JSON schema properties.
  *
@@ -1206,29 +1214,26 @@ function updatePropertyIndices(schema, order) {
         }
     });
 }
-exports.updatePropertyIndices = updatePropertyIndices;
 /**
  * Method to remove namespaces
  * @param {string } [sId]
  * @returns {string} modified string without namespace
  */
 function removeNamespaces(sId) {
-    sId = sId.replace(ux_specification_types_2.UIVOCABULARYDOT, '');
+    sId = sId.replace(ux_specification_types_1.UIVOCABULARYDOT, '');
     sId = sId.replace('com.sap.vocabularies.Communication.v1.', '');
     return sId;
 }
-exports.removeNamespaces = removeNamespaces;
 /**
  * Method to replace namespaces with short hand form
  * @param {string } [sId]
  * @returns {string} modified string with replaced namespaces
  */
 function replaceNamespaces(sId) {
-    sId = sId.replace(ux_specification_types_2.UIVOCABULARY, 'UI');
+    sId = sId.replace(ux_specification_types_1.UIVOCABULARY, 'UI');
     sId = sId.replace('com.sap.vocabularies.Communication.v1', 'Communication');
     return sId;
 }
-exports.replaceNamespaces = replaceNamespaces;
 /**
  * Returns the message property if the error is an instance of `Error` else a string representation of the error.
  *
@@ -1238,5 +1243,4 @@ exports.replaceNamespaces = replaceNamespaces;
 function getErrorMessage(error) {
     return error instanceof Error ? error.message : String(error);
 }
-exports.getErrorMessage = getErrorMessage;
 //# sourceMappingURL=utils.js.map