@sap/ux-specification 1.84.36 → 1.84.37

package/dist/src/sync/v4/generate/objectPage.js

@@ -3,18 +3,18 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+const i18next_1 = __importDefault(require("i18next"));
+const extensionLogger_1 = require("../../../extensionLogger");
 const common_1 = require("../../../specification/common");
 const v4_1 = require("../../../v4");
 const common_2 = require("../../common");
 const utils_1 = require("../utils/utils");
-const i18next_1 = __importDefault(require("i18next"));
-const extensionLogger_1 = require("../../../extensionLogger");
 /**
  * Callback for adding a single action to headerActions of V4
  * @param {EntityType} entityType - current entity type
- * @param {object} appSchema Schema of the app
+ * @param {Definition} appSchema Schema of the app
  * @param actionAnnotation - annotation as present in AVT ConverterOutput
- * @param headerActions - list of header actions, to be enhanced
+ * @param {Definition} headerActions - list of header actions, to be enhanced
  * @param {ConverterOutput} oDataServiceAVT - complete service information, as returned by annotation vocabularies tool
  */
 function addHeaderActionCallBackV4(entityType, appSchema, actionAnnotation, headerActions, oDataServiceAVT) {
@@ -23,121 +23,274 @@ function addHeaderActionCallBackV4(entityType, appSchema, actionAnnotation, head
             item.$Type === "com.sap.vocabularies.UI.v1.DataFieldForIntentBasedNavigation" /* DataFieldForIntentBasedNavigation */) {
             const action = common_2.replaceAlias(item.Action, oDataServiceAVT);
             const { actionName, actionId } = common_2.getActionNameAndId(action, entityType);
-            const description = item.Label || actionName;
-            const actionDefinitionKey = `HeaderAction<${common_2.prepareRef(actionId)}>`;
             const convertedIdentification = actionAnnotation.fullyQualifiedName.replace(`@${"com.sap.vocabularies.UI.v1.Identification" /* Identification */}`, `/@${"com.sap.vocabularies.UI.v1.Identification" /* Identification */}`);
-            appSchema['definitions'][actionDefinitionKey] = {
-                isViewNode: true,
+            const actionDefinitionKey = `HeaderAction<${common_2.prepareRef(actionId)}>`;
+            const headerAction = (appSchema.definitions[actionDefinitionKey] = {
                 type: 'object',
                 properties: {},
-                description: description,
-                annotationPath: `/${convertedIdentification}/${index}`
-            };
+                description: item.Label || actionName
+            });
+            headerAction[v4_1.SchemaTag.isViewNode] = true;
+            headerAction[v4_1.SchemaTag.annotationPath] = `/${convertedIdentification}/${index}`;
             headerActions.properties[actionId] = {
                 $ref: `${common_2.DEFINITION_LINK_PREFIX}${actionDefinitionKey}`
             };
         }
     };
 }
+/**
+ * Adds definitions for collections in object page sections to the app schema
+ * @param {FacetConfig} facet - the given facet from the UI annotations
+ * @param {string} facetKey - key of the facet, as used in annotation
+ * @param {Definition} appSchema - app schema in general
+ * @param {Definition} sections - schema of current sections definition.
+ * @param {SectionType} sectionPrefix - prefix to distinguish Section and HeaderSection
+ * @param {GenerateSchemaParameters} generateParameters - list of API input parameters
+ * @param {SapUiAppPageV4} v4Page Current page in manifest
+ */
+function handleCollection(facet, facetKey, appSchema, sections, sectionPrefix, generateParameters, v4Page) {
+    const collectionFacet = (sections['properties'][facetKey] = common_2.createSectionWithoutProperties(facet, facetKey));
+    collectionFacet.properties = {
+        subsections: {
+            additionalProperties: false,
+            type: 'object',
+            properties: {},
+            description: 'Subsections'
+        }
+    };
+    const subSections = collectionFacet.properties.subsections;
+    subSections[v4_1.SchemaTag.annotationPath] = facet.annotationPath;
+    subSections[v4_1.SchemaTag.isViewNode] = true;
+    for (const key in facet['facets']) {
+        addSection(generateParameters, facet['facets'], key, subSections, appSchema, sectionPrefix, v4Page);
+    }
+}
 /**
  * Adds definitions for line items in object page sections to the app schema
- * @param facet - the given facet from the UI annotations
- * @param facetIdInSchema - key of the facet, as used in schema
- * @param facets - list of all facets
- * @param appSchema - app schema in general
+ * @param {FacetConfig} facet - the given facet from the UI annotations
+ * @param {string} facetKey - key of the facet, as used in annotation
+ * @param {Definition} appSchema - app schema in general
+ * @param {object} lineItemFacet - current lineItem facet
  * @param {ConverterOutput} oDataServiceAVT - complete service information, as returned by annotation vocabularies tool
  */
-function handleLineItem(facet, facetIdInSchema, facets, appSchema, oDataServiceAVT) {
-    let navigationProperty = '', annotation = '';
-    [navigationProperty, annotation] = facetIdInSchema.split('::');
-    const schemaIdForOpSection = `ObjectPageSectionTableV4<${facetIdInSchema}>`;
-    appSchema['definitions'][schemaIdForOpSection] = JSON.parse(JSON.stringify(appSchema['definitions']['ObjectPageSectionTableV4']));
-    const schemaIdForTable = `ObjectPageTable<${facetIdInSchema}>`;
-    appSchema['definitions'][schemaIdForOpSection].properties.table.$ref = `${common_2.DEFINITION_LINK_PREFIX}${schemaIdForTable}`;
-    appSchema['definitions'][schemaIdForTable] = JSON.parse(JSON.stringify(appSchema['definitions'][v4_1.DefinitionName.ObjectPageTable]));
-    appSchema['definitions'][schemaIdForOpSection].annotationPath = facet.annotationPath;
-    common_2.addSectionTitleAndDescription(facet, appSchema['definitions'][schemaIdForOpSection], facetIdInSchema);
-    appSchema['definitions'][schemaIdForOpSection].properties.table.$ref = `${common_2.DEFINITION_LINK_PREFIX}ObjectPageTable<${facetIdInSchema}>`;
-    const idForTable = `ObjectPageTable<${facetIdInSchema}>`;
-    appSchema['definitions'][idForTable] = JSON.parse(JSON.stringify(appSchema['definitions'][v4_1.DefinitionName.ObjectPageTable]));
+function handleLineItem(facet, facetKey, appSchema, lineItemFacet, oDataServiceAVT) {
+    const lineItemId = common_2.getFacetKeyInSchema(facetKey);
+    const annotation = lineItemId.split('::')[1];
+    const tableDefinition = common_2.parseSchemaDefinition(v4_1.DefinitionName.ObjectPageTable, facetKey, appSchema);
     if (facet.entityType && annotation) {
-        appSchema['definitions'][idForTable].annotationPath = `/${facet.entityType.fullyQualifiedName}/${annotation}`;
+        tableDefinition[v4_1.SchemaTag.annotationPath] = `/${facet.entityType.fullyQualifiedName}/${annotation}`;
     }
-    appSchema['definitions'][idForTable].properties['columns'] = {
-        $ref: common_2.DEFINITION_LINK_PREFIX + facetIdInSchema
+    tableDefinition.properties.columns = {
+        $ref: `${common_2.DEFINITION_LINK_PREFIX}${lineItemId}`
     };
-    appSchema['definitions'][idForTable].properties['toolBar'].$ref = `${common_2.DEFINITION_LINK_PREFIX}ObjectPageToolBar<${facetIdInSchema}>`;
+    tableDefinition.properties.toolBar.$ref = common_2.getFacetDefinitionLink(v4_1.DefinitionName.ObjectPageToolBar, facetKey);
     //adjust quickVariantSelection
-    appSchema['definitions'][idForTable].properties['quickVariantSelection'].$ref = `${common_2.DEFINITION_LINK_PREFIX}QuickVariantSelectionV4OP<${facetIdInSchema}>`;
-    appSchema['definitions'][`QuickVariantSelectionV4OP<${facetIdInSchema}>`] = JSON.parse(JSON.stringify(appSchema['definitions']['QuickVariantSelectionV4OP']));
-    appSchema['definitions'][`AnnotationPathAsObject<${facetIdInSchema}>`] = JSON.parse(JSON.stringify(appSchema['definitions'][v4_1.DefinitionName.AnnotationPathAsObject]));
-    appSchema['definitions'][`QuickVariantSelectionV4OP<${facetIdInSchema}>`].properties.paths.items.$ref = `${common_2.DEFINITION_LINK_PREFIX}AnnotationPathAsObject<${facetIdInSchema}>`;
-    common_2.addEnumForSingleTabVariant(facet.entityType, appSchema, `AnnotationPathAsObject<${facetIdInSchema}>`);
-    for (const facetKey in facets) {
-        if (facets[facetKey].base === common_2.FacetBase.LineItem && facetKey.includes(navigationProperty)) {
-            utils_1.addLineItemsType(appSchema, facets[facetKey].target, facets[facetKey].entityType, oDataServiceAVT, facetIdInSchema, v4_1.DefinitionName.ObjectPageTableColumn);
-        }
+    tableDefinition.properties.quickVariantSelection.$ref = common_2.getFacetDefinitionLink(v4_1.DefinitionName.QuickVariantSelectionV4OP, facetKey);
+    const tableQVS = common_2.parseSchemaDefinition(v4_1.DefinitionName.QuickVariantSelectionV4OP, facetKey, appSchema);
+    tableQVS.properties.paths['items'].$ref = common_2.getFacetDefinitionLink(v4_1.DefinitionName.AnnotationPathAsObject, facetKey);
+    common_2.parseSchemaDefinition(v4_1.DefinitionName.AnnotationPathAsObject, facetKey, appSchema);
+    common_2.addEnumForSingleTabVariant(facet.entityType, appSchema, `${v4_1.DefinitionName.AnnotationPathAsObject}<${lineItemId}>`);
+    utils_1.addLineItemsType(appSchema, lineItemFacet['target'], lineItemFacet['entityType'], oDataServiceAVT, lineItemId, v4_1.DefinitionName.ObjectPageTableColumn);
+    return tableDefinition;
+}
+/**
+ * Adds definitions for table section in object page sections to the app schema
+ * @param {FacetConfig} facet - current facet.
+ * @param {string} facetKey - facet key.
+ * @param {Definition} appSchema - app specific schema that potentially gets enhanced.
+ * @param {object} lineItemFacet - current lineItem facet
+ * @param {GenerateSchemaParameters} generateParameters - list of API input parameters
+ * @param {SapUiAppPageV4} v4Page Current page in manifest
+ * @param {Definition} sections - schema of current sections definition.
+ * @returns {object} sectionTable - section of app schema containing added table section
+ */
+function handleSectionTable(facet, facetKey, appSchema, lineItemFacet, generateParameters, sections) {
+    if (sections) {
+        sections.properties[facetKey] = {
+            $ref: common_2.getFacetDefinitionLink(v4_1.DefinitionName.ObjectPageSectionTableV4, facetKey)
+        };
     }
+    const sectionTable = common_2.parseSchemaDefinition(v4_1.DefinitionName.ObjectPageSectionTableV4, facetKey, appSchema);
+    common_2.addSectionTitleAndDescription(facet, sectionTable, common_2.getFacetKeyInSchema(facetKey));
+    sectionTable[v4_1.SchemaTag.annotationPath] = facet.annotationPath;
+    sectionTable.properties.table['$ref'] = common_2.getFacetDefinitionLink(v4_1.DefinitionName.ObjectPageTable, facetKey);
+    const table = handleLineItem(facet, facetKey, appSchema, lineItemFacet, generateParameters.serviceAVT);
+    return { sectionTable, table };
 }
 /**
  * Adds definitions for Identification and Form facet items in object page sections to the app schema
- * @param {FacetConfigs} facet - current facet.
+ * @param {FacetConfig} facet - current facet.
  * @param {string} facetKey - facet key.
  * @param {object} sections - schema of current sections definition.
  * @param {object} appSchema - app specific schema that potentially gets enhanced.
  * @param {SectionType} sectionPrefix - prefix to distinguish Section and HeaderSection
- * @param {SectionType} formDefinitionKey - key to identify new definition
  */
-function handleFormIdentification(facet, facetKey, sections, appSchema, sectionPrefix, formDefinitionKey) {
+function handleFormIdentification(facet, facetKey, sections, appSchema, sectionPrefix) {
+    let definitionType;
+    if (sectionPrefix === v4_1.SectionType.Section) {
+        definitionType = v4_1.DefinitionName.ObjectPageSectionForm;
+    }
+    else if (sectionPrefix === v4_1.SectionType.HeaderSection) {
+        definitionType = v4_1.DefinitionName.ObjectPageHeaderSectionForm;
+    }
     sections['properties'][facetKey] = {
-        $ref: `${common_2.DEFINITION_LINK_PREFIX}${formDefinitionKey}`
+        $ref: common_2.getFacetDefinitionLink(definitionType, facetKey)
     };
-    appSchema['definitions'][formDefinitionKey] = JSON.parse(JSON.stringify(appSchema['definitions'][`ObjectPage${sectionPrefix}Form`]));
+    const formSection = common_2.parseSchemaDefinition(definitionType, facetKey, appSchema);
     if (!facet.ID) {
-        appSchema['definitions'][formDefinitionKey]['properties'] = {};
+        formSection.properties = {};
     }
-    common_2.addSectionTitleAndDescription(facet, appSchema['definitions'][formDefinitionKey], facetKey);
-    appSchema['definitions'][formDefinitionKey][v4_1.SchemaTag.annotationPath] = facet.annotationPath;
-    appSchema['definitions'][formDefinitionKey][v4_1.SchemaTag.isViewNode] = true;
+    common_2.addSectionTitleAndDescription(facet, formSection, facetKey);
+    formSection[v4_1.SchemaTag.annotationPath] = facet.annotationPath;
+    formSection[v4_1.SchemaTag.isViewNode] = true;
     const withActions = facet.base === common_2.FacetBase.Identification && facetKey.indexOf('#') < 0 ? false : true;
-    common_2.handleForm(sectionPrefix, facet, appSchema['definitions'][formDefinitionKey], appSchema, common_1.FioriElementsVersion.v4, withActions);
+    common_2.handleForm(sectionPrefix, facet, formSection, appSchema, common_1.FioriElementsVersion.v4, withActions);
 }
 /**
- * Adds definitions for DataPoint items in object page sections to the app schema
- * @param {FacetConfigs} facet - current facet.
+ * Adds definitions for header sections (DataPoint, Chart) in object page sections to the app schema
+ * @param {FacetConfig} facet - current facet.
  * @param {string} facetKey - facet key.
  * @param {object} sections - schema of current sections definition.
  * @param {object} appSchema - app specific schema that potentially gets enhanced.
- * @param {SectionType} sectionPrefix - prefix to distinguish Section and HeaderSection
  * @param {SectionType} facetDefinitionKey - key to identify new definition
  */
-function handleChartAndDataPoint(facet, facetKey, sections, appSchema, facetDefinitionKey) {
+function handleHeaderFacet(facet, facetKey, sections, appSchema, facetDefinitionKey) {
     sections['properties'][facetKey] = {
         $ref: `${common_2.DEFINITION_LINK_PREFIX}${facetDefinitionKey}`
     };
-    appSchema['definitions'][facetDefinitionKey] = JSON.parse(JSON.stringify(appSchema['definitions'][`CommonHeaderFacetSettings`]));
-    common_2.addTargetTitleAndSectionDescription(facet, appSchema['definitions'][facetDefinitionKey], facetKey);
-    appSchema['definitions'][facetDefinitionKey][v4_1.SchemaTag.annotationPath] = facet.annotationPath;
-    appSchema['definitions'][facetDefinitionKey][v4_1.SchemaTag.dataType] = common_2.determineDataTypeOfTarget(facet === null || facet === void 0 ? void 0 : facet.target);
-    appSchema['definitions'][facetDefinitionKey][v4_1.SchemaTag.isViewNode] = true;
+    const sectionFacet = common_2.parseSchemaDefinition(v4_1.DefinitionName.CommonHeaderFacetSettings, facetDefinitionKey, appSchema, false);
+    common_2.addTargetTitleAndSectionDescription(facet, sectionFacet, facetKey);
+    sectionFacet[v4_1.SchemaTag.annotationPath] = facet.annotationPath;
+    sectionFacet[v4_1.SchemaTag.dataType] = common_2.determineDataTypeOfTarget(facet === null || facet === void 0 ? void 0 : facet.target);
+    sectionFacet[v4_1.SchemaTag.isViewNode] = true;
+}
+/**
+ * Adds definitions for Chart items in object page sections to the app schema
+ * @param {FacetConfig | Chart | object} facet - current facet.
+ * @param {string} facetKey - facet key.
+ * @param {object} appSchema - app specific schema that potentially gets enhanced.
+ * @param {EntityType} entityType - current entity type
+ */
+function handleChartActions(facet, facetKey, appSchema, entityType) {
+    const actions = common_2.parseSchemaDefinition(v4_1.DefinitionName.ObjectPageToolBarActions, facetKey, appSchema);
+    actions.additionalProperties = false;
+    actions.properties = {};
+    if (facet.Actions) {
+        let i = 0;
+        facet.Actions.forEach((actionRecord) => {
+            const description = common_2.getDataFieldDescription(actionRecord, entityType);
+            const prefix = actionRecord.$Type.split(v4_1.UIVOCABULARYDOT)[1];
+            const actionId = actionRecord.Action.replace('/', '??');
+            const toolBarActionsProperty = (actions.properties[`${prefix}::${actionRecord.Action}`] = {
+                $ref: common_2.getFacetDefinitionLink(v4_1.DefinitionName.ObjectPageToolBarAction, actionId),
+                description
+            });
+            toolBarActionsProperty[v4_1.SchemaTag.propertyIndex] = i;
+            toolBarActionsProperty[v4_1.SchemaTag.annotationType] = actionRecord.$Type;
+            const toolBarAction = common_2.parseSchemaDefinition(v4_1.DefinitionName.ObjectPageToolBarAction, common_2.prepareRef(actionId), appSchema);
+            toolBarAction[v4_1.SchemaTag.annotationPath] = common_2.getFacetAnnotationPath(actionRecord);
+            toolBarAction[v4_1.SchemaTag.dataType] = common_2.determineDataType(actionRecord);
+            toolBarAction.properties = {};
+            i++;
+        });
+    }
+    return actions;
+}
+/**
+ * Adds definitions for Chart items in object page sections to the app schema
+ * @param {FacetConfig | Chart | object} facet - current facet.
+ * @param {string} facetKey - facet key.
+ * @param {object} appSchema - app specific schema that potentially gets enhanced.
+ * @param {EntityType} entityType - current entity type
+ */
+function handleChart(facet, facetKey, appSchema, entityType) {
+    const chart = common_2.parseSchemaDefinition(v4_1.DefinitionName.ObjectPageChart, facetKey, appSchema);
+    chart[v4_1.SchemaTag.annotationPath] = common_2.getFacetAnnotationPath(facet);
+    chart[v4_1.SchemaTag.dataType] = common_2.determineDataTypeOfTarget(facet.target || facet);
+    chart[v4_1.SchemaTag.isViewNode] = true;
+    chart.properties.toolBar['$ref'] = common_2.getFacetDefinitionLink(v4_1.DefinitionName.ObjectPageToolBar, facetKey);
+    const chartToolBar = common_2.parseSchemaDefinition(v4_1.DefinitionName.ObjectPageToolBar, facetKey, appSchema);
+    chartToolBar.properties.actions['$ref'] = common_2.getFacetDefinitionLink(v4_1.DefinitionName.ObjectPageToolBarActions, facetKey);
+    const chartActions = handleChartActions(facet, facetKey, appSchema, entityType);
+    return { chart, chartActions };
+}
+/**
+ * Adds definitions for Chart section in object page sections to the app schema
+ * @param {FacetConfig} facet - current facet.
+ * @param {string} facetKey - facet key.
+ * @param {object} appSchema - app specific schema that potentially gets enhanced.
+ * @param {object} sections - schema of current sections definition.
+ * @param {EntityType} entityType - current entity type
+ */
+function handleSectionChart(facet, facetKey, appSchema, sections, entityType = facet.entityType) {
+    if (sections) {
+        sections.properties[facetKey] = {
+            $ref: common_2.getFacetDefinitionLink(v4_1.DefinitionName.ObjectPageSectionChart, facetKey)
+        };
+    }
+    const sectionChart = common_2.parseSchemaDefinition(v4_1.DefinitionName.ObjectPageSectionChart, facetKey, appSchema);
+    sectionChart[v4_1.SchemaTag.annotationPath] = common_2.getFacetAnnotationPath(facet);
+    sectionChart.properties.chart['$ref'] = common_2.getFacetDefinitionLink(v4_1.DefinitionName.ObjectPageChart, facetKey);
+    const { chart, chartActions } = handleChart(facet.target || facet, facetKey, appSchema, entityType);
+    return { sectionChart, chart, chartActions };
+}
+/**
+ * Adds definitions for presentation variants in object page sections to the app schema
+ * @param {FacetConfig} facet - the given facet from the UI annotations
+ * @param {string} facetKey - key of the facet, as used in annotation
+ * @param {Definition} appSchema - app schema in general
+ * @param {object} sections - schema of current sections definition.
+ * @param {GenerateSchemaParameters} generateParameters - list of API input parameters
+ * @param {SapUiAppPageV4} v4Page Current page in manifest
+ */
+function handleSectionPresentationVariant(facet, facetKey, appSchema, sections, generateParameters) {
+    var _a;
+    const facetTarget = facet.target.Visualizations
+        ? (_a = facet.target.Visualizations[0]) === null || _a === void 0 ? void 0 : _a.$target : undefined;
+    if (facetTarget) {
+        const [namespace, target] = facet.target[v4_1.SchemaTag.fullyQualifiedName].split('@');
+        const visualizationKey = `@${facetTarget.fullyQualifiedName.split('@')[1]}`;
+        sections.properties[`${facetKey}<${visualizationKey}>`] = {
+            $ref: common_2.getFacetDefinitionLink(v4_1.DefinitionName.ObjectPageSectionPresentationVariant, visualizationKey)
+        };
+        const sectionDefinition = common_2.parseSchemaDefinition(v4_1.DefinitionName.ObjectPageSectionPresentationVariant, visualizationKey, appSchema);
+        delete sectionDefinition.additionalProperties;
+        common_2.addTargetTitleAndSectionDescription(facet, sectionDefinition, facetKey);
+        sectionDefinition[v4_1.SchemaTag.annotationPath] = facet.annotationPath;
+        sectionDefinition[v4_1.SchemaTag.isViewNode] = true;
+        const annotationPath = `/${namespace}/@${target}`;
+        const visualizationType = visualizationKey.split(v4_1.UIVOCABULARYDOT)[1];
+        if (visualizationType.startsWith('Chart')) {
+            sectionDefinition.$ref = common_2.getFacetDefinitionLink(v4_1.DefinitionName.ObjectPageSectionChart, visualizationKey);
+            const { sectionChart, chart } = handleSectionChart(facetTarget, visualizationKey, appSchema, undefined, facet.entityType);
+            sectionChart[v4_1.SchemaTag.annotationPath] = annotationPath;
+            chart[v4_1.SchemaTag.annotationPath] = `/${namespace}/${visualizationKey}`;
+        }
+        else if (visualizationType.startsWith('LineItem')) {
+            sectionDefinition.$ref = common_2.getFacetDefinitionLink(v4_1.DefinitionName.ObjectPageSectionTableV4, visualizationKey);
+            const { sectionTable, table } = handleSectionTable(facet, visualizationKey, appSchema, { target: facetTarget, entityType: facet.entityType }, generateParameters);
+            sectionTable[v4_1.SchemaTag.annotationPath] = annotationPath;
+            table[v4_1.SchemaTag.annotationPath] = `/${namespace}/${visualizationKey}`;
+        }
+    }
 }
 /**
  * Adds definitions for Address and Contact items in object page sections to the app schema
- * @param {FacetConfigs} facet - current facet.
+ * @param {FacetConfig} facet - current facet.
  * @param {string} facetKey - facet key.
  * @param {object} sections - schema of current sections definition.
  * @param {object} appSchema - app specific schema that potentially gets enhanced.
  * @param {SectionType} sectionPrefix - prefix to distinguish Section and HeaderSection
- * @param {SectionType} facetDefinitionKey - key to identify new definition
  */
-function handleAddressContact(facet, facetKey, sections, appSchema, sectionPrefix, facetDefinitionKey) {
-    sections['properties'][facetKey] = {
-        $ref: `${common_2.DEFINITION_LINK_PREFIX}${facetDefinitionKey}`
+function handleAddressContact(facet, facetKey, sections, appSchema, sectionPrefix) {
+    const definitionName = `ObjectPage${sectionPrefix}${facet.base}`;
+    sections.properties[facetKey] = {
+        $ref: common_2.getFacetDefinitionLink(definitionName, facetKey)
     };
-    appSchema['definitions'][facetDefinitionKey] = JSON.parse(JSON.stringify(appSchema['definitions'][`ObjectPage${sectionPrefix}${facet.base}`]));
-    common_2.addSectionTitleAndDescription(facet, appSchema['definitions'][facetDefinitionKey], facetKey);
-    appSchema['definitions'][facetDefinitionKey][v4_1.SchemaTag.annotationPath] = facet.annotationPath;
-    appSchema['definitions'][facetDefinitionKey][v4_1.SchemaTag.isViewNode] = true;
+    const definition = common_2.parseSchemaDefinition(definitionName, facetKey, appSchema);
+    common_2.addSectionTitleAndDescription(facet, definition, facetKey);
+    definition[v4_1.SchemaTag.annotationPath] = facet.annotationPath;
+    definition[v4_1.SchemaTag.isViewNode] = true;
 }
 /**
  * Creates a section definition in app schema.
@@ -146,54 +299,56 @@ function handleAddressContact(facet, facetKey, sections, appSchema, sectionPrefi
  * @param {string} facetKey - facet key.
  * @param {object} sections - schema of current sections definition.
  * @param {object} appSchema - app specific schema that potentially gets enhanced.
- * @param {ConverterOutput} oDataServiceAVT - complete service information, as returned by annotation vocabularies tool
  * @param {SectionType} sectionPrefix - prefix to distinguish Section and HeaderSection
  * @param {SapUiAppPageV4} v4Page Current page in manifest
  */
 function addSection(generateParameters, facets, facetKey, sections, appSchema, sectionPrefix, v4Page) {
     const facet = facets[facetKey];
-    const facetKeyInSchema = facetKey.replace('#', '::');
-    if (facet.base === 'CollectionFacet') {
-        //handle collection facets
-        sections['properties'][facetKey] = common_2.createSectionWithoutProperties(facet, facetKey);
-        sections['properties'][facetKey].properties = {
-            subsections: {
-                additionalProperties: false,
-                type: 'object',
-                properties: {},
-                annotationPath: facet.annotationPath,
-                isViewNode: true,
-                description: 'Subsections'
+    const facetDefinitionKey = `ObjectPage${sectionPrefix}${facet.base}<${common_2.getFacetKeyInSchema(facetKey)}>`;
+    switch (facet.base) {
+        case common_2.FacetBase.PresentationVariant: {
+            handleSectionPresentationVariant(facet, facetKey, appSchema, sections, generateParameters);
+            break;
+        }
+        case common_2.FacetBase.CollectionFacet: {
+            handleCollection(facet, facetKey, appSchema, sections, sectionPrefix, generateParameters, v4Page);
+            break;
+        }
+        case common_2.FacetBase.LineItem: {
+            if (sectionPrefix === v4_1.SectionType.Section) {
+                const lineItemFacet = facets[facetKey];
+                handleSectionTable(facet, facetKey, appSchema, lineItemFacet, generateParameters, sections);
+                break;
             }
-        };
-        const subSections = sections['properties'][facetKey].properties.subsections;
-        for (const key in facet['facets']) {
-            addSection(generateParameters, facet['facets'], key, subSections, appSchema, sectionPrefix, v4Page);
+            /* tslint:disable:no-fallthrough */
+            // fall through
+        }
+        case common_2.FacetBase.Form:
+        case common_2.FacetBase.Identification: {
+            handleFormIdentification(facet, facetKey, sections, appSchema, sectionPrefix);
+            break;
+        }
+        case common_2.FacetBase.DataPoint: {
+            handleHeaderFacet(facet, facetKey, sections, appSchema, facetDefinitionKey);
+            break;
+        }
+        case common_2.FacetBase.Chart: {
+            if (sectionPrefix === v4_1.SectionType.HeaderSection) {
+                handleHeaderFacet(facet, facetKey, sections, appSchema, facetDefinitionKey);
+            }
+            else if (sectionPrefix === v4_1.SectionType.Section) {
+                handleSectionChart(facet, facetKey, appSchema, sections);
+            }
+            break;
+        }
+        case common_2.FacetBase.Address:
+        case common_2.FacetBase.Contact: {
+            handleAddressContact(facet, facetKey, sections, appSchema, sectionPrefix);
+            break;
+        }
+        default: {
+            sections['properties'][facetKey] = common_2.createSectionWithoutProperties(facet, facetKey);
         }
-    }
-    else if (facet.base === common_2.FacetBase.LineItem && sectionPrefix === v4_1.SectionType.Section) {
-        const tableDefinitionKey = `ObjectPage${sectionPrefix}TableV4<${facetKeyInSchema}>`;
-        //handle reference facet (if comprising line item)
-        sections['properties'][facetKey] = {
-            $ref: `${common_2.DEFINITION_LINK_PREFIX}${tableDefinitionKey}`
-        };
-        handleLineItem(facet, facetKeyInSchema, facets, appSchema, generateParameters.serviceAVT);
-    }
-    else if (facet.base === common_2.FacetBase.Form || facet.base === common_2.FacetBase.Identification) {
-        const formDefinitionKey = `ObjectPage${sectionPrefix}Form<${facetKeyInSchema}>`;
-        handleFormIdentification(facet, facetKey, sections, appSchema, sectionPrefix, formDefinitionKey);
-    }
-    else if (facet.base === common_2.FacetBase.DataPoint ||
-        (facet.base === common_2.FacetBase.Chart && sectionPrefix === v4_1.SectionType.HeaderSection)) {
-        const facetDefinitionKey = `ObjectPage${sectionPrefix}${facet.base}<${facetKeyInSchema}>`;
-        handleChartAndDataPoint(facet, facetKey, sections, appSchema, facetDefinitionKey);
-    }
-    else if (facet.base === common_2.FacetBase.Address || facet.base === common_2.FacetBase.Contact) {
-        const facetDefinitionKey = `ObjectPage${sectionPrefix}${facet.base}<${facetKeyInSchema}>`;
-        handleAddressContact(facet, facetKey, sections, appSchema, sectionPrefix, facetDefinitionKey);
-    }
-    else {
-        sections['properties'][facetKey] = common_2.createSectionWithoutProperties(facet, facetKey);
     }
 }
 /**
@@ -207,16 +362,16 @@ function addSections(generateParameters, appSchema, entityType, v4Page) {
     // Get facet annotations
     const facets = common_2.getObjectPageFacets(entityType, generateParameters === null || generateParameters === void 0 ? void 0 : generateParameters.serviceAVT, common_1.FioriElementsVersion.v4, generateParameters.logger);
     if (!facets) {
-        delete appSchema['definitions']['ObjectPageSubSections'];
+        delete appSchema.definitions[v4_1.DefinitionName.ObjectPageSubSections];
         return;
     }
-    const sections = appSchema['definitions']['Sections'];
+    const sections = appSchema.definitions[v4_1.DefinitionName.Sections];
     for (const facetKey in facets) {
         addSection(generateParameters, facets, facetKey, sections, appSchema, v4_1.SectionType.Section, v4Page);
     }
     // Custom sections as part of sections
-    if (appSchema['definitions']['CustomSections']) {
-        sections.properties = Object.assign(Object.assign({}, sections.properties), appSchema['definitions']['CustomSections'].properties);
+    if (appSchema.definitions[v4_1.DefinitionName.CustomSections]) {
+        sections.properties = Object.assign(Object.assign({}, sections.properties), appSchema.definitions[v4_1.DefinitionName.CustomSections].properties);
     }
 }
 /**
@@ -229,7 +384,7 @@ function addSections(generateParameters, appSchema, entityType, v4Page) {
 function addHeaderSections(generateParameters, appSchema, entityType, v4Page) {
     // Get facet annotations
     const facets = common_2.getObjectPageHeaderFacets(entityType, generateParameters === null || generateParameters === void 0 ? void 0 : generateParameters.serviceAVT, common_1.FioriElementsVersion.v4, generateParameters.logger);
-    const sections = appSchema['definitions']['HeaderSections'];
+    const sections = appSchema.definitions[v4_1.DefinitionName.HeaderSections];
     sections.properties = {};
     sections.additionalProperties = false;
     if (!facets) {
@@ -239,11 +394,11 @@ function addHeaderSections(generateParameters, appSchema, entityType, v4Page) {
         addSection(generateParameters, facets, facetKey, sections, appSchema, v4_1.SectionType.HeaderSection, v4Page);
     }
     //delete generic definitions
-    delete appSchema['definitions']['ObjectPageHeaderSectionForm'];
-    delete appSchema['definitions']['ObjectPageHeaderSectionChart'];
-    delete appSchema['definitions']['ObjectPageHeaderSectionDataPoint'];
-    delete appSchema['definitions']['ObjectPageHeaderSectionContact'];
-    delete appSchema['definitions']['ObjectPageHeaderSectionAddress'];
+    delete appSchema.definitions[v4_1.DefinitionName.ObjectPageHeaderSectionForm];
+    delete appSchema.definitions[v4_1.DefinitionName.ObjectPageHeaderSectionChart];
+    delete appSchema.definitions[v4_1.DefinitionName.ObjectPageHeaderSectionDataPoint];
+    delete appSchema.definitions[v4_1.DefinitionName.ObjectPageHeaderSectionContact];
+    delete appSchema.definitions[v4_1.DefinitionName.ObjectPageHeaderSectionAddress];
 }
 /**
  * Adds the related facets keys 'enum' to the app schema
@@ -279,7 +434,7 @@ function addRelatedFacetKeysType(generateParameters, schema, entityType, entityS
                 });
             }
             // Update schema definition
-            common_2.addDefinitionForRelatedFacetKeys(schema, ['ObjectPageCustomSectionFragment'], facetSections, [
+            common_2.addDefinitionForRelatedFacetKeys(schema, [v4_1.DefinitionName.ObjectPageCustomSectionFragment], facetSections, [
                 'ID',
                 'label',
                 'key'
@@ -299,7 +454,7 @@ function addHeader(generateParameters, appSchema, entityType, v4Page) {
     // Add header actions
     common_2.addHeaderActions(appSchema, entityType, generateParameters === null || generateParameters === void 0 ? void 0 : generateParameters.serviceAVT, addHeaderActionCallBackV4);
     // Add header sections
-    appSchema['definitions']['HeaderSections'][v4_1.SchemaTag.annotationPath] = `/${entityType.fullyQualifiedName}/@${"com.sap.vocabularies.UI.v1.HeaderFacets" /* HeaderFacets */}`;
+    appSchema.definitions[v4_1.DefinitionName.HeaderSections][v4_1.SchemaTag.annotationPath] = `/${entityType.fullyQualifiedName}/@${"com.sap.vocabularies.UI.v1.HeaderFacets" /* HeaderFacets */}`;
     addHeaderSections(generateParameters, appSchema, entityType, v4Page);
 }
 /**
@@ -315,8 +470,8 @@ function generateObjectPageSchemaV4(generateParameters, genericSchema, entityTyp
     var _a, _b;
     const appSchema = JSON.parse(JSON.stringify(genericSchema));
     // Change reference to generated sections
-    appSchema['properties']['sections'] = {
-        $ref: common_2.DEFINITION_LINK_PREFIX + 'Sections'
+    appSchema.properties.sections = {
+        $ref: `${common_2.DEFINITION_LINK_PREFIX}${v4_1.DefinitionName.Sections}`
     };
     const entitySet = (_b = (_a = generateParameters === null || generateParameters === void 0 ? void 0 : generateParameters.serviceAVT) === null || _a === void 0 ? void 0 : _a.entitySets) === null || _b === void 0 ? void 0 : _b.find((es) => es.entityType.name === entityTypeName);
     if (!entitySet) {
@@ -341,13 +496,13 @@ function generateObjectPageSchemaV4(generateParameters, genericSchema, entityTyp
         return appSchema;
     }
     //initialize sections
-    appSchema['definitions']['Sections'] = {
+    const sections = (appSchema.definitions[v4_1.DefinitionName.Sections] = {
         type: 'object',
         properties: {},
         additionalProperties: false,
-        isViewNode: true,
-        description: 'Sections'
-    };
+        description: v4_1.DefinitionName.Sections
+    });
+    sections[v4_1.SchemaTag.isViewNode] = true;
     if (entitySet) {
         const pages = generateParameters.manifest[common_1.ManifestSection.ui5].routing.targets;
         if (!pages) {
@@ -368,7 +523,8 @@ function generateObjectPageSchemaV4(generateParameters, genericSchema, entityTyp
         // Add Header
         addHeader(generateParameters, appSchema, entityType, v4Page);
         // Add sections
-        appSchema['definitions']['Sections'][v4_1.SchemaTag.annotationPath] = `/${entitySet.entityType.fullyQualifiedName}/@${"com.sap.vocabularies.UI.v1.Facets" /* Facets */}`;
+        sections[v4_1.SchemaTag.isViewNode] = true;
+        sections[v4_1.SchemaTag.annotationPath] = `/${entitySet.entityType.fullyQualifiedName}/@${"com.sap.vocabularies.UI.v1.Facets" /* Facets */}`;
         addSections(generateParameters, appSchema, entityType, v4Page);
         // Custom Section facets
         addRelatedFacetKeysType(generateParameters, appSchema, entityType, entitySet.name, pages);
@@ -376,20 +532,23 @@ function generateObjectPageSchemaV4(generateParameters, genericSchema, entityTyp
         common_2.addFooterActions(appSchema, entityType, generateParameters === null || generateParameters === void 0 ? void 0 : generateParameters.serviceAVT);
     }
     // Delete generic definitions from schema
-    delete appSchema['definitions']['GenericSections'];
-    delete appSchema['definitions']['ObjectPageSubSections'];
-    delete appSchema['definitions']['ObjectPageTable'];
-    delete appSchema['definitions']['GenericColumnsOP'];
-    delete appSchema['definitions']['CommonHeaderFacetSettings'];
-    delete appSchema['definitions']['ObjectPageSectionTableV4'];
-    delete appSchema['definitions']['ObjectPageSectionForm'];
-    delete appSchema['definitions']['ObjectPageSectionDataPoint'];
-    delete appSchema['definitions']['ObjectPageSectionAddress'];
-    delete appSchema['definitions']['ObjectPageSectionContact'];
-    delete appSchema['definitions']['ObjectPageToolBar'];
-    delete appSchema['definitions']['ObjectPageToolBarActions'];
-    delete appSchema['definitions']['ObjectPageToolBarAction'];
-    delete appSchema['definitions']['QuickVariantSelectionV4OP'];
+    delete appSchema.definitions[v4_1.DefinitionName.CommonHeaderFacetSettings];
+    delete appSchema.definitions[v4_1.DefinitionName.GenericColumnsOP];
+    delete appSchema.definitions[v4_1.DefinitionName.GenericSections];
+    delete appSchema.definitions[v4_1.DefinitionName.ObjectPageChart];
+    delete appSchema.definitions[v4_1.DefinitionName.ObjectPageSectionAddress];
+    delete appSchema.definitions[v4_1.DefinitionName.ObjectPageSectionChart];
+    delete appSchema.definitions[v4_1.DefinitionName.ObjectPageSectionContact];
+    delete appSchema.definitions[v4_1.DefinitionName.ObjectPageSectionDataPoint];
+    delete appSchema.definitions[v4_1.DefinitionName.ObjectPageSectionForm];
+    delete appSchema.definitions[v4_1.DefinitionName.ObjectPageSectionTableV4];
+    delete appSchema.definitions[v4_1.DefinitionName.ObjectPageSectionPresentationVariant];
+    delete appSchema.definitions[v4_1.DefinitionName.ObjectPageSubSections];
+    delete appSchema.definitions[v4_1.DefinitionName.ObjectPageTable];
+    delete appSchema.definitions[v4_1.DefinitionName.ObjectPageToolBar];
+    delete appSchema.definitions[v4_1.DefinitionName.ObjectPageToolBarAction];
+    delete appSchema.definitions[v4_1.DefinitionName.ObjectPageToolBarActions];
+    delete appSchema.definitions[v4_1.DefinitionName.QuickVariantSelectionV4OP];
     return appSchema;
 }
 exports.generateObjectPageSchemaV4 = generateObjectPageSchemaV4;