@sap/ux-specification 1.84.99 → 1.84.101

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

@@ -39,7 +39,6 @@ exports.updatePropertyIndices = updatePropertyIndices;
 exports.removeNamespaces = removeNamespaces;
 exports.replaceNamespaces = replaceNamespaces;
 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");
@@ -47,10 +46,10 @@ const edmx_parser_1 = require("@sap-ux/edmx-parser");
 const extensionLogger_1 = require("../../extensionLogger");
 exports.DEFINITION_LINK_PREFIX = '#/definitions/';
 exports.V4_TEMPLATES = [
-    ux_specification_types_2.v4.FE_TEMPLATE_V4_LIST_REPORT,
-    ux_specification_types_2.v4.FE_TEMPLATE_V4_ALP,
-    ux_specification_types_2.v4.FE_TEMPLATE_V4_OBJECT_PAGE,
-    ux_specification_types_2.v4.FE_TEMPLATE_V4_CUSTOM_PAGE
+    ux_specification_types_1.v4.FE_TEMPLATE_V4_LIST_REPORT,
+    ux_specification_types_1.v4.FE_TEMPLATE_V4_ALP,
+    ux_specification_types_1.v4.FE_TEMPLATE_V4_OBJECT_PAGE,
+    ux_specification_types_1.v4.FE_TEMPLATE_V4_CUSTOM_PAGE
 ];
 exports.V4_LIBS = ['sap.fe.core', 'sap.fe.templates'];
 const arrayIncludes = (arr, target) => target.every((v) => arr.includes(v));
@@ -264,7 +263,7 @@ function getDataFieldDescription(dataFieldAbstract, entityType) {
         }
         return title;
     }
-    catch (error) {
+    catch {
         return title;
     }
 }
@@ -273,6 +272,7 @@ function getDataFieldDescription(dataFieldAbstract, entityType) {
  * @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');
 }
@@ -282,7 +282,7 @@ function prepareRef(refInput) {
  */
 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];
     }
 }
@@ -291,14 +291,14 @@ function getPageTypeV2(name) {
  * @param name - page component name
  */
 function getPageTypeV4(v4App) {
-    if (v4App.name && v4App.name !== ux_specification_types_2.v4.FE_TEMPLATE_V4_CUSTOM_PAGE) {
-        const templatePart = `${ux_specification_types_2.v4.FE_TEMPLATE_V4}.`;
+    if (v4App.name && v4App.name !== ux_specification_types_1.v4.FE_TEMPLATE_V4_CUSTOM_PAGE) {
+        const templatePart = `${ux_specification_types_1.v4.FE_TEMPLATE_V4}.`;
         return v4App.name.split(templatePart)[1];
     }
-    else if (v4App?.name === ux_specification_types_2.v4.FE_TEMPLATE_V4_CUSTOM_PAGE ||
+    else if (v4App?.name === ux_specification_types_1.v4.FE_TEMPLATE_V4_CUSTOM_PAGE ||
         v4App.viewId ||
         v4App.viewName) {
-        return ux_specification_types_2.PageTypeV4.CustomPage;
+        return ux_specification_types_1.PageTypeV4.CustomPage;
     }
 }
 function getTargetAnnotationName(targetAnnotation, keyForRelatedFacetKeys = false) {
@@ -358,11 +358,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('/');
@@ -373,7 +373,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];
     }
@@ -382,7 +382,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}`;
@@ -398,7 +398,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;
@@ -496,7 +496,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');
             }
@@ -591,20 +591,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;
@@ -616,21 +616,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;
@@ -638,32 +638,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;
         }
@@ -686,7 +686,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) {
@@ -697,14 +697,14 @@ 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,
                     Label: section.label,
                     namespace: section.namespace
                 });
-                if (!facet.ID && oDataVersion === ux_specification_types_2.FioriElementsVersion.v4) {
+                if (!facet.ID && oDataVersion === ux_specification_types_1.FioriElementsVersion.v4) {
                     (0, extensionLogger_1.log)(logger, {
                         severity: "error" /* LogSeverity.Error */,
                         message: i18next_1.default.t('NOID4SECTION', { facet: annotationRecord.fullyQualifiedName })
@@ -725,12 +725,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('.');
@@ -749,12 +749,12 @@ function getObjectPageHeaderFacets(entityType, oDataServiceAVT, oDataVersion = u
  * @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('.');
@@ -772,17 +772,17 @@ function getObjectPageFacets(entityType, oDataServiceAVT, oDataVersion = ux_spec
  * @returns FioriElementsVersion
  */
 function getFEVersionFromManifest(manifest) {
-    if ((manifest[ux_specification_types_2.ManifestSection.generic] && Object.keys(manifest[ux_specification_types_2.ManifestSection.generic]).length > 0) ||
-        (manifest[ux_specification_types_2.ManifestSection.ovp] && Object.keys(manifest[ux_specification_types_2.ManifestSection.ovp]).length > 0)) {
-        return ux_specification_types_2.FioriElementsVersion.v2;
+    if ((manifest[ux_specification_types_1.ManifestSection.generic] && Object.keys(manifest[ux_specification_types_1.ManifestSection.generic]).length > 0) ||
+        (manifest[ux_specification_types_1.ManifestSection.ovp] && Object.keys(manifest[ux_specification_types_1.ManifestSection.ovp]).length > 0)) {
+        return ux_specification_types_1.FioriElementsVersion.v2;
     }
     else {
-        const targets = manifest[ux_specification_types_2.ManifestSection.ui5]?.routing?.targets;
-        const libs = manifest[ux_specification_types_2.ManifestSection.ui5]?.dependencies?.libs;
+        const targets = manifest[ux_specification_types_1.ManifestSection.ui5]?.routing?.targets;
+        const libs = manifest[ux_specification_types_1.ManifestSection.ui5]?.dependencies?.libs;
         if ((targets &&
             Object.keys(targets).find((targetKey) => exports.V4_TEMPLATES.indexOf(targets[targetKey].name) > -1)) ||
             (libs && Object.keys(libs).find((lib) => exports.V4_LIBS.indexOf(lib) > -1))) {
-            return ux_specification_types_2.FioriElementsVersion.v4;
+            return ux_specification_types_1.FioriElementsVersion.v4;
         }
         else {
             return undefined;
@@ -798,11 +798,11 @@ function getFEVersionFromManifest(manifest) {
  * @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;
 }
 /**
@@ -815,7 +815,7 @@ 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;
 }
 /**
@@ -826,27 +826,27 @@ function getODataVersionFromManifest(manifest) {
  */
 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;
             }
         }
@@ -855,10 +855,10 @@ 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]
                 }
             });
         }
@@ -873,24 +873,24 @@ function determineV2Template(manifest, logger) {
 function determineV4PageTemplateType(v4Page) {
     let templateType;
     const pageType = getPageTypeV4(v4Page);
-    if (pageType === ux_specification_types_2.PageTypeV4.AnalyticalListPage) {
-        templateType = ux_specification_types_2.TemplateType.AnalyticalListPageV4;
+    if (pageType === ux_specification_types_1.PageTypeV4.AnalyticalListPage) {
+        templateType = ux_specification_types_1.TemplateType.AnalyticalListPageV4;
     }
-    else if (pageType === ux_specification_types_2.PageTypeV4.ListReport) {
+    else if (pageType === ux_specification_types_1.PageTypeV4.ListReport) {
         const viewPath = v4Page.options?.settings?.views?.paths?.[0];
-        if (viewPath && (viewPath[ux_specification_types_2.ALPViewType.Primary] || viewPath[ux_specification_types_2.ALPViewType.Secondary])) {
-            templateType = ux_specification_types_2.TemplateType.AnalyticalListPageV4;
+        if (viewPath && (viewPath[ux_specification_types_1.ALPViewType.Primary] || viewPath[ux_specification_types_1.ALPViewType.Secondary])) {
+            templateType = ux_specification_types_1.TemplateType.AnalyticalListPageV4;
         }
         else {
-            templateType = ux_specification_types_2.TemplateType.ListReportObjectPageV4;
+            templateType = ux_specification_types_1.TemplateType.ListReportObjectPageV4;
         }
     }
-    else if (pageType === ux_specification_types_2.PageTypeV4.ObjectPage) {
-        templateType = ux_specification_types_2.TemplateType.ListReportObjectPageV4;
+    else if (pageType === ux_specification_types_1.PageTypeV4.ObjectPage) {
+        templateType = ux_specification_types_1.TemplateType.ListReportObjectPageV4;
         //fixed now for FEOP scenario, bit continue to check if LR/ALP exists
     }
-    else if (pageType === ux_specification_types_2.PageTypeV4.CustomPage) {
-        templateType = ux_specification_types_2.TemplateType.FreestylePageV4;
+    else if (pageType === ux_specification_types_1.PageTypeV4.CustomPage) {
+        templateType = ux_specification_types_1.TemplateType.FreestylePageV4;
     }
     return templateType;
 }
@@ -917,29 +917,29 @@ function determineV4TemplateFromPages(v4Pages) {
  * @returns {TemplateType} the template type
  */
 function determineV4Template(manifest, logger) {
-    const v4Pages = manifest[ux_specification_types_2.ManifestSection.ui5].routing &&
-        manifest[ux_specification_types_2.ManifestSection.ui5].routing.targets;
+    const v4Pages = manifest[ux_specification_types_1.ManifestSection.ui5].routing &&
+        manifest[ux_specification_types_1.ManifestSection.ui5].routing.targets;
     // if there are no pages in routing targets, we use LROPV4 as default template type
     if (!v4Pages || Object.keys(v4Pages).length === 0) {
         (0, extensionLogger_1.log)(logger, {
             severity: "info" /* LogSeverity.Info */,
             message: i18next_1.default.t('NOPAGES', { appId: manifest['sap.app']['id'] }),
             location: {
-                path: ux_specification_types_2.MANIFESTPATH,
-                range: [ux_specification_types_2.ManifestSection.ui5, 'routing']
+                path: ux_specification_types_1.MANIFESTPATH,
+                range: [ux_specification_types_1.ManifestSection.ui5, 'routing']
             }
         });
-        return ux_specification_types_2.TemplateType.ListReportObjectPageV4;
+        return ux_specification_types_1.TemplateType.ListReportObjectPageV4;
     }
     // else try to determine template type from routing targets
     const templateType = determineV4TemplateFromPages(v4Pages);
     if (!templateType) {
         (0, extensionLogger_1.log)(logger, {
             severity: "error" /* LogSeverity.Error */,
-            message: i18next_1.default.t('NOTEMPLATE', { section: ux_specification_types_2.ManifestSection.ui5 }),
+            message: i18next_1.default.t('NOTEMPLATE', { section: ux_specification_types_1.ManifestSection.ui5 }),
             location: {
-                path: ux_specification_types_2.MANIFESTPATH,
-                range: [ux_specification_types_2.ManifestSection.ui5, 'routing', 'targets']
+                path: ux_specification_types_1.MANIFESTPATH,
+                range: [ux_specification_types_1.ManifestSection.ui5, 'routing', 'targets']
             }
         });
     }
@@ -954,13 +954,13 @@ function determineV4Template(manifest, logger) {
  */
 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);
     }
-    else if (fioriElementsVersion === ux_specification_types_2.FioriElementsVersion.v4) {
+    else if (fioriElementsVersion === ux_specification_types_1.FioriElementsVersion.v4) {
         templateType = determineV4Template(manifest, logger);
     }
     return templateType;
@@ -973,12 +973,12 @@ function getTemplateTypeFromManifest(manifest, fioriElementsVersion, logger) {
  */
 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) {
@@ -1023,8 +1023,8 @@ 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;
 }
@@ -1037,8 +1037,8 @@ function createDefaultSection(appSchema, facet, facetKey) {
  * @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;
@@ -1074,11 +1074,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
@@ -1103,8 +1108,8 @@ exports.deleteEmptyStructure = deleteEmptyStructure;
  * @return {string} File name of generic schema.
  */
 const getGenericSchemaFileName = (schemaType) => {
-    if (schemaType === ux_specification_types_2.SchemaType.FreestylePage) {
-        return ux_specification_types_2.PageTypeV2.CustomPage;
+    if (schemaType === ux_specification_types_1.SchemaType.FreestylePage) {
+        return ux_specification_types_1.PageTypeV2.CustomPage;
     }
     return `${schemaType}`;
 };
@@ -1121,20 +1126,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
@@ -1142,7 +1147,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;
         }
     }
@@ -1160,7 +1165,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';
     }
@@ -1267,7 +1272,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;
         }
@@ -1405,7 +1409,7 @@ function updatePropertyIndices(schema, order) {
  * @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;
 }
@@ -1415,7 +1419,7 @@ function removeNamespaces(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;
 }