@sap/ux-specification 1.90.9 → 1.90.13

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

@@ -9,6 +9,7 @@ const edmx_parser_1 = require("@sap-ux/edmx-parser");
 const common_1 = require("../../specification/common");
 const schemaAccess_1 = require("../../specification/schemaAccess");
 const i18next_1 = __importDefault(require("i18next"));
+const v2_1 = require("../../specification/v2");
 const v4_1 = require("../../specification/v4");
 const extensionLogger_1 = require("../../extensionLogger");
 const deepmerge_1 = __importDefault(require("deepmerge"));
@@ -16,7 +17,6 @@ var TemplateType;
 (function (TemplateType) {
     TemplateType["ListReportObjectPageV2"] = "ListReportObjectPageV2";
     TemplateType["ListReportObjectPageV4"] = "ListReportObjectPageV4";
-    TemplateType["FormPageV4"] = "FormPageV4";
     TemplateType["OverviewPageV2"] = "OverviewPageV2";
     TemplateType["AnalyticalListPageV2"] = "AnalyticalListPageV2";
     TemplateType["AnalyticalListPageV4"] = "AnalyticalListPageV4";
@@ -84,11 +84,12 @@ function evaluateCommonLabel(annotations, entityType, label) {
         }
         else if (annotations.Common.Label['type'] === 'Path') {
             const targetProperty = entityType.resolvePath(annotations.Common.Label['path']);
-            label = targetProperty.value
-                ? targetProperty.value
-                : typeof ((_b = targetProperty.Common) === null || _b === void 0 ? void 0 : _b.Label) === 'string'
-                    ? targetProperty.annotations.Common.Label
-                    : label;
+            if (targetProperty.value) {
+                label = targetProperty.value;
+            }
+            else if (typeof ((_b = targetProperty.Common) === null || _b === void 0 ? void 0 : _b.Label) === 'string') {
+                label = targetProperty.annotations.Common.Label;
+            }
         }
         else if (typeof ((_d = (_c = annotations.Common) === null || _c === void 0 ? void 0 : _c.Label) === null || _d === void 0 ? void 0 : _d.toString()) === 'string') {
             label = annotations.Common.Label.toString();
@@ -105,7 +106,9 @@ exports.evaluateCommonLabel = evaluateCommonLabel;
  */
 function getLabelForPropertyPath(propertyPath, entityType) {
     let label = propertyPath.value;
-    label = evaluateCommonLabel(propertyPath.$target.annotations, entityType, label);
+    if (propertyPath.$target) {
+        label = evaluateCommonLabel(propertyPath.$target.annotations, entityType, label);
+    }
     return label;
 }
 exports.getLabelForPropertyPath = getLabelForPropertyPath;
@@ -166,6 +169,12 @@ function getLabel(dataFieldLabel, entityType) {
         return undefined;
     }
 }
+function getTitleForDataField(dataField, entityType, dataFieldLabel) {
+    const propertyCommonLabel = getLabelForDataField(dataField, entityType);
+    return (dataFieldLabel ||
+        propertyCommonLabel ||
+        (dataField.Value.$target ? dataField.Value.$target.name : dataField.Value.value || dataField.Value.path));
+}
 /**
  * Determines the description of a data field, e.g. for the column header
  * @param dataFieldAbstract - the given record of the line item annotation
@@ -177,13 +186,7 @@ function getDatafieldDescription(dataFieldAbstract, entityType) {
     switch (dataFieldAbstract.$Type) {
         case "com.sap.vocabularies.UI.v1.DataField" /* DataField */:
             dataField = dataFieldAbstract;
-            propertyCommonLabel = getLabelForDataField(dataFieldAbstract, entityType);
-            title =
-                dataFieldLabel ||
-                    propertyCommonLabel ||
-                    (dataField.Value.$target
-                        ? dataField.Value.$target.name
-                        : dataField.Value.value || dataField.Value.path);
+            title = getTitleForDataField(dataField, entityType, dataFieldLabel);
             break;
         case "com.sap.vocabularies.UI.v1.DataFieldWithUrl" /* DataFieldWithUrl */:
             dataField = dataFieldAbstract;
@@ -215,13 +218,7 @@ function getDatafieldDescription(dataFieldAbstract, entityType) {
             break;
         case "com.sap.vocabularies.UI.v1.DataFieldWithNavigationPath" /* DataFieldWithNavigationPath */:
             dataField = dataFieldAbstract;
-            propertyCommonLabel = getLabelForDataField(dataFieldAbstract, entityType);
-            title =
-                dataFieldLabel ||
-                    propertyCommonLabel ||
-                    (dataField.Value.$target
-                        ? dataField.Value.$target.name
-                        : dataField.Value.value || dataField.Value.path);
+            title = getTitleForDataField(dataField, entityType, dataFieldLabel);
             break;
         default:
             break;
@@ -235,7 +232,8 @@ exports.getDatafieldDescription = getDatafieldDescription;
  */
 function getPageTypeV2(name) {
     if (name) {
-        return name.split('sap.suite.ui.generic.template.')[1];
+        const templatePart = `${v2_1.FE_TEMPLATE_V2}.`;
+        return name.split(templatePart)[1];
     }
 }
 exports.getPageTypeV2 = getPageTypeV2;
@@ -245,7 +243,8 @@ exports.getPageTypeV2 = getPageTypeV2;
  */
 function getPageTypeV4(name) {
     if (name) {
-        return name.split('sap.fe.templates.')[1];
+        const templatePart = `${v4_1.FE_TEMPLATE_V4}.`;
+        return name.split(templatePart)[1];
     }
 }
 exports.getPageTypeV4 = getPageTypeV4;
@@ -276,6 +275,38 @@ function findAlias(namespace, oDataServiceAVT) {
     return aliasReference === null || aliasReference === void 0 ? void 0 : aliasReference.alias;
 }
 exports.findAlias = findAlias;
+/**
+ * Determines the target annotation
+ * @param navigationParts - parts of the target annotation path
+ * @param entityType - entity type
+ * @param {ConverterOutput} oDataServiceAVT - complete service information, as returned by annotation vocabularies tool
+ * @returns the target annotation
+ */
+function determineTargetAnnotation(navigationParts, entityType, oDataServiceAVT) {
+    var _a;
+    const lastNavigationPart = navigationParts[navigationParts.length - 1];
+    const annotation = lastNavigationPart.substring(lastNavigationPart.lastIndexOf('.') + 1, lastNavigationPart.length);
+    const alias = findAlias(lastNavigationPart.substring(0, lastNavigationPart.lastIndexOf('.')).replace('@', ''), oDataServiceAVT);
+    return (_a = entityType === null || entityType === void 0 ? void 0 : entityType.annotations[alias]) === null || _a === void 0 ? void 0 : _a[annotation];
+}
+/**
+ * Adjust key by considering navigation
+ * @param key - given key
+ * @param keyForRelatedFacetKeys - construct key for 'keyForRelatedFacetKeys' property(used to define custom sections) - we should not add '@' symbol there.
+ * @param navigationParts - parts of the target annotation path
+ */
+function adjustKey(key, navigationParts, keyForRelatedFacetKeys) {
+    const uiParts = (navigationParts[1] || navigationParts[0]).split('#');
+    const uiClass = uiParts[0];
+    if (uiClass.includes('.LineItem')) {
+        const pathParts = key.split('::');
+        pathParts[pathParts.length - 1] = `${!keyForRelatedFacetKeys ? '@' : ''}${"com.sap.vocabularies.UI.v1.LineItem" /* LineItem */}`;
+        key = pathParts.join('::');
+    }
+    else {
+        key = uiClass.replace('@UI', `${!keyForRelatedFacetKeys ? '@' : ''}com.sap.vocabularies.UI.v1`);
+    }
+}
 /**
  * Resolve page section(get key and label->description).
  * @param facetDefinition - the actual annotation record
@@ -285,12 +316,12 @@ exports.findAlias = findAlias;
  * @param {ExtensionLogger} logger - Logger class for logging messages
  * @returns {FacetSection} - object comprising the relevant facet information
  */
-function getSectionFacet(facetDefinition, keyForRelatedFacetKeys = false, oDataVersion = common_1.FioriElementsVersion.v2, sourceEntityType, oDataServiceAVT, logger) {
-    var _a, _b;
-    let entityType = sourceEntityType; //default
-    const facetName = facetDefinition.fullyQualifiedName.substr(facetDefinition.fullyQualifiedName.lastIndexOf('@'));
+function getSectionFacet(facetDefinition, sourceEntityType, oDataServiceAVT, logger, oDataVersion = common_1.FioriElementsVersion.v2, keyForRelatedFacetKeys = false) {
+    var _a;
     //Take facet ID as fallback
+    const facetName = facetDefinition.fullyQualifiedName.substr(facetDefinition.fullyQualifiedName.lastIndexOf('@'));
     let key = facetDefinition.ID ? facetDefinition.ID.toString() : facetName;
+    let entityType = sourceEntityType; //default
     //If reference facet: overwrite with target annotation if present
     if (facetDefinition.$Type !== 'com.sap.vocabularies.UI.v1.CollectionFacet' && 'Target' in facetDefinition) {
         const propertyValue = exports.getAnnotationPropertyValue(facetDefinition.Target);
@@ -301,34 +332,22 @@ function getSectionFacet(facetDefinition, keyForRelatedFacetKeys = false, oDataV
             });
             return;
         }
-        const navSeparator = oDataVersion === common_1.FioriElementsVersion.v2 ? '::' : '/';
-        const separator = oDataVersion === common_1.FioriElementsVersion.v2 ? '::' : '#';
         const navigationParts = propertyValue.split('/');
         const navigation = navigationParts.length > 1 ? navigationParts[0] : '';
         if (navigation) {
             entityType = (_a = sourceEntityType.resolvePath(navigation)) === null || _a === void 0 ? void 0 : _a.targetType;
         }
-        const uiParts = (navigationParts[1] || navigationParts[0]).split('#');
-        const uiClass = uiParts[0];
-        if (uiClass.includes('.LineItem')) {
-            const pathParts = key.split('::');
-            pathParts[pathParts.length - 1] = `${!keyForRelatedFacetKeys ? '@' : ''}com.sap.vocabularies.UI.v1.LineItem`;
-            key = pathParts.join('::');
-        }
-        else {
-            key = uiClass.replace('@UI', `${!keyForRelatedFacetKeys ? '@' : ''}com.sap.vocabularies.UI.v1`);
-        }
-        const lastNavigationPart = navigationParts[navigationParts.length - 1];
-        const annotation = lastNavigationPart.substring(lastNavigationPart.lastIndexOf('.') + 1, lastNavigationPart.length);
-        const alias = findAlias(lastNavigationPart.substring(0, lastNavigationPart.lastIndexOf('.')).replace('@', ''), oDataServiceAVT);
-        const targetAnnotation = (_b = entityType === null || entityType === void 0 ? void 0 : entityType.annotations[alias]) === null || _b === void 0 ? void 0 : _b[annotation];
+        adjustKey(key, navigationParts, keyForRelatedFacetKeys);
+        const targetAnnotation = determineTargetAnnotation(navigationParts, entityType, oDataServiceAVT);
         if (targetAnnotation) {
+            const separator = oDataVersion === common_1.FioriElementsVersion.v2 ? '::' : '#';
             key = getTargetAnnotationName(targetAnnotation, keyForRelatedFacetKeys).replace('#', separator);
         }
         else {
             return undefined;
         }
         if (navigation) {
+            const navSeparator = oDataVersion === common_1.FioriElementsVersion.v2 ? '::' : '/';
             key = `${navigation}${navSeparator}${key}`;
         }
     }
@@ -425,69 +444,58 @@ exports.getSchemaKeyOfLineItemRecord = getSchemaKeyOfLineItemRecord;
  * @param {FioriElementsVersion} oDataVersion - OData version
  * @param {ExtensionLogger} logger - Logger class for logging messages
  */
-function evaluateTargetAnnotation(annotationRecord, facets, entityType, oDataServiceAVT, oDataVersion = common_1.FioriElementsVersion.v2, logger) {
+function evaluateTargetAnnotation(section, annotationRecord, facets, entityType, oDataServiceAVT, oDataVersion = common_1.FioriElementsVersion.v2, logger) {
     var _a, _b, _c, _d, _e;
-    const alias = findAlias('com.sap.vocabularies.UI.v1', oDataServiceAVT);
-    const section = getSectionFacet(annotationRecord, false, oDataVersion, entityType, oDataServiceAVT, logger);
-    if (!section) {
-        return;
-    }
+    const alias = findAlias(types_1.UIVOCABULARY, oDataServiceAVT);
     let path = section ? section.key : '';
     const targetEntityType = section.entityType;
-    let version, annotation, targetAnnotation;
-    let scope = alias;
-    if (path.includes('com.sap.vocabularies.UI.v1.Chart') || path.includes(alias + '.Chart')) {
+    let annotation, targetAnnotation;
+    if (path.includes("com.sap.vocabularies.UI.v1.Chart" /* Chart */) || path.includes(alias + '.Chart')) {
         facets[path] = { base: types_1.FacetBase.Chart };
         facets[path]['entityType'] = targetEntityType;
     }
-    else if (path.includes('com.sap.vocabularies.UI.v1.Identification') || path.includes(alias + '.Identification')) {
+    else if (path.includes("com.sap.vocabularies.UI.v1.Identification" /* Identification */) || path.includes(alias + '.Identification')) {
         annotation = path.split('.')[path.split('.').length - 1];
-        targetAnnotation = targetEntityType.annotations[scope][annotation];
+        targetAnnotation = targetEntityType.annotations[alias][annotation];
         facets[path] = { base: types_1.FacetBase.Identification };
         facets[path]['entityType'] = targetEntityType;
         facets[path]['target'] = targetAnnotation;
     }
-    else if (path.includes('com.sap.vocabularies.UI.v1.LineItem') || path.includes(alias + '.LineItem')) {
-        if (entityType) {
-            if (path.includes('com.sap.vocabularies.UI.v1.LineItem')) {
-                [scope, version, annotation] = path.split('com.sap.vocabularies.')[1].split('.');
-            }
-            else if (path.includes('.LineItem')) {
-                annotation = 'LineItem';
-                const pathParts = path.split('::');
-                pathParts[pathParts.length - 1] = '@com.sap.vocabularies.UI.v1.LineItem';
-                path = pathParts.join('::');
-            }
-            facets[path] = { base: types_1.FacetBase.LineItem };
-            facets[path]['lineItem'] = (_a = annotationRecord === null || annotationRecord === void 0 ? void 0 : annotationRecord.Target) === null || _a === void 0 ? void 0 : _a.$target;
-            facets[path]['entityType'] = targetEntityType;
+    else if (entityType && (path.includes("com.sap.vocabularies.UI.v1.LineItem" /* LineItem */) || path.includes(alias + '.LineItem'))) {
+        if (!path.includes("com.sap.vocabularies.UI.v1.LineItem" /* LineItem */) && path.includes('.LineItem')) {
+            const pathParts = path.split('::');
+            pathParts[pathParts.length - 1] = `@${"com.sap.vocabularies.UI.v1.LineItem" /* LineItem */}`;
+            path = pathParts.join('::');
         }
+        facets[path] = { base: types_1.FacetBase.LineItem };
+        facets[path].target = (_a = annotationRecord === null || annotationRecord === void 0 ? void 0 : annotationRecord.Target) === null || _a === void 0 ? void 0 : _a.$target;
+        facets[path].entityType = targetEntityType;
     }
-    else if (path.includes('com.sap.vocabularies.UI.v1.FieldGroup') || path.includes(alias + '.FieldGroup')) {
+    else if (path.includes("com.sap.vocabularies.UI.v1.FieldGroup" /* FieldGroup */) || path.includes(alias + '.FieldGroup')) {
         facets[path] = { base: types_1.FacetBase.Form };
-        facets[path]['target'] = (_b = annotationRecord === null || annotationRecord === void 0 ? void 0 : annotationRecord.Target) === null || _b === void 0 ? void 0 : _b.$target;
-        facets[path]['entityType'] = targetEntityType;
+        facets[path].target = (_b = annotationRecord === null || annotationRecord === void 0 ? void 0 : annotationRecord.Target) === null || _b === void 0 ? void 0 : _b.$target;
+        facets[path].entityType = targetEntityType;
     }
-    else if (path.includes('com.sap.vocabularies.UI.v1.DataPoint') || path.includes(alias + '.DataPoint')) {
+    else if (path.includes("com.sap.vocabularies.UI.v1.DataPoint" /* DataPoint */) || path.includes(alias + '.DataPoint')) {
         facets[path] = { base: types_1.FacetBase.DataPoint };
         facets[path].target = (_c = annotationRecord === null || annotationRecord === void 0 ? void 0 : annotationRecord.Target) === null || _c === void 0 ? void 0 : _c.$target;
-        facets[path]['entityType'] = targetEntityType;
+        facets[path].entityType = targetEntityType;
     }
     else if (path.includes('com.sap.vocabularies.Communication.v1.Contact') || path.includes(alias + '.Contact')) {
         facets[path] = { base: types_1.FacetBase.Contact };
         facets[path].target = (_d = annotationRecord === null || annotationRecord === void 0 ? void 0 : annotationRecord.Target) === null || _d === void 0 ? void 0 : _d.$target;
-        facets[path]['entityType'] = targetEntityType;
+        facets[path].entityType = targetEntityType;
     }
     else if (path.includes('com.sap.vocabularies.Communication.v1.Address') || path.includes(alias + '.Address')) {
         facets[path] = { base: types_1.FacetBase.Address };
         facets[path].target = (_e = annotationRecord === null || annotationRecord === void 0 ? void 0 : annotationRecord.Target) === null || _e === void 0 ? void 0 : _e.$target;
-        facets[path]['entityType'] = targetEntityType;
+        facets[path].entityType = targetEntityType;
     }
     else {
         facets[path] = { base: types_1.FacetBase.Unknown };
     }
     if (facets[path]) {
-        facets[path].annotationPath = `/${annotationRecord.fullyQualifiedName.replace('@com.sap.vocabularies', '/@com.sap.vocabularies')}`;
+        facets[path].annotationPath = `/${annotationRecord.fullyQualifiedName.replace('@com.sap.vocabularies', types_1.VOCWITHSLASH)}`;
         if (annotationRecord.Label) {
             facets[path].Label = annotationRecord.Label;
         }
@@ -518,14 +526,14 @@ function evaluateTargetAnnotation(annotationRecord, facets, entityType, oDataSer
  */
 function addFacetToConfig(annotationRecord, oDataServiceAVT, serviceName, entityType, facets, oDataVersion = common_1.FioriElementsVersion.v2, logger) {
     var _a;
-    switch (annotationRecord.$Type) {
-        case "com.sap.vocabularies.UI.v1.ReferenceFacet" /* ReferenceFacet */: {
-            evaluateTargetAnnotation(annotationRecord, facets, entityType, oDataServiceAVT, oDataVersion, logger);
-            break;
-        }
-        case "com.sap.vocabularies.UI.v1.CollectionFacet" /* CollectionFacet */: {
-            const section = getSectionFacet(annotationRecord, false, oDataVersion, entityType, oDataServiceAVT, logger);
-            if (section) {
+    const section = getSectionFacet(annotationRecord, entityType, oDataServiceAVT, logger, oDataVersion, false);
+    if (section) {
+        switch (annotationRecord.$Type) {
+            case "com.sap.vocabularies.UI.v1.ReferenceFacet" /* ReferenceFacet */: {
+                evaluateTargetAnnotation(section, annotationRecord, facets, entityType, oDataServiceAVT, oDataVersion, logger);
+                break;
+            }
+            case "com.sap.vocabularies.UI.v1.CollectionFacet" /* CollectionFacet */: {
                 const annotationPath = `/${entityType.fullyQualifiedName}/${annotationRecord.fullyQualifiedName.split(entityType.fullyQualifiedName)[1]}`;
                 const facet = (facets[section.key] = {
                     base: types_1.FacetBase.CollectionFacet,
@@ -537,8 +545,8 @@ function addFacetToConfig(annotationRecord, oDataServiceAVT, serviceName, entity
                 (_a = annotationRecord.Facets) === null || _a === void 0 ? void 0 : _a.forEach((collectionItem) => {
                     addFacetToConfig(collectionItem, oDataServiceAVT, serviceName, entityType, facet.facets, oDataVersion, logger);
                 });
+                break;
             }
-            break;
         }
     }
 }
@@ -554,7 +562,7 @@ function getObjectPageHeaderFacets(entityType, oDataServiceAVT, oDataVersion = c
     if (!entityType || !entityType.annotations) {
         return;
     }
-    const alias = findAlias('com.sap.vocabularies.UI.v1', oDataServiceAVT);
+    const alias = findAlias(types_1.UIVOCABULARY, oDataServiceAVT);
     const facetAnnotation = alias && entityType.annotations[alias] && entityType.annotations[alias].HeaderFacets;
     if (facetAnnotation) {
         const lastDot = entityType.fullyQualifiedName.lastIndexOf('.');
@@ -579,7 +587,7 @@ function getObjectPageFacets(entityType, oDataServiceAVT, oDataVersion = common_
     if (!entityType || !entityType.annotations) {
         return;
     }
-    const alias = findAlias('com.sap.vocabularies.UI.v1', oDataServiceAVT);
+    const alias = findAlias(types_1.UIVOCABULARY, oDataServiceAVT);
     const facetAnnotation = alias && entityType.annotations[alias] && entityType.annotations[alias].Facets;
     if (facetAnnotation) {
         const lastDot = entityType.fullyQualifiedName.lastIndexOf('.');
@@ -605,90 +613,118 @@ function getVersionFromManifest(manifest) {
     }
 }
 exports.getVersionFromManifest = getVersionFromManifest;
-function getTemplateTypeFromManifest(manifest, fioriElementsVersion, logger) {
+/**
+ * Determines the template type of a V2 app
+ * @param manifest - the manifest.json file
+ * @param {ExtensionLogger} logger - Logger class for logging messages
+ * @returns {TemplateType} the template type
+ */
+function determineV2Template(manifest, logger) {
     let templateType;
-    if (manifest[v4_1.ManifestSection.ovp]) {
-        templateType = TemplateType.OverviewPageV2;
-    }
-    else if (fioriElementsVersion === common_1.FioriElementsVersion.v2) {
-        if (manifest[v4_1.ManifestSection.generic]) {
-            const v2Pages = manifest[v4_1.ManifestSection.generic].pages;
-            if (!v2Pages) {
-                extensionLogger_1.log(logger, {
-                    severity: "error" /* Error */,
-                    message: i18next_1.default.t('NOPAGES', { appId: manifest['sap.app']['id'] }),
-                    location: {
-                        path: types_1.MANIFESTPATH,
-                        range: [v4_1.ManifestSection.generic]
-                    }
-                });
-                return;
-            }
-            for (const pageKey in v2Pages) {
-                const v2Page = v2Pages[pageKey];
-                if (getPageTypeV2(v2Page.component.name) === common_1.PageType.AnalyticalListPage) {
-                    templateType = TemplateType.AnalyticalListPageV2;
-                    break;
-                }
-                else if (getPageTypeV2(v2Page.component.name) === common_1.PageType.ListReport) {
-                    templateType = TemplateType.ListReportObjectPageV2;
-                    break;
-                }
-            }
-        }
-        else {
-            if (!templateType) {
-                extensionLogger_1.log(logger, {
-                    severity: "error" /* Error */,
-                    message: i18next_1.default.t('NOTEMPLATE', { section: v4_1.ManifestSection.generic }),
-                    location: {
-                        path: types_1.MANIFESTPATH,
-                        range: [v4_1.ManifestSection.generic]
-                    }
-                });
-            }
-        }
-    }
-    else if (fioriElementsVersion === common_1.FioriElementsVersion.v4) {
-        const v4Pages = manifest[v4_1.ManifestSection.ui5].routing &&
-            manifest[v4_1.ManifestSection.ui5].routing.targets;
-        if (!v4Pages) {
+    if (manifest[v4_1.ManifestSection.generic]) {
+        const v2Pages = manifest[v4_1.ManifestSection.generic].pages;
+        if (!v2Pages) {
             extensionLogger_1.log(logger, {
                 severity: "error" /* Error */,
                 message: i18next_1.default.t('NOPAGES', { appId: manifest['sap.app']['id'] }),
                 location: {
                     path: types_1.MANIFESTPATH,
-                    range: [v4_1.ManifestSection.ui5, 'routing']
+                    range: [v4_1.ManifestSection.generic]
                 }
             });
             return;
         }
-        for (const pageKey in v4Pages) {
-            const v4Page = v4Pages[pageKey];
-            if (getPageTypeV4(v4Page.name) === common_1.PageTypeV4.AnalyticalListPage) {
-                templateType = TemplateType.AnalyticalListPageV4;
-                break;
-            }
-            else if (getPageTypeV4(v4Page.name) === common_1.PageTypeV4.ListReport) {
-                templateType = TemplateType.ListReportObjectPageV4;
+        for (const pageKey in v2Pages) {
+            const v2Page = v2Pages[pageKey];
+            if (getPageTypeV2(v2Page.component.name) === common_1.PageType.AnalyticalListPage) {
+                templateType = TemplateType.AnalyticalListPageV2;
                 break;
             }
-            else if (getPageTypeV4(v4Page.name) === common_1.PageTypeV4.ObjectPage) {
-                templateType = TemplateType.FormPageV4;
+            else if (getPageTypeV2(v2Page.component.name) === common_1.PageType.ListReport) {
+                templateType = TemplateType.ListReportObjectPageV2;
                 break;
             }
         }
+    }
+    else {
         if (!templateType) {
             extensionLogger_1.log(logger, {
                 severity: "error" /* Error */,
-                message: i18next_1.default.t('NOTEMPLATE', { section: v4_1.ManifestSection.ui5 }),
+                message: i18next_1.default.t('NOTEMPLATE', { section: v4_1.ManifestSection.generic }),
                 location: {
                     path: types_1.MANIFESTPATH,
-                    range: [v4_1.ManifestSection.ui5, 'routing', 'targets']
+                    range: [v4_1.ManifestSection.generic]
                 }
             });
         }
     }
+    return templateType;
+}
+exports.determineV2Template = determineV2Template;
+/**
+ * Determines the template type of a V4 app
+ * @param manifest - the manifest.json file
+ * @param {ExtensionLogger} logger - Logger class for logging messages
+ * @returns {TemplateType} the template type
+ */
+function determineV4Template(manifest, logger) {
+    let templateType;
+    const v4Pages = manifest[v4_1.ManifestSection.ui5].routing &&
+        manifest[v4_1.ManifestSection.ui5].routing.targets;
+    if (!v4Pages) {
+        extensionLogger_1.log(logger, {
+            severity: "error" /* Error */,
+            message: i18next_1.default.t('NOPAGES', { appId: manifest['sap.app']['id'] }),
+            location: {
+                path: types_1.MANIFESTPATH,
+                range: [v4_1.ManifestSection.ui5, 'routing']
+            }
+        });
+        return;
+    }
+    for (const pageKey in v4Pages) {
+        const v4Page = v4Pages[pageKey];
+        const pageType = getPageTypeV4(v4Page.name);
+        if (pageType === common_1.PageTypeV4.AnalyticalListPage) {
+            templateType = TemplateType.AnalyticalListPageV4;
+            break;
+        }
+        else if (pageType === common_1.PageTypeV4.ListReport || pageType === common_1.PageTypeV4.ObjectPage) {
+            templateType = TemplateType.ListReportObjectPageV4;
+            break;
+        }
+    }
+    if (!templateType) {
+        extensionLogger_1.log(logger, {
+            severity: "error" /* Error */,
+            message: i18next_1.default.t('NOTEMPLATE', { section: v4_1.ManifestSection.ui5 }),
+            location: {
+                path: types_1.MANIFESTPATH,
+                range: [v4_1.ManifestSection.ui5, 'routing', 'targets']
+            }
+        });
+    }
+    return templateType;
+}
+exports.determineV4Template = determineV4Template;
+/**
+ * Determines the template type, based on the given manifest entries of the app
+ * @param manifest - the manifest.json file
+ * @param {FioriElementsVersion} fioriElementsVersion - OData or FE version
+ * @param {ExtensionLogger} logger - Logger class for logging messages
+ * @returns {TemplateType} the template type
+ */
+function getTemplateTypeFromManifest(manifest, fioriElementsVersion, logger) {
+    let templateType;
+    if (manifest[v4_1.ManifestSection.ovp]) {
+        templateType = TemplateType.OverviewPageV2;
+    }
+    else if (fioriElementsVersion === common_1.FioriElementsVersion.v2) {
+        templateType = determineV2Template(manifest, logger);
+    }
+    else if (fioriElementsVersion === common_1.FioriElementsVersion.v4) {
+        templateType = determineV4Template(manifest, logger);
+    }
     else {
         if (!templateType) {
             extensionLogger_1.log(logger, {
@@ -703,12 +739,40 @@ function getTemplateTypeFromManifest(manifest, fioriElementsVersion, 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
+ * @param section - section in the app schema
+ * @param facetKey - key of the facet
+ */
+function addSectionTitleAndDescription(facet, section, facetKey) {
+    if (facet === null || facet === void 0 ? void 0 : facet.ID) {
+        section['title'] = types_1.FacetTitlePrefix + facet.ID;
+    }
+    else {
+        section['title'] = facetKey.substr(facetKey.lastIndexOf('.') + 1);
+    }
+    // Description
+    if (facet === null || facet === void 0 ? void 0 : facet.Label) {
+        section['description'] = facet.Label;
+    }
+    else if (facet === null || facet === void 0 ? void 0 : facet.ID) {
+        section['description'] = facet.ID;
+    }
+    else {
+        section['description'] = facetKey.substr(facetKey.lastIndexOf('.') + 1);
+    }
+}
+exports.addSectionTitleAndDescription = addSectionTitleAndDescription;
 /**
  * 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
  * @returns the new section object
  */
-function createSectionWithoutProperties(facet) {
+function createSectionWithoutProperties(facet, facetKey) {
+    if (!facet) {
+        return undefined;
+    }
     const section = {
         type: 'object',
         properties: {},
@@ -716,12 +780,7 @@ function createSectionWithoutProperties(facet) {
         annotationPath: facet.annotationPath,
         isViewNode: true
     };
-    if (facet && facet.ID) {
-        section['title'] = types_1.FacetTitlePrefix + facet.ID;
-    }
-    if (facet && facet.Label) {
-        section['description'] = facet.Label;
-    }
+    addSectionTitleAndDescription(facet, section, facetKey);
     return section;
 }
 exports.createSectionWithoutProperties = createSectionWithoutProperties;
@@ -735,22 +794,23 @@ exports.createSectionWithoutProperties = createSectionWithoutProperties;
  * @returns {FacetSection[]} - Array of facets or sections
  */
 function getObjectPageFacetSection(entityType, oDataServiceAVT, logger, oDataVersion = common_1.FioriElementsVersion.v2, checkUnresolvableFacets = false) {
-    const alias = findAlias('com.sap.vocabularies.UI.v1', oDataServiceAVT);
+    const alias = findAlias(types_1.UIVOCABULARY, oDataServiceAVT);
+    let sections = [];
     if (entityType) {
         const facetAnnotation = alias && entityType.annotations && entityType.annotations[alias] && entityType.annotations[alias].Facets;
-        if (!facetAnnotation) {
-            return [];
-        }
-        return facetAnnotation.reduce(function (result, item) {
-            if (checkUnresolvableFacets && !item['ID'] && !('Target' in item && item['Target'])) {
+        if (facetAnnotation) {
+            sections = facetAnnotation.reduce(function (result, item) {
+                if (checkUnresolvableFacets && !item['ID'] && !('Target' in item && item['Target'])) {
+                    return result;
+                }
+                const section = getSectionFacet(item, entityType, oDataServiceAVT, logger, oDataVersion, true);
+                if (section) {
+                    result.push(section);
+                }
                 return result;
-            }
-            const section = getSectionFacet(item, true, oDataVersion, entityType, oDataServiceAVT, logger);
-            if (section) {
-                result.push(section);
-            }
-            return result;
-        }, []);
+            }, sections);
+        }
+        return sections;
     }
 }
 exports.getObjectPageFacetSection = getObjectPageFacetSection;
@@ -856,27 +916,16 @@ function generatePageId(pageType, entitySet, navigationProperty, viewId) {
 }
 exports.generatePageId = generatePageId;
 /**
- * Recursive function to determine the next config part, next definition in the app schema and the title
- * @param appSchema - app schema
- * @param title - default title
- * @param currentConfigObject - current part of the configuration that gets traversed
- * @param propertyDefinition - definition of a given property in the app schema
- * @param key - actual key
- * @param factory - factory for creating metadata instances
- * @param pageType - page type
+ * Fills an array of next definitions from given references in the JSON schema
+ * @param propertyDefinition - Definition of the current property in schema
+ * @param currentConfigObject - Current object in the config JSON. Evaluated to get the right value of a cntrolling property,
+ *                              for making the right choice in case of multiple options (anyOf)
+ * @param appSchema - app-spcific JSON schema
+ * @returns an array of definitions to proceed with
  */
-function getNextTargetDefinition(appSchema, title, currentConfigObject, propertyDefinition, key, factory, pageType) {
-    let nextDefinition = {
-        configObject: undefined,
-        targetDefinition: {},
-        title: ''
-    };
+function fillArrayFromPropertyDefinition(propertyDefinition, currentConfigObject, appSchema) {
     const definitionArray = [];
-    if (propertyDefinition['type'] === 'array') {
-        nextDefinition = getNextTargetDefinition(appSchema, title, currentConfigObject, propertyDefinition['items'], key, factory, pageType);
-        return nextDefinition;
-    }
-    else if (propertyDefinition['$ref']) {
+    if (propertyDefinition['$ref']) {
         definitionArray.push(propertyDefinition['$ref'].split(exports.DEFINITION_LINK_PREFIX)[1]);
     }
     else if (propertyDefinition['anyOf']) {
@@ -897,16 +946,38 @@ function getNextTargetDefinition(appSchema, title, currentConfigObject, property
             return undefined;
         }
     }
+    return definitionArray;
+}
+/**
+ * Determines the next definition to be handled, based on the definition array.
+ * It also creates the Metadata instance for the next definition, to subsequently access metadata like the syncRule
+ * @param definitionArray - Array of definitions, as determined by fillArrayFromNextDefinition
+ * @param appSchema - app-spcific JSON schema
+ * @param title - default title
+ * @param currentConfigObject - Current object in the config JSON.
+ * @param key - actual key
+ * @param {MetadataInstanceInterface} factory - factory for creating metadata instances
+ * @param pageType - page type
+ * @param propertyDefinition - Definition of the current property in schema
+ * @returns {NextDefinition} - Next target definition to process
+ */
+function determineNextDefinitionFromDefinitionArray(definitionArray, appSchema, title, currentConfigObject, key, factory, pageType, propertyDefinition) {
+    let nextDefinition = {
+        configObject: undefined,
+        targetDefinition: {},
+        title: ''
+    };
     if (definitionArray.length) {
         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;
         }
         if (definitionArray.length > 1) {
             definitionArray.forEach((element) => {
-                if (element != '') {
+                if (element !== '') {
                     nextDefinition.targetDefinition['properties'] = Object.assign(Object.assign({}, nextDefinition.targetDefinition['properties']), appSchema['definitions'][element]['properties']);
                 }
             });
@@ -928,36 +999,58 @@ function getNextTargetDefinition(appSchema, title, currentConfigObject, property
     }
     return nextDefinition;
 }
+/**
+ * Recursive function to determine the next config part, next definition in the app schema and the title
+ * @param appSchema - app-spcific JSON schema
+ * @param title - default title
+ * @param currentConfigObject - current part of the configuration that gets traversed
+ * @param propertyDefinition - definition of a given property in the app schema
+ * @param key - actual key
+ * @param {MetadataInstanceInterface} factory - factory for creating metadata instances
+ * @param pageType - page type
+ */
+function getNextTargetDefinition(appSchema, title, currentConfigObject, propertyDefinition, key, factory, pageType) {
+    let nextDefinition;
+    if (propertyDefinition['type'] === 'array') {
+        nextDefinition = getNextTargetDefinition(appSchema, title, currentConfigObject, propertyDefinition['items'], key, factory, pageType);
+        return nextDefinition;
+    }
+    const definitionArray = fillArrayFromPropertyDefinition(propertyDefinition, currentConfigObject, appSchema);
+    if (!definitionArray) {
+        return undefined;
+    }
+    nextDefinition = determineNextDefinitionFromDefinitionArray(definitionArray, appSchema, title, currentConfigObject, key, factory, pageType, propertyDefinition);
+    return nextDefinition;
+}
 exports.getNextTargetDefinition = getNextTargetDefinition;
 /**
  * Add schema definitions for fields of createWithParameterDialog
  * @param {object} appSchema - Application-specific schema, to be enhanced
- * @param {EntityType} entityType - Given entity type for which entries shall get generated.
+ * @param {EntityType} entityType - Given entity type for which entries shall get generated
+ * @param {string=} floorplanSuffix - floorplan specific suffix (optional)
  */
-function addFieldsType(appSchema, entityType) {
+function addFieldsType(appSchema, entityType, floorplanSuffix = '') {
     const propertyNameArray = [], propertyObject = {};
-    for (const key in entityType.entityProperties) {
-        const propertyName = entityType.entityProperties[key].name;
+    for (const key of entityType.entityProperties) {
+        const propertyName = key.name;
         propertyNameArray.push(propertyName);
         propertyObject[propertyName] = {
-            $ref: exports.DEFINITION_LINK_PREFIX + 'FieldPath'
+            $ref: exports.DEFINITION_LINK_PREFIX + `FieldPath${floorplanSuffix}`
         };
     }
     appSchema['definitions'][entityType.name] = {
         enum: propertyNameArray
     };
-    appSchema['definitions']['FieldPath'].properties.path = {
+    appSchema['definitions'][`FieldPath${floorplanSuffix}`].properties.path = {
         $ref: exports.DEFINITION_LINK_PREFIX + entityType.name
     };
-    appSchema['definitions']['CreationFieldKeys'] = {
+    appSchema['definitions'][`CreationFieldKeys${floorplanSuffix}`] = {
         type: 'object',
         properties: propertyObject,
         additionalProperties: false
     };
-    const fields4Dialog = appSchema['definitions']['Fields4Dialog'] || appSchema['definitions']['Fields4DialogOP'];
-    fields4Dialog.properties.fields = {
-        $ref: exports.DEFINITION_LINK_PREFIX + 'CreationFieldKeys'
-    };
+    const fields4Dialog = appSchema['definitions'][`Fields4Dialog${floorplanSuffix}`];
+    fields4Dialog.properties.fields.$ref = exports.DEFINITION_LINK_PREFIX + `CreationFieldKeys${floorplanSuffix}`;
 }
 exports.addFieldsType = addFieldsType;
 /**