@sap/ux-specification 1.84.95 → 1.84.97

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

@@ -3,14 +3,22 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.replaceNamespaces = exports.removeNamespaces = exports.updatePropertyIndices = exports.getErrorMessage = exports.getDefinitionKey = exports.convertActionKeyToStableId = exports.convertEnumToCSV = exports.arrayCombineMerge = exports.getNextTargetDefinition = exports.findMatchingKeysByAdditionalProperties = exports.generatePageId = exports.getSchemaFilePath = exports.deleteEmptyStructure = exports.getObjectPageFacetSection = exports.createDefaultSection = exports.addTargetTitleAndSectionDescription = exports.addSectionTitleAndDescription = exports.getTemplateTypeFromManifest = exports.determineV4Template = exports.determineV4PageTemplateType = exports.determineV2Template = exports.getVersionFromManifest = exports.getObjectPageFacets = exports.getObjectPageHeaderFacets = exports.getSchemaKeyOfLineItemRecord = exports.getManifestSectionByPathV4 = exports.getSectionFacet = exports.findAlias = exports.getPageTypeV4 = 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.replaceNamespaces = exports.removeNamespaces = exports.updatePropertyIndices = exports.getErrorMessage = exports.getDefinitionKey = exports.convertActionKeyToStableId = exports.convertEnumToCSV = exports.arrayCombineMerge = exports.getNextTargetDefinition = exports.findMatchingKeysByAdditionalProperties = exports.generatePageId = exports.getSchemaFilePath = exports.deleteEmptyStructure = exports.getObjectPageFacetSection = exports.createDefaultSection = exports.addTargetTitleAndSectionDescription = exports.addSectionTitleAndDescription = exports.getTemplateTypeFromManifest = exports.determineV4Template = exports.determineV4PageTemplateType = exports.determineV2Template = exports.getODataVersionFromManifest = exports.getMainService = exports.getFEVersionFromManifest = exports.getObjectPageFacets = exports.getObjectPageHeaderFacets = exports.getSchemaKeyOfLineItemRecord = exports.getManifestSectionByPathV4 = exports.getSectionFacet = exports.findAlias = exports.getPageTypeV4 = exports.getPageTypeV2 = exports.prepareRef = exports.getDataFieldDescription = exports.getLabelForDataField = exports.getLabelForPropertyPath = exports.evaluateCommonLabel = exports.getAnnotationPropertyValue = exports.parseAndMergeAndConvert = exports.createAnnotationPath = exports.arrayIncludes = exports.V4_LIBS = exports.V4_TEMPLATES = exports.DEFINITION_LINK_PREFIX = void 0;
 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");
 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
+];
+exports.V4_LIBS = ['sap.fe.core', 'sap.fe.templates'];
 const arrayIncludes = (arr, target) => target.every((v) => arr.includes(v));
 exports.arrayIncludes = arrayIncludes;
 /**
@@ -55,7 +63,8 @@ function parseAndMergeAndConvert(annotationFiles, logger) {
         });
     }
     if (parseResult.length > 0) {
-        converterOutput = (0, annotation_converter_1.convert)((0, edmx_parser_1.merge)(...parseResult));
+        const mergedParserResult = (0, edmx_parser_1.merge)(...parseResult);
+        converterOutput = (0, annotation_converter_1.convert)(mergedParserResult);
     }
     return converterOutput;
 }
@@ -245,7 +254,7 @@ exports.prepareRef = prepareRef;
  */
 function getPageTypeV2(name) {
     if (name) {
-        const templatePart = `${ux_specification_types_1.v2.FE_TEMPLATE_V2}.`;
+        const templatePart = `${ux_specification_types_2.v2.FE_TEMPLATE_V2}.`;
         return name.split(templatePart)[1];
     }
 }
@@ -255,14 +264,14 @@ exports.getPageTypeV2 = getPageTypeV2;
  * @param name - page component name
  */
 function getPageTypeV4(v4App) {
-    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}.`;
+    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}.`;
         return v4App.name.split(templatePart)[1];
     }
-    else if (v4App?.name === ux_specification_types_1.v4.FE_TEMPLATE_V4_CUSTOM_PAGE ||
+    else if (v4App?.name === ux_specification_types_2.v4.FE_TEMPLATE_V4_CUSTOM_PAGE ||
         v4App.viewId ||
         v4App.viewName) {
-        return ux_specification_types_1.PageTypeV4.CustomPage;
+        return ux_specification_types_2.PageTypeV4.CustomPage;
     }
 }
 exports.getPageTypeV4 = getPageTypeV4;
@@ -324,11 +333,11 @@ function adjustKey(key, navigationParts, keyForRelatedFacetKeys) {
         key = pathParts.join('::');
     }
     else {
-        key = uiClass.replace('@UI', `${!keyForRelatedFacetKeys ? '@' : ''}${ux_specification_types_1.UIVOCABULARY}`);
+        key = uiClass.replace('@UI', `${!keyForRelatedFacetKeys ? '@' : ''}${ux_specification_types_2.UIVOCABULARY}`);
     }
     return key;
 }
-function getKeyAndEntityTypeOfReferenceFacet(oDataServiceAVT, key, entityType, propertyValue, oDataVersion = ux_specification_types_1.FioriElementsVersion.v2, keyForRelatedFacetKeys = false) {
+function getKeyAndEntityTypeOfReferenceFacet(oDataServiceAVT, key, entityType, propertyValue, oDataVersion = ux_specification_types_2.FioriElementsVersion.v2, keyForRelatedFacetKeys = false) {
     let stopProcessing = false;
     let namespace;
     const navigationParts = propertyValue.split('/');
@@ -339,7 +348,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_1.FioriElementsVersion.v2 ? '::' : '#';
+        const separator = oDataVersion === ux_specification_types_2.FioriElementsVersion.v2 ? '::' : '#';
         key = getTargetAnnotationName(targetAnnotation, keyForRelatedFacetKeys).replace('#', separator);
         namespace = targetAnnotation.fullyQualifiedName?.split('@')[0];
     }
@@ -348,7 +357,7 @@ function getKeyAndEntityTypeOfReferenceFacet(oDataServiceAVT, key, entityType, p
         return { key, entityType, stopProcessing, namespace };
     }
     if (navigation) {
-        const navSeparator = oDataVersion === ux_specification_types_1.FioriElementsVersion.v2 ? '::' : '/';
+        const navSeparator = oDataVersion === ux_specification_types_2.FioriElementsVersion.v2 ? '::' : '/';
         navigationParts.pop();
         const navigationIDs = [...navigationParts].join(navSeparator);
         key = `${navigationIDs}${navSeparator}${key}`;
@@ -364,7 +373,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_1.FioriElementsVersion.v2, keyForRelatedFacetKeys = false) {
+function getSectionFacet(facetDefinition, sourceEntityType, oDataServiceAVT, logger, oDataVersion = ux_specification_types_2.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;
@@ -463,7 +472,7 @@ function getSchemaKeyOfLineItemRecord(lineItemRecord) {
                 schemaKey =
                     'DataFieldForAnnotation:::sTarget::' +
                         target
-                            .replace('@UI', `@${ux_specification_types_1.UIVOCABULARY}`)
+                            .replace('@UI', `@${ux_specification_types_2.UIVOCABULARY}`)
                             .replace('@Communication', '@com.sap.vocabularies.Communication.v1')
                             .replace('@Contact', '@com.sap.vocabularies.Contact.v1');
             }
@@ -559,20 +568,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_1.UIVOCABULARY, oDataServiceAVT);
+    const alias = findAlias(ux_specification_types_2.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_1.FacetBase.Chart };
+            facets[path] = { base: ux_specification_types_2.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_1.FacetBase.Identification };
+            facets[path] = { base: ux_specification_types_2.FacetBase.Identification };
             facets[path].target = annotationRecord?.Target?.$target;
             facets[path].entityType = targetEntityType;
             facets[path].namespace = section.namespace;
@@ -584,21 +593,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_1.FacetBase.LineItem };
+            facets[path] = { base: ux_specification_types_2.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_1.FacetBase.Form };
+            facets[path] = { base: ux_specification_types_2.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_1.FacetBase.DataPoint };
+            facets[path] = { base: ux_specification_types_2.FacetBase.DataPoint };
             facets[path].Label = annotationRecord?.Target?.$target['Title'];
             facets[path].target = annotationRecord?.Target?.$target;
             facets[path].entityType = targetEntityType;
@@ -606,32 +615,32 @@ function evaluateTargetAnnotation(section, annotationRecord, facets, entityType,
             break;
         }
         case "com.sap.vocabularies.UI.v1.PresentationVariant" /* UIAnnotationTerms.PresentationVariant */: {
-            facets[path] = { base: ux_specification_types_1.FacetBase.PresentationVariant };
+            facets[path] = { base: ux_specification_types_2.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_1.FacetBase.Contact };
+            facets[path] = { base: ux_specification_types_2.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_1.FacetBase.Address };
+            facets[path] = { base: ux_specification_types_2.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_1.FacetBase.Unknown };
+            facets[path] = { base: ux_specification_types_2.FacetBase.Unknown };
         }
     }
     if (facets[path]) {
-        facets[path].annotationPath = `/${annotationRecord.fullyQualifiedName.replace('@com.sap.vocabularies', ux_specification_types_1.VOCWITHSLASH)}`;
+        facets[path].annotationPath = `/${annotationRecord.fullyQualifiedName.replace('@com.sap.vocabularies', ux_specification_types_2.VOCWITHSLASH)}`;
         if (annotationRecord.Label) {
             facets[path].Label = annotationRecord.Label;
         }
@@ -654,7 +663,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_1.FioriElementsVersion.v2, logger) {
+function addFacetToConfig(annotationRecord, oDataServiceAVT, serviceName, entityType, facets, oDataVersion = ux_specification_types_2.FioriElementsVersion.v2, logger) {
     const section = getSectionFacet(annotationRecord, entityType, oDataServiceAVT, logger, oDataVersion, false);
     if (section) {
         switch (annotationRecord.$Type) {
@@ -665,14 +674,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_1.FacetBase.CollectionFacet,
+                    base: ux_specification_types_2.FacetBase.CollectionFacet,
                     facets: {},
                     ID: section.ID,
                     annotationPath: annotationPath,
                     Label: section.label,
                     namespace: section.namespace
                 });
-                if (!facet.ID && oDataVersion === ux_specification_types_1.FioriElementsVersion.v4) {
+                if (!facet.ID && oDataVersion === ux_specification_types_2.FioriElementsVersion.v4) {
                     (0, extensionLogger_1.log)(logger, {
                         severity: "error" /* LogSeverity.Error */,
                         message: i18next_1.default.t('NOID4SECTION', { facet: annotationRecord.fullyQualifiedName })
@@ -693,12 +702,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_1.FioriElementsVersion.v2, logger) {
+function getObjectPageHeaderFacets(entityType, oDataServiceAVT, oDataVersion = ux_specification_types_2.FioriElementsVersion.v2, logger) {
     const facets = {};
     if (!entityType || !entityType.annotations) {
         return;
     }
-    const alias = findAlias(ux_specification_types_1.UIVOCABULARY, oDataServiceAVT);
+    const alias = findAlias(ux_specification_types_2.UIVOCABULARY, oDataServiceAVT);
     const facetAnnotation = alias && entityType?.annotations?.[alias]?.HeaderFacets;
     if (facetAnnotation) {
         const lastDot = entityType && entityType.fullyQualifiedName.lastIndexOf('.');
@@ -718,12 +727,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_1.FioriElementsVersion.v2, logger) {
+function getObjectPageFacets(entityType, oDataServiceAVT, oDataVersion = ux_specification_types_2.FioriElementsVersion.v2, logger) {
     const facets = {};
     if (!entityType || !entityType.annotations) {
         return;
     }
-    const alias = findAlias(ux_specification_types_1.UIVOCABULARY, oDataServiceAVT);
+    const alias = findAlias(ux_specification_types_2.UIVOCABULARY, oDataServiceAVT);
     const facetAnnotation = alias && entityType?.annotations[alias]?.Facets;
     if (facetAnnotation) {
         const lastDot = entityType && entityType.fullyQualifiedName.lastIndexOf('.');
@@ -739,16 +748,58 @@ exports.getObjectPageFacets = getObjectPageFacets;
 /**
  * Returns the version of Fiori elements (v2/v4) from a given manifest
  * @param manifest - the manifest.json file
+ * @returns FioriElementsVersion
  */
-function getVersionFromManifest(manifest) {
-    if (manifest[ux_specification_types_1.ManifestSection.generic] || manifest[ux_specification_types_1.ManifestSection.ovp]) {
-        return ux_specification_types_1.FioriElementsVersion.v2;
+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;
     }
     else {
-        return ux_specification_types_1.FioriElementsVersion.v4;
+        const targets = manifest[ux_specification_types_2.ManifestSection.ui5]?.routing?.targets;
+        const libs = manifest[ux_specification_types_2.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;
+        }
+        else {
+            return undefined;
+        }
     }
 }
-exports.getVersionFromManifest = getVersionFromManifest;
+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.
+ * OVP: the main model needs to be read from the sap.ovp config and then the service can be derived.
+ *
+ * @param manifest - application 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
+        : '';
+    return typeof manifest?.[ux_specification_types_2.ManifestSection.ui5]?.models?.[model]?.dataSource === 'string'
+        ? manifest[ux_specification_types_2.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
+ * @returns the OData version
+ */
+function getODataVersionFromManifest(manifest) {
+    const mainService = getMainService(manifest);
+    if (!mainService) {
+        return ux_specification_types_1.OdataVersion.v2;
+    }
+    const dataSource = manifest[ux_specification_types_2.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
@@ -757,27 +808,27 @@ exports.getVersionFromManifest = getVersionFromManifest;
  */
 function determineV2Template(manifest, logger) {
     let templateType;
-    if (manifest[ux_specification_types_1.ManifestSection.generic]) {
-        const v2Pages = manifest[ux_specification_types_1.ManifestSection.generic].pages;
+    if (manifest[ux_specification_types_2.ManifestSection.generic]) {
+        const v2Pages = manifest[ux_specification_types_2.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_1.MANIFESTPATH,
-                    range: [ux_specification_types_1.ManifestSection.generic]
+                    path: ux_specification_types_2.MANIFESTPATH,
+                    range: [ux_specification_types_2.ManifestSection.generic]
                 }
             });
             return;
         }
         for (const pageKey in v2Pages) {
             const v2Page = v2Pages[pageKey];
-            if (getPageTypeV2(v2Page.component?.name) === ux_specification_types_1.PageTypeV2.AnalyticalListPage) {
-                templateType = ux_specification_types_1.TemplateType.AnalyticalListPageV2;
+            if (getPageTypeV2(v2Page.component?.name) === ux_specification_types_2.PageTypeV2.AnalyticalListPage) {
+                templateType = ux_specification_types_2.TemplateType.AnalyticalListPageV2;
                 break;
             }
-            else if (getPageTypeV2(v2Page.component?.name) === ux_specification_types_1.PageTypeV2.ListReport) {
-                templateType = ux_specification_types_1.TemplateType.ListReportObjectPageV2;
+            else if (getPageTypeV2(v2Page.component?.name) === ux_specification_types_2.PageTypeV2.ListReport) {
+                templateType = ux_specification_types_2.TemplateType.ListReportObjectPageV2;
                 break;
             }
         }
@@ -786,10 +837,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_1.ManifestSection.generic }),
+                message: i18next_1.default.t('NOTEMPLATE', { section: ux_specification_types_2.ManifestSection.generic }),
                 location: {
-                    path: ux_specification_types_1.MANIFESTPATH,
-                    range: [ux_specification_types_1.ManifestSection.generic]
+                    path: ux_specification_types_2.MANIFESTPATH,
+                    range: [ux_specification_types_2.ManifestSection.generic]
                 }
             });
         }
@@ -805,24 +856,24 @@ exports.determineV2Template = determineV2Template;
 function determineV4PageTemplateType(v4Page) {
     let templateType;
     const pageType = getPageTypeV4(v4Page);
-    if (pageType === ux_specification_types_1.PageTypeV4.AnalyticalListPage) {
-        templateType = ux_specification_types_1.TemplateType.AnalyticalListPageV4;
+    if (pageType === ux_specification_types_2.PageTypeV4.AnalyticalListPage) {
+        templateType = ux_specification_types_2.TemplateType.AnalyticalListPageV4;
     }
-    else if (pageType === ux_specification_types_1.PageTypeV4.ListReport) {
+    else if (pageType === ux_specification_types_2.PageTypeV4.ListReport) {
         const viewPath = v4Page.options?.settings?.views?.paths?.[0];
-        if (viewPath && (viewPath[ux_specification_types_1.ALPViewType.Primary] || viewPath[ux_specification_types_1.ALPViewType.Secondary])) {
-            templateType = ux_specification_types_1.TemplateType.AnalyticalListPageV4;
+        if (viewPath && (viewPath[ux_specification_types_2.ALPViewType.Primary] || viewPath[ux_specification_types_2.ALPViewType.Secondary])) {
+            templateType = ux_specification_types_2.TemplateType.AnalyticalListPageV4;
         }
         else {
-            templateType = ux_specification_types_1.TemplateType.ListReportObjectPageV4;
+            templateType = ux_specification_types_2.TemplateType.ListReportObjectPageV4;
         }
     }
-    else if (pageType === ux_specification_types_1.PageTypeV4.ObjectPage) {
-        templateType = ux_specification_types_1.TemplateType.ListReportObjectPageV4;
+    else if (pageType === ux_specification_types_2.PageTypeV4.ObjectPage) {
+        templateType = ux_specification_types_2.TemplateType.ListReportObjectPageV4;
         //fixed now for FEOP scenario, bit continue to check if LR/ALP exists
     }
-    else if (pageType === ux_specification_types_1.PageTypeV4.CustomPage) {
-        templateType = ux_specification_types_1.TemplateType.FreestylePageV4;
+    else if (pageType === ux_specification_types_2.PageTypeV4.CustomPage) {
+        templateType = ux_specification_types_2.TemplateType.FreestylePageV4;
     }
     return templateType;
 }
@@ -850,29 +901,29 @@ function determineV4TemplateFromPages(v4Pages) {
  * @returns {TemplateType} the template type
  */
 function determineV4Template(manifest, logger) {
-    const v4Pages = manifest[ux_specification_types_1.ManifestSection.ui5].routing &&
-        manifest[ux_specification_types_1.ManifestSection.ui5].routing.targets;
+    const v4Pages = manifest[ux_specification_types_2.ManifestSection.ui5].routing &&
+        manifest[ux_specification_types_2.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_1.MANIFESTPATH,
-                range: [ux_specification_types_1.ManifestSection.ui5, 'routing']
+                path: ux_specification_types_2.MANIFESTPATH,
+                range: [ux_specification_types_2.ManifestSection.ui5, 'routing']
             }
         });
-        return ux_specification_types_1.TemplateType.ListReportObjectPageV4;
+        return ux_specification_types_2.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_1.ManifestSection.ui5 }),
+            message: i18next_1.default.t('NOTEMPLATE', { section: ux_specification_types_2.ManifestSection.ui5 }),
             location: {
-                path: ux_specification_types_1.MANIFESTPATH,
-                range: [ux_specification_types_1.ManifestSection.ui5, 'routing', 'targets']
+                path: ux_specification_types_2.MANIFESTPATH,
+                range: [ux_specification_types_2.ManifestSection.ui5, 'routing', 'targets']
             }
         });
     }
@@ -888,26 +939,15 @@ exports.determineV4Template = determineV4Template;
  */
 function getTemplateTypeFromManifest(manifest, fioriElementsVersion, logger) {
     let templateType;
-    if (manifest[ux_specification_types_1.ManifestSection.ovp]) {
-        templateType = ux_specification_types_1.TemplateType.OverviewPageV2;
+    if (manifest[ux_specification_types_2.ManifestSection.ovp]) {
+        templateType = ux_specification_types_2.TemplateType.OverviewPageV2;
     }
-    else if (fioriElementsVersion === ux_specification_types_1.FioriElementsVersion.v2) {
+    else if (fioriElementsVersion === ux_specification_types_2.FioriElementsVersion.v2) {
         templateType = determineV2Template(manifest, logger);
     }
-    else if (fioriElementsVersion === ux_specification_types_1.FioriElementsVersion.v4) {
+    else if (fioriElementsVersion === ux_specification_types_2.FioriElementsVersion.v4) {
         templateType = determineV4Template(manifest, logger);
     }
-    else {
-        if (!templateType) {
-            (0, extensionLogger_1.log)(logger, {
-                severity: "error" /* LogSeverity.Error */,
-                message: i18next_1.default.t('NOFE'),
-                location: {
-                    path: ux_specification_types_1.MANIFESTPATH
-                }
-            });
-        }
-    }
     return templateType;
 }
 exports.getTemplateTypeFromManifest = getTemplateTypeFromManifest;
@@ -919,12 +959,12 @@ exports.getTemplateTypeFromManifest = getTemplateTypeFromManifest;
  */
 function addSectionTitleAndDescription(facet, section, facetKey) {
     if (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 }];
+        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 }];
     }
     else {
         section.title = facetKey.replace(/@com.sap/g, 'com.sap');
-        section[ux_specification_types_1.SchemaTag.keys] = [{ name: ux_specification_types_1.SchemaKeyName.id, value: facetKey.replace(ux_specification_types_1.UIVOCABULARYALPHADOT, '') }];
+        section[ux_specification_types_2.SchemaTag.keys] = [{ name: ux_specification_types_2.SchemaKeyName.id, value: facetKey.replace(ux_specification_types_2.UIVOCABULARYALPHADOT, '') }];
     }
     // Description
     if (facet?.Label) {
@@ -971,8 +1011,8 @@ function createDefaultSection(appSchema, facet, facetKey) {
         properties: {},
         additionalProperties: false
     };
-    section[ux_specification_types_1.SchemaTag.isViewNode] = true;
-    section[ux_specification_types_1.SchemaTag.annotationPath] = facet.annotationPath;
+    section[ux_specification_types_2.SchemaTag.isViewNode] = true;
+    section[ux_specification_types_2.SchemaTag.annotationPath] = facet.annotationPath;
     addTargetTitleAndSectionDescription(facet, section, facetKey);
     return section;
 }
@@ -986,8 +1026,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_1.FioriElementsVersion.v2, checkUnresolvableFacets = false) {
-    const alias = findAlias(ux_specification_types_1.UIVOCABULARY, oDataServiceAVT);
+function getObjectPageFacetSection(entityType, oDataServiceAVT, logger, oDataVersion = ux_specification_types_2.FioriElementsVersion.v2, checkUnresolvableFacets = false) {
+    const alias = findAlias(ux_specification_types_2.UIVOCABULARY, oDataServiceAVT);
     let sections = [];
     if (entityType) {
         const facetAnnotation = alias && entityType?.annotations?.[alias]?.Facets;
@@ -1053,8 +1093,8 @@ exports.deleteEmptyStructure = deleteEmptyStructure;
  * @return {string} File name of generic schema.
  */
 const getGenericSchemaFileName = (schemaType) => {
-    if (schemaType === ux_specification_types_1.SchemaType.FreestylePage) {
-        return ux_specification_types_1.PageTypeV2.CustomPage;
+    if (schemaType === ux_specification_types_2.SchemaType.FreestylePage) {
+        return ux_specification_types_2.PageTypeV2.CustomPage;
     }
     return `${schemaType}`;
 };
@@ -1071,20 +1111,20 @@ const getSchemaFilePath = (schemaType, entitySet) => {
     };
     switch (schemaType) {
         // Application schema
-        case ux_specification_types_1.SchemaType.Application: {
+        case ux_specification_types_2.SchemaType.Application: {
             // File name
             schemaFile.filename = `App`;
             // Full path
-            schemaFile.path = `./${ux_specification_types_1.DirName.Schemas}/${schemaFile.filename}`;
+            schemaFile.path = `./${ux_specification_types_2.DirName.Schemas}/${schemaFile.filename}`;
             break;
         }
         // List report and object page
-        case ux_specification_types_1.SchemaType.ListReport:
-        case ux_specification_types_1.SchemaType.ObjectPage: {
+        case ux_specification_types_2.SchemaType.ListReport:
+        case ux_specification_types_2.SchemaType.ObjectPage: {
             // File name
             schemaFile.filename = entitySet ? `${schemaType}_${entitySet}` : getGenericSchemaFileName(schemaType);
             // Full path
-            schemaFile.path = `../${ux_specification_types_1.DirName.Schemas}/${schemaFile.filename}`;
+            schemaFile.path = `../${ux_specification_types_2.DirName.Schemas}/${schemaFile.filename}`;
             break;
         }
         // Other page configs
@@ -1092,7 +1132,7 @@ const getSchemaFilePath = (schemaType, entitySet) => {
             // File name
             schemaFile.filename = getGenericSchemaFileName(schemaType);
             // Full path
-            schemaFile.path = `../${ux_specification_types_1.DirName.Schemas}/${schemaFile.filename}`;
+            schemaFile.path = `../${ux_specification_types_2.DirName.Schemas}/${schemaFile.filename}`;
             break;
         }
     }
@@ -1110,7 +1150,7 @@ exports.getSchemaFilePath = getSchemaFilePath;
  * @returns {string} Generated page id
  */
 function generatePageId(pageType, entitySet, viewId, pageName) {
-    if (pageType === ux_specification_types_1.PageTypeV2.CustomPage) {
+    if (pageType === ux_specification_types_2.PageTypeV2.CustomPage) {
         const names = viewId && viewId.split('.');
         return names && names[names.length - 1] + 'Page';
     }
@@ -1318,7 +1358,7 @@ exports.convertEnumToCSV = convertEnumToCSV;
  */
 function convertActionKeyToStableId(actionId) {
     if (!actionId) {
-        return;
+        return '';
     }
     return (actionId.indexOf('??') > -1 ? actionId.split('??')[1] : actionId).replace(/@/g, '::');
 }
@@ -1363,7 +1403,7 @@ exports.updatePropertyIndices = updatePropertyIndices;
  * @returns {string} modified string without namespace
  */
 function removeNamespaces(sId) {
-    sId = sId.replace(ux_specification_types_1.UIVOCABULARYDOT, '');
+    sId = sId.replace(ux_specification_types_2.UIVOCABULARYDOT, '');
     sId = sId.replace('com.sap.vocabularies.Communication.v1.', '');
     return sId;
 }
@@ -1374,7 +1414,7 @@ exports.removeNamespaces = removeNamespaces;
  * @returns {string} modified string with replaced namespaces
  */
 function replaceNamespaces(sId) {
-    sId = sId.replace(ux_specification_types_1.UIVOCABULARY, 'UI');
+    sId = sId.replace(ux_specification_types_2.UIVOCABULARY, 'UI');
     sId = sId.replace('com.sap.vocabularies.Communication.v1', 'Communication');
     return sId;
 }