@sap/ux-specification 1.84.51 → 1.84.53

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

@@ -9,6 +9,7 @@ const extensionLogger_1 = require("../../../extensionLogger");
 const ux_specification_types_1 = require("@sap/ux-specification-types");
 const common_1 = require("../../common");
 const utils_1 = require("../utils/utils");
+const StableIdHelper_1 = require("../utils/StableIdHelper");
 /**
  * Callback for adding a single action to headerActions of V4
  * @param {EntityType} entityType - current entity type
@@ -21,50 +22,31 @@ function addHeaderActionCallBackV4(entityType, appSchema, actionAnnotation, head
     return (item, index) => {
         if ((!item['Determining'] && item.$Type === "com.sap.vocabularies.UI.v1.DataFieldForAction" /* DataFieldForAction */) ||
             item.$Type === "com.sap.vocabularies.UI.v1.DataFieldForIntentBasedNavigation" /* DataFieldForIntentBasedNavigation */) {
-            const action = common_1.replaceAlias(item.Action, oDataServiceAVT);
-            const { actionName, actionId } = common_1.getActionNameAndId(action, entityType);
+            const { actionName, actionId, namespace } = common_1.getActionNameAndId(item, oDataServiceAVT);
+            if (!actionId) {
+                return;
+            }
+            const stableId = StableIdHelper_1.getStableIdPartFromDataField(item);
+            //stableId is used as key in V4, as the DataFieldForAction:: prefix shall be present in manifest settings
             const convertedIdentification = actionAnnotation.fullyQualifiedName.replace(`@${"com.sap.vocabularies.UI.v1.Identification" /* Identification */}`, `/@${"com.sap.vocabularies.UI.v1.Identification" /* Identification */}`);
-            const actionDefinitionKey = `HeaderAction<${common_1.prepareRef(actionId)}>`;
+            const actionDefinitionKey = `HeaderAction<${common_1.prepareRef(stableId)}>`;
             const headerAction = (appSchema.definitions[actionDefinitionKey] = {
                 type: 'object',
                 properties: {},
                 description: item.Label || actionName
             });
-            headerAction[common_1.SchemaTag.isViewNode] = true;
-            headerAction[common_1.SchemaTag.annotationPath] = `/${convertedIdentification}/${index}`;
-            headerActions.properties[actionId] = {
+            headerAction[ux_specification_types_1.SchemaTag.isViewNode] = true;
+            headerAction[ux_specification_types_1.SchemaTag.keys] = [{ name: ux_specification_types_1.SchemaKeyName.action, value: actionName }];
+            if (namespace) {
+                appSchema.definitions[actionDefinitionKey][ux_specification_types_1.SchemaTag.target] = namespace;
+            }
+            headerAction[ux_specification_types_1.SchemaTag.annotationPath] = `/${convertedIdentification}/${index}`;
+            headerActions.properties[stableId] = {
                 $ref: `${common_1.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_1.createDefaultSection(appSchema, facet, facetKey));
-    collectionFacet.properties = {
-        subsections: {
-            additionalProperties: false,
-            type: 'object',
-            properties: {},
-            description: 'Subsections'
-        }
-    };
-    const subSections = collectionFacet.properties.subsections;
-    subSections[common_1.SchemaTag.annotationPath] = facet.annotationPath;
-    subSections[common_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 {FacetConfig} facet - the given facet from the UI annotations
@@ -79,20 +61,20 @@ function handleLineItem(facet, facetKey, appSchema, lineItemFacet, oDataServiceA
     const lineItemId = common_1.getFacetKeyInSchema(facetKey);
     const index = facetKey.lastIndexOf('::');
     const annotation = index > -1 ? facetKey.substring(index + 2) : facetKey;
-    const tableDefinition = common_1.parseSchemaDefinition(common_1.DefinitionName.ObjectPageTable, facetKey, appSchema);
+    const tableDefinition = common_1.parseSchemaDefinition(ux_specification_types_1.DefinitionName.ObjectPageTable, facetKey, appSchema);
     if (facet.entityType && annotation) {
-        tableDefinition[common_1.SchemaTag.annotationPath] = `/${facet.entityType.fullyQualifiedName}/${annotation}`;
+        tableDefinition[ux_specification_types_1.SchemaTag.annotationPath] = `/${facet.entityType.fullyQualifiedName}/${annotation}`;
     }
     tableDefinition.properties.columns = {
         $ref: `${common_1.DEFINITION_LINK_PREFIX}${lineItemId}`
     };
-    tableDefinition.properties.toolBar.$ref = common_1.getFacetDefinitionLink(common_1.DefinitionName.ObjectPageToolBar, facetKey);
+    tableDefinition.properties.toolBar.$ref = common_1.getFacetDefinitionLink(ux_specification_types_1.DefinitionName.ObjectPageToolBar, facetKey);
     //adjust quickVariantSelection
-    tableDefinition.properties.quickVariantSelection.$ref = common_1.getFacetDefinitionLink(common_1.DefinitionName.QuickVariantSelectionV4OP, facetKey);
-    const tableQVS = common_1.parseSchemaDefinition(common_1.DefinitionName.QuickVariantSelectionV4OP, facetKey, appSchema);
-    tableQVS.properties.paths['items'].$ref = common_1.getFacetDefinitionLink(common_1.DefinitionName.AnnotationPathAsObject, facetKey);
-    common_1.parseSchemaDefinition(common_1.DefinitionName.AnnotationPathAsObject, facetKey, appSchema);
-    common_1.addEnumForSingleTabVariant(facet.entityType, appSchema, `${common_1.DefinitionName.AnnotationPathAsObject}<${lineItemId}>`);
+    tableDefinition.properties.quickVariantSelection.$ref = common_1.getFacetDefinitionLink(ux_specification_types_1.DefinitionName.QuickVariantSelectionV4OP, facetKey);
+    const tableQVS = common_1.parseSchemaDefinition(ux_specification_types_1.DefinitionName.QuickVariantSelectionV4OP, facetKey, appSchema);
+    tableQVS.properties.paths['items'].$ref = common_1.getFacetDefinitionLink(ux_specification_types_1.DefinitionName.AnnotationPathAsObject, facetKey);
+    common_1.parseSchemaDefinition(ux_specification_types_1.DefinitionName.AnnotationPathAsObject, facetKey, appSchema);
+    common_1.addEnumForSingleTabVariant(facet.entityType, appSchema, `${ux_specification_types_1.DefinitionName.AnnotationPathAsObject}<${lineItemId}>`);
     const dataForLineItem = {
         appSchema,
         lineItemAnnotation: lineItemFacet['target'],
@@ -100,7 +82,7 @@ function handleLineItem(facet, facetKey, appSchema, lineItemFacet, oDataServiceA
         oDataServiceAVT,
         lineItemId
     };
-    utils_1.addLineItemsTypeToSchema(dataForLineItem, common_1.DefinitionName.ObjectPageTableColumn);
+    utils_1.addLineItemsTypeToSchema(dataForLineItem, ux_specification_types_1.DefinitionName.ObjectPageTableColumn);
     return tableDefinition;
 }
 /**
@@ -117,31 +99,33 @@ function handleLineItem(facet, facetKey, appSchema, lineItemFacet, oDataServiceA
 function handleSectionTable(facet, facetKey, appSchema, lineItemFacet, generateParameters, sections) {
     if (sections) {
         sections.properties[facetKey] = {
-            $ref: common_1.getFacetDefinitionLink(common_1.DefinitionName.ObjectPageSectionTableV4, facetKey)
+            $ref: common_1.getFacetDefinitionLink(ux_specification_types_1.DefinitionName.ObjectPageSectionTableV4, facetKey)
         };
     }
-    const sectionTable = common_1.parseSchemaDefinition(common_1.DefinitionName.ObjectPageSectionTableV4, facetKey, appSchema);
+    const sectionTable = common_1.parseSchemaDefinition(ux_specification_types_1.DefinitionName.ObjectPageSectionTableV4, facetKey, appSchema);
     common_1.addSectionTitleAndDescription(facet, sectionTable, common_1.getFacetKeyInSchema(facetKey));
-    sectionTable[common_1.SchemaTag.annotationPath] = facet.annotationPath;
-    sectionTable.properties.table['$ref'] = common_1.getFacetDefinitionLink(common_1.DefinitionName.ObjectPageTable, facetKey);
+    sectionTable[ux_specification_types_1.SchemaTag.annotationPath] = facet.annotationPath;
+    sectionTable[ux_specification_types_1.SchemaTag.target] = facet.namespace;
+    sectionTable.properties.table['$ref'] = common_1.getFacetDefinitionLink(ux_specification_types_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 {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 {FacetConfig} facet - current facet
+ * @param {v4.SapUiAppPageV4} v4Page Current page in manifest
+ * @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
  */
 function handleFormIdentification(facet, facetKey, sections, appSchema, sectionPrefix) {
     let definitionType;
     if (sectionPrefix === ux_specification_types_1.SectionType.Section) {
-        definitionType = common_1.DefinitionName.ObjectPageSectionForm;
+        definitionType = ux_specification_types_1.DefinitionName.ObjectPageSectionForm;
     }
     else if (sectionPrefix === ux_specification_types_1.SectionType.HeaderSection) {
-        definitionType = common_1.DefinitionName.ObjectPageHeaderSectionForm;
+        definitionType = ux_specification_types_1.DefinitionName.ObjectPageHeaderSectionForm;
     }
     sections['properties'][facetKey] = {
         $ref: common_1.getFacetDefinitionLink(definitionType, facetKey)
@@ -151,10 +135,10 @@ function handleFormIdentification(facet, facetKey, sections, appSchema, sectionP
         formSection.properties = {};
     }
     common_1.addSectionTitleAndDescription(facet, formSection, facetKey);
-    formSection[common_1.SchemaTag.annotationPath] = facet.annotationPath;
-    formSection[common_1.SchemaTag.isViewNode] = true;
-    const withActions = facet.base === common_1.FacetBase.Identification && facetKey.indexOf('#') < 0 ? false : true;
-    common_1.handleForm(sectionPrefix, facet, formSection, appSchema, ux_specification_types_1.FioriElementsVersion.v4, withActions);
+    formSection[ux_specification_types_1.SchemaTag.annotationPath] = facet.annotationPath;
+    formSection[ux_specification_types_1.SchemaTag.target] = facet.namespace;
+    formSection[ux_specification_types_1.SchemaTag.isViewNode] = true;
+    common_1.handleForm(sectionPrefix, facet, formSection, appSchema, ux_specification_types_1.FioriElementsVersion.v4, facetKey);
 }
 /**
  * Adds definitions for header sections (DataPoint, Chart) in object page sections to the app schema
@@ -168,11 +152,12 @@ function handleHeaderFacet(facet, facetKey, sections, appSchema, facetDefinition
     sections['properties'][facetKey] = {
         $ref: `${common_1.DEFINITION_LINK_PREFIX}${facetDefinitionKey}`
     };
-    const sectionFacet = common_1.parseSchemaDefinition(common_1.DefinitionName.CommonHeaderFacetSettings, facetDefinitionKey, appSchema, false);
+    const sectionFacet = common_1.parseSchemaDefinition(ux_specification_types_1.DefinitionName.CommonHeaderFacetSettings, facetDefinitionKey, appSchema, false);
     common_1.addTargetTitleAndSectionDescription(facet, sectionFacet, facetKey);
-    sectionFacet[common_1.SchemaTag.annotationPath] = facet.annotationPath;
-    sectionFacet[common_1.SchemaTag.dataType] = common_1.determineDataTypeOfTarget(facet?.target);
-    sectionFacet[common_1.SchemaTag.isViewNode] = true;
+    sectionFacet[ux_specification_types_1.SchemaTag.annotationPath] = facet.annotationPath;
+    sectionFacet[ux_specification_types_1.SchemaTag.target] = facet.namespace;
+    sectionFacet[ux_specification_types_1.SchemaTag.dataType] = common_1.determineDataTypeOfTarget(facet?.target);
+    sectionFacet[ux_specification_types_1.SchemaTag.isViewNode] = true;
 }
 /**
  * Adds definitions for Chart items in object page sections to the app schema
@@ -182,24 +167,24 @@ function handleHeaderFacet(facet, facetKey, sections, appSchema, facetDefinition
  * @param {EntityType} entityType - current entity type
  */
 function handleChartActions(facet, facetKey, appSchema, entityType) {
-    const actions = common_1.parseSchemaDefinition(common_1.DefinitionName.ObjectPageToolBarActions, facetKey, appSchema);
+    const actions = common_1.parseSchemaDefinition(ux_specification_types_1.DefinitionName.ObjectPageToolBarActions, facetKey, appSchema);
     actions.additionalProperties = false;
     actions.properties = {};
     if (facet.Actions) {
         let i = 0;
         facet.Actions.forEach((actionRecord) => {
             const description = common_1.getDataFieldDescription(actionRecord, entityType);
-            const prefix = actionRecord.$Type.split(common_1.UIVOCABULARYDOT)[1];
+            const prefix = actionRecord.$Type.split(ux_specification_types_1.UIVOCABULARYDOT)[1];
             const actionId = actionRecord.Action.replace('/', '??');
             const toolBarActionsProperty = (actions.properties[`${prefix}::${actionRecord.Action}`] = {
-                $ref: common_1.getFacetDefinitionLink(common_1.DefinitionName.ObjectPageToolBarAction, actionId),
+                $ref: common_1.getFacetDefinitionLink(ux_specification_types_1.DefinitionName.ObjectPageToolBarAction, actionId),
                 description
             });
-            toolBarActionsProperty[common_1.SchemaTag.propertyIndex] = i;
-            toolBarActionsProperty[common_1.SchemaTag.annotationType] = actionRecord.$Type;
-            const toolBarAction = common_1.parseSchemaDefinition(common_1.DefinitionName.ObjectPageToolBarAction, common_1.prepareRef(actionId), appSchema);
-            toolBarAction[common_1.SchemaTag.annotationPath] = common_1.getFacetAnnotationPath(actionRecord);
-            toolBarAction[common_1.SchemaTag.dataType] = common_1.determineDataType(actionRecord);
+            toolBarActionsProperty[ux_specification_types_1.SchemaTag.propertyIndex] = i;
+            toolBarActionsProperty[ux_specification_types_1.SchemaTag.annotationType] = actionRecord.$Type;
+            const toolBarAction = common_1.parseSchemaDefinition(ux_specification_types_1.DefinitionName.ObjectPageToolBarAction, common_1.prepareRef(actionId), appSchema);
+            toolBarAction[ux_specification_types_1.SchemaTag.annotationPath] = common_1.getFacetAnnotationPath(actionRecord);
+            toolBarAction[ux_specification_types_1.SchemaTag.dataType] = common_1.determineDataType(actionRecord);
             toolBarAction.properties = {};
             i++;
         });
@@ -214,16 +199,16 @@ function handleChartActions(facet, facetKey, appSchema, entityType) {
  * @param {EntityType} entityType - current entity type
  */
 function handleChart(facet, facetKey, appSchema, entityType) {
-    const chart = common_1.parseSchemaDefinition(common_1.DefinitionName.ObjectPageChart, facetKey, appSchema);
+    const chart = common_1.parseSchemaDefinition(ux_specification_types_1.DefinitionName.ObjectPageChart, facetKey, appSchema);
     if (facet['Title']) {
         chart.description = facet['Title'];
     }
-    chart[common_1.SchemaTag.annotationPath] = common_1.getFacetAnnotationPath(facet);
-    chart[common_1.SchemaTag.dataType] = common_1.determineDataTypeOfTarget(facet.target || facet);
-    chart[common_1.SchemaTag.isViewNode] = true;
-    chart.properties.toolBar['$ref'] = common_1.getFacetDefinitionLink(common_1.DefinitionName.ObjectPageToolBar, facetKey);
-    const chartToolBar = common_1.parseSchemaDefinition(common_1.DefinitionName.ObjectPageToolBar, facetKey, appSchema);
-    chartToolBar.properties.actions['$ref'] = common_1.getFacetDefinitionLink(common_1.DefinitionName.ObjectPageToolBarActions, facetKey);
+    chart[ux_specification_types_1.SchemaTag.annotationPath] = common_1.getFacetAnnotationPath(facet);
+    chart[ux_specification_types_1.SchemaTag.dataType] = common_1.determineDataTypeOfTarget(facet.target || facet);
+    chart[ux_specification_types_1.SchemaTag.isViewNode] = true;
+    chart.properties.toolBar['$ref'] = common_1.getFacetDefinitionLink(ux_specification_types_1.DefinitionName.ObjectPageToolBar, facetKey);
+    const chartToolBar = common_1.parseSchemaDefinition(ux_specification_types_1.DefinitionName.ObjectPageToolBar, facetKey, appSchema);
+    chartToolBar.properties.actions['$ref'] = common_1.getFacetDefinitionLink(ux_specification_types_1.DefinitionName.ObjectPageToolBarActions, facetKey);
     const chartActions = handleChartActions(facet, facetKey, appSchema, entityType);
     return { chart, chartActions };
 }
@@ -238,13 +223,13 @@ function handleChart(facet, facetKey, appSchema, entityType) {
 function handleSectionChart(facet, facetKey, appSchema, sections, entityType = facet.entityType) {
     if (sections) {
         sections.properties[facetKey] = {
-            $ref: common_1.getFacetDefinitionLink(common_1.DefinitionName.ObjectPageSectionChart, facetKey)
+            $ref: common_1.getFacetDefinitionLink(ux_specification_types_1.DefinitionName.ObjectPageSectionChart, facetKey)
         };
     }
-    const sectionChart = common_1.parseSchemaDefinition(common_1.DefinitionName.ObjectPageSectionChart, facetKey, appSchema);
+    const sectionChart = common_1.parseSchemaDefinition(ux_specification_types_1.DefinitionName.ObjectPageSectionChart, facetKey, appSchema);
     common_1.addTargetTitleAndSectionDescription(facet, sectionChart, facetKey);
-    sectionChart[common_1.SchemaTag.annotationPath] = common_1.getFacetAnnotationPath(facet);
-    sectionChart.properties.chart['$ref'] = common_1.getFacetDefinitionLink(common_1.DefinitionName.ObjectPageChart, facetKey);
+    sectionChart[ux_specification_types_1.SchemaTag.annotationPath] = common_1.getFacetAnnotationPath(facet);
+    sectionChart.properties.chart['$ref'] = common_1.getFacetDefinitionLink(ux_specification_types_1.DefinitionName.ObjectPageChart, facetKey);
     const { chart, chartActions } = handleChart(facet.target || facet, facetKey, appSchema, entityType);
     return { sectionChart, chart, chartActions };
 }
@@ -276,31 +261,33 @@ function handleSectionPresentationVariant(facet, facetKey, appSchema, sections,
                 return prop.name === navPath;
             });
             const targetType = navigationProp.targetType;
-            target = targetType.annotations.UI[visualizationKey.split(common_1.UIVOCABULARYDOT)[1]];
+            target = targetType.annotations.UI[visualizationKey.split(ux_specification_types_1.UIVOCABULARYDOT)[1]];
         }
     }
     if (facetTarget) {
-        const visualizationType = visualizationKey.split(common_1.UIVOCABULARYDOT)[1];
-        const namespace = facet.target[common_1.SchemaTag.fullyQualifiedName].split('@')[0];
+        const visualizationType = visualizationKey.split(ux_specification_types_1.UIVOCABULARYDOT)[1];
+        const namespace = facet.target[ux_specification_types_1.SchemaTag.fullyQualifiedName].split('@')[0];
         const fullVisualizationKey = navPath ? `${navPath}::${visualizationKey}` : visualizationKey;
         if (visualizationType.startsWith(ux_specification_types_1.Visualization.Chart)) {
             sections.properties[`${facetKey}<${visualizationKey}>`] = {
-                $ref: common_1.getFacetDefinitionLink(common_1.DefinitionName.ObjectPageSectionChart, fullVisualizationKey)
+                $ref: common_1.getFacetDefinitionLink(ux_specification_types_1.DefinitionName.ObjectPageSectionChart, fullVisualizationKey)
             };
             const { sectionChart, chart } = handleSectionChart(facetTarget, fullVisualizationKey, appSchema, undefined, facet.entityType);
-            sectionChart[common_1.SchemaTag.annotationPath] = facet.annotationPath;
+            sectionChart[ux_specification_types_1.SchemaTag.annotationPath] = facet.annotationPath;
             common_1.addTargetTitleAndSectionDescription(facet, sectionChart, facetKey);
-            chart[common_1.SchemaTag.annotationPath] = `/${namespace}/${visualizationKey}`;
+            chart[ux_specification_types_1.SchemaTag.annotationPath] = `/${namespace}/${visualizationKey}`;
+            chart[ux_specification_types_1.SchemaTag.target] = namespace;
         }
         else if (visualizationType.startsWith(ux_specification_types_1.Visualization.LineItem)) {
             sections.properties[`${facetKey}<${visualizationKey}>`] = {
-                $ref: common_1.getFacetDefinitionLink(common_1.DefinitionName.ObjectPageSectionTableV4, fullVisualizationKey)
+                $ref: common_1.getFacetDefinitionLink(ux_specification_types_1.DefinitionName.ObjectPageSectionTableV4, fullVisualizationKey)
             };
             const { sectionTable, table } = handleSectionTable(facet, fullVisualizationKey, appSchema, { target, entityType: facet.entityType }, generateParameters);
-            sectionTable[common_1.SchemaTag.annotationPath] = facet.annotationPath;
+            sectionTable[ux_specification_types_1.SchemaTag.annotationPath] = facet.annotationPath;
             common_1.addTargetTitleAndSectionDescription(facet, sectionTable, facetKey);
-            delete sectionTable[common_1.SchemaTag.isViewNode];
-            table[common_1.SchemaTag.annotationPath] = `/${namespace}/${visualizationKey}`;
+            delete sectionTable[ux_specification_types_1.SchemaTag.isViewNode];
+            table[ux_specification_types_1.SchemaTag.annotationPath] = `/${namespace}/${visualizationKey}`;
+            table[ux_specification_types_1.SchemaTag.target] = namespace;
         }
     }
 }
@@ -318,31 +305,31 @@ function addSection(generateParameters, facets, facetKey, sections, appSchema, s
     const facet = facets[facetKey];
     const facetDefinitionKey = `ObjectPage${sectionPrefix}${facet.base}<${common_1.getFacetKeyInSchema(facetKey)}>`;
     switch (facet.base) {
-        case common_1.FacetBase.PresentationVariant: {
+        case ux_specification_types_1.FacetBase.PresentationVariant: {
             handleSectionPresentationVariant(facet, facetKey, appSchema, sections, generateParameters);
             break;
         }
-        case common_1.FacetBase.CollectionFacet: {
+        case ux_specification_types_1.FacetBase.CollectionFacet: {
             handleCollection(facet, facetKey, appSchema, sections, sectionPrefix, generateParameters, v4Page);
             break;
         }
-        case common_1.FacetBase.LineItem: {
+        case ux_specification_types_1.FacetBase.LineItem: {
             if (sectionPrefix === ux_specification_types_1.SectionType.Section) {
                 const lineItemFacet = facets[facetKey];
                 handleSectionTable(facet, facetKey, appSchema, lineItemFacet, generateParameters, sections);
             }
             break;
         }
-        case common_1.FacetBase.Form:
-        case common_1.FacetBase.Identification: {
+        case ux_specification_types_1.FacetBase.Form:
+        case ux_specification_types_1.FacetBase.Identification: {
             handleFormIdentification(facet, facetKey, sections, appSchema, sectionPrefix);
             break;
         }
-        case common_1.FacetBase.DataPoint: {
+        case ux_specification_types_1.FacetBase.DataPoint: {
             handleHeaderFacet(facet, facetKey, sections, appSchema, facetDefinitionKey);
             break;
         }
-        case common_1.FacetBase.Chart: {
+        case ux_specification_types_1.FacetBase.Chart: {
             if (sectionPrefix === ux_specification_types_1.SectionType.HeaderSection) {
                 handleHeaderFacet(facet, facetKey, sections, appSchema, facetDefinitionKey);
             }
@@ -351,8 +338,8 @@ function addSection(generateParameters, facets, facetKey, sections, appSchema, s
             }
             break;
         }
-        case common_1.FacetBase.Address:
-        case common_1.FacetBase.Contact: {
+        case ux_specification_types_1.FacetBase.Address:
+        case ux_specification_types_1.FacetBase.Contact: {
             common_1.handleAddressContact(facet, facetKey, sections, appSchema, sectionPrefix);
             break;
         }
@@ -361,6 +348,40 @@ function addSection(generateParameters, facets, facetKey, sections, appSchema, s
         }
     }
 }
+/**
+ * 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_1.createDefaultSection(appSchema, facet, facetKey));
+    collectionFacet.properties = {
+        subsections: {
+            additionalProperties: false,
+            type: 'object',
+            properties: {},
+            description: 'Subsections'
+        }
+    };
+    const subSections = collectionFacet.properties.subsections;
+    subSections[ux_specification_types_1.SchemaTag.annotationPath] = facet.annotationPath;
+    subSections[ux_specification_types_1.SchemaTag.target] = facet.namespace;
+    subSections[ux_specification_types_1.SchemaTag.keys] = [
+        {
+            name: ux_specification_types_1.SchemaKeyName.id,
+            value: facet.ID
+        }
+    ];
+    subSections[ux_specification_types_1.SchemaTag.isViewNode] = true;
+    for (const key in facet.facets) {
+        addSection(generateParameters, facet.facets, key, subSections, appSchema, sectionPrefix, v4Page);
+    }
+}
 /**
  * Derives the sections from the UI.Facets annotation and adds them to the schema
  * @param {GenerateAppSchemaParameters} generateParameters - list of API input parameters
@@ -371,18 +392,18 @@ function addSections(generateParameters, appSchema, v4Page) {
     // Get facet annotations
     const facets = common_1.getObjectPageFacets(generateParameters.entitySet.entityType, generateParameters.serviceAVT, ux_specification_types_1.FioriElementsVersion.v4, generateParameters.logger);
     if (!facets) {
-        delete appSchema.definitions[common_1.DefinitionName.ObjectPageSubSections];
+        delete appSchema.definitions[ux_specification_types_1.DefinitionName.ObjectPageSubSections];
         return;
     }
-    const sections = appSchema.definitions[common_1.DefinitionName.Sections];
+    const sections = appSchema.definitions[ux_specification_types_1.DefinitionName.Sections];
     for (const facetKey in facets) {
         addSection(generateParameters, facets, facetKey, sections, appSchema, ux_specification_types_1.SectionType.Section, v4Page);
     }
     // Custom sections as part of sections
-    if (appSchema.definitions[common_1.DefinitionName.CustomSections]) {
+    if (appSchema.definitions[ux_specification_types_1.DefinitionName.CustomSections]) {
         sections.properties = {
             ...sections.properties,
-            ...appSchema.definitions[common_1.DefinitionName.CustomSections].properties
+            ...appSchema.definitions[ux_specification_types_1.DefinitionName.CustomSections].properties
         };
     }
 }
@@ -396,7 +417,7 @@ function addSections(generateParameters, appSchema, v4Page) {
 function addHeaderSections(generateParameters, appSchema, entityType, v4Page) {
     // Get facet annotations
     const facets = common_1.getObjectPageHeaderFacets(entityType, generateParameters.serviceAVT, ux_specification_types_1.FioriElementsVersion.v4, generateParameters.logger);
-    const sections = appSchema.definitions[common_1.DefinitionName.HeaderSections];
+    const sections = appSchema.definitions[ux_specification_types_1.DefinitionName.HeaderSections];
     sections.properties = {};
     sections.additionalProperties = false;
     if (!facets) {
@@ -406,11 +427,11 @@ function addHeaderSections(generateParameters, appSchema, entityType, v4Page) {
         addSection(generateParameters, facets, facetKey, sections, appSchema, ux_specification_types_1.SectionType.HeaderSection, v4Page);
     }
     //delete generic definitions
-    delete appSchema.definitions[common_1.DefinitionName.ObjectPageHeaderSectionForm];
-    delete appSchema.definitions[common_1.DefinitionName.ObjectPageHeaderSectionChart];
-    delete appSchema.definitions[common_1.DefinitionName.ObjectPageHeaderSectionDataPoint];
-    delete appSchema.definitions[common_1.DefinitionName.ObjectPageHeaderSectionContact];
-    delete appSchema.definitions[common_1.DefinitionName.ObjectPageHeaderSectionAddress];
+    delete appSchema.definitions[ux_specification_types_1.DefinitionName.ObjectPageHeaderSectionForm];
+    delete appSchema.definitions[ux_specification_types_1.DefinitionName.ObjectPageHeaderSectionChart];
+    delete appSchema.definitions[ux_specification_types_1.DefinitionName.ObjectPageHeaderSectionDataPoint];
+    delete appSchema.definitions[ux_specification_types_1.DefinitionName.ObjectPageHeaderSectionContact];
+    delete appSchema.definitions[ux_specification_types_1.DefinitionName.ObjectPageHeaderSectionAddress];
 }
 /**
  * Adds the related facets keys 'enum' to the app schema
@@ -445,7 +466,7 @@ function addRelatedFacetKeysType(generateParameters, schema, entitySetName, page
                 });
             }
             // Update schema definition
-            common_1.addDefinitionForRelatedFacetKeys(schema, [common_1.DefinitionName.ObjectPageCustomSectionFragment], facetSections, [
+            common_1.addDefinitionForRelatedFacetKeys(schema, [ux_specification_types_1.DefinitionName.ObjectPageCustomSectionFragment], facetSections, [
                 'ID',
                 'label',
                 'key'
@@ -465,7 +486,7 @@ function addHeader(generateParameters, appSchema, v4Page) {
     // Add header actions
     common_1.addHeaderActions(appSchema, entityType, generateParameters.serviceAVT, addHeaderActionCallBackV4);
     // Add header sections
-    appSchema.definitions[common_1.DefinitionName.HeaderSections][common_1.SchemaTag.annotationPath] = `/${entityType.fullyQualifiedName}/@${"com.sap.vocabularies.UI.v1.HeaderFacets" /* HeaderFacets */}`;
+    appSchema.definitions[ux_specification_types_1.DefinitionName.HeaderSections][ux_specification_types_1.SchemaTag.annotationPath] = `/${entityType.fullyQualifiedName}/@${"com.sap.vocabularies.UI.v1.HeaderFacets" /* HeaderFacets */}`;
     addHeaderSections(generateParameters, appSchema, entityType, v4Page);
 }
 /**
@@ -481,7 +502,7 @@ function generateObjectPageSchemaV4(generateParameters, genericSchema, entityTyp
     const appSchema = JSON.parse(JSON.stringify(genericSchema));
     // Change reference to generated sections
     appSchema.properties.sections = {
-        $ref: `${common_1.DEFINITION_LINK_PREFIX}${common_1.DefinitionName.Sections}`
+        $ref: `${common_1.DEFINITION_LINK_PREFIX}${ux_specification_types_1.DefinitionName.Sections}`
     };
     const entitySet = generateParameters.serviceAVT?.entitySets?.find((es) => es.entityType.name === entityTypeName);
     if (!entitySet) {
@@ -489,7 +510,7 @@ function generateObjectPageSchemaV4(generateParameters, genericSchema, entityTyp
             severity: "error" /* Error */,
             message: i18next_1.default.t('NOENTITYSET4NAME', { entityType: entityTypeName }),
             location: {
-                path: common_1.METADATAPATH
+                path: ux_specification_types_1.METADATAPATH
             }
         });
     }
@@ -500,19 +521,19 @@ function generateObjectPageSchemaV4(generateParameters, genericSchema, entityTyp
             severity: "error" /* Error */,
             message: i18next_1.default.t('NOROUTING'),
             location: {
-                path: common_1.MANIFESTPATH
+                path: ux_specification_types_1.MANIFESTPATH
             }
         });
         return appSchema;
     }
     //initialize sections
-    const sections = (appSchema.definitions[common_1.DefinitionName.Sections] = {
+    const sections = (appSchema.definitions[ux_specification_types_1.DefinitionName.Sections] = {
         type: 'object',
         properties: {},
         additionalProperties: false,
-        description: common_1.DefinitionName.Sections
+        description: ux_specification_types_1.DefinitionName.Sections
     });
-    sections[common_1.SchemaTag.isViewNode] = true;
+    sections[ux_specification_types_1.SchemaTag.isViewNode] = true;
     if (entitySet) {
         const pages = generateParameters.manifest[ux_specification_types_1.ManifestSection.ui5].routing
             .targets;
@@ -521,7 +542,7 @@ function generateObjectPageSchemaV4(generateParameters, genericSchema, entityTyp
                 severity: "error" /* Error */,
                 message: i18next_1.default.t('NOPAGES', { appId: generateParameters.manifest['sap.app']['id'] }),
                 location: {
-                    path: common_1.MANIFESTPATH,
+                    path: ux_specification_types_1.MANIFESTPATH,
                     range: [ux_specification_types_1.ManifestSection.generic]
                 }
             });
@@ -534,8 +555,8 @@ function generateObjectPageSchemaV4(generateParameters, genericSchema, entityTyp
         // Add Header
         addHeader(generateParameters, appSchema, v4Page);
         // Add sections
-        sections[common_1.SchemaTag.isViewNode] = true;
-        sections[common_1.SchemaTag.annotationPath] = `/${entitySet.entityType.fullyQualifiedName}/@${"com.sap.vocabularies.UI.v1.Facets" /* Facets */}`;
+        sections[ux_specification_types_1.SchemaTag.isViewNode] = true;
+        sections[ux_specification_types_1.SchemaTag.annotationPath] = `/${entitySet.entityType.fullyQualifiedName}/@${"com.sap.vocabularies.UI.v1.Facets" /* Facets */}`;
         addSections(generateParameters, appSchema, v4Page);
         // Custom Section facets
         addRelatedFacetKeysType(generateParameters, appSchema, entitySet.name, pages);
@@ -543,23 +564,23 @@ function generateObjectPageSchemaV4(generateParameters, genericSchema, entityTyp
         common_1.addFooterActions(appSchema, generateParameters);
     }
     // Delete generic definitions from schema
-    delete appSchema.definitions[common_1.DefinitionName.CommonHeaderFacetSettings];
-    delete appSchema.definitions[common_1.DefinitionName.GenericColumnsOP];
-    delete appSchema.definitions[common_1.DefinitionName.GenericSections];
-    delete appSchema.definitions[common_1.DefinitionName.ObjectPageChart];
-    delete appSchema.definitions[common_1.DefinitionName.ObjectPageSectionAddress];
-    delete appSchema.definitions[common_1.DefinitionName.ObjectPageSectionChart];
-    delete appSchema.definitions[common_1.DefinitionName.ObjectPageSectionContact];
-    delete appSchema.definitions[common_1.DefinitionName.ObjectPageSectionDataPoint];
-    delete appSchema.definitions[common_1.DefinitionName.ObjectPageSectionForm];
-    delete appSchema.definitions[common_1.DefinitionName.ObjectPageSectionTableV4];
-    delete appSchema.definitions[common_1.DefinitionName.ObjectPageSectionPresentationVariant];
-    delete appSchema.definitions[common_1.DefinitionName.ObjectPageSubSections];
-    delete appSchema.definitions[common_1.DefinitionName.ObjectPageTable];
-    delete appSchema.definitions[common_1.DefinitionName.ObjectPageToolBar];
-    delete appSchema.definitions[common_1.DefinitionName.ObjectPageToolBarAction];
-    delete appSchema.definitions[common_1.DefinitionName.ObjectPageToolBarActions];
-    delete appSchema.definitions[common_1.DefinitionName.QuickVariantSelectionV4OP];
+    delete appSchema.definitions[ux_specification_types_1.DefinitionName.CommonHeaderFacetSettings];
+    delete appSchema.definitions[ux_specification_types_1.DefinitionName.GenericColumnsOP];
+    delete appSchema.definitions[ux_specification_types_1.DefinitionName.GenericSections];
+    delete appSchema.definitions[ux_specification_types_1.DefinitionName.ObjectPageChart];
+    delete appSchema.definitions[ux_specification_types_1.DefinitionName.ObjectPageSectionAddress];
+    delete appSchema.definitions[ux_specification_types_1.DefinitionName.ObjectPageSectionChart];
+    delete appSchema.definitions[ux_specification_types_1.DefinitionName.ObjectPageSectionContact];
+    delete appSchema.definitions[ux_specification_types_1.DefinitionName.ObjectPageSectionDataPoint];
+    delete appSchema.definitions[ux_specification_types_1.DefinitionName.ObjectPageSectionForm];
+    delete appSchema.definitions[ux_specification_types_1.DefinitionName.ObjectPageSectionTableV4];
+    delete appSchema.definitions[ux_specification_types_1.DefinitionName.ObjectPageSectionPresentationVariant];
+    delete appSchema.definitions[ux_specification_types_1.DefinitionName.ObjectPageSubSections];
+    delete appSchema.definitions[ux_specification_types_1.DefinitionName.ObjectPageTable];
+    delete appSchema.definitions[ux_specification_types_1.DefinitionName.ObjectPageToolBar];
+    delete appSchema.definitions[ux_specification_types_1.DefinitionName.ObjectPageToolBarAction];
+    delete appSchema.definitions[ux_specification_types_1.DefinitionName.ObjectPageToolBarActions];
+    delete appSchema.definitions[ux_specification_types_1.DefinitionName.QuickVariantSelectionV4OP];
     return appSchema;
 }
 exports.generateObjectPageSchemaV4 = generateObjectPageSchemaV4;