@sap/ux-specification 1.71.45 → 1.71.49

package/dist/src/sync/v2/generate/listReport.d.ts

@@ -1,4 +1,12 @@
 import { GenerateAppSchemaParameters } from '../../../v2';
+import { ConverterOutput, EntityType } from '@sap-ux/vocabularies-types';
+/**
+ * Adds the enum types for QuickVariant and QuickVariantX, based on the entity type annotations
+ * @param {EntityType} entityType
+ * @param appSchema - app specific JSON schema
+ * @param {ConverterOutput} oDataServiceAVT - combined service metadata, as returned by annotation vocabularies tools
+ */
+export declare function addEnumForVariantPaths(entityType: EntityType, appSchema: object, oDataServiceAVT: ConverterOutput): void;
 /**
  * Generates an app specific schema for the FE V2 Listreport from the generic schema.
  * Generic types are replaced by information from the app specific annotations.

package/dist/src/sync/v2/generate/listReport.js

@@ -8,8 +8,21 @@ const import_1 = require("../import");
 const common_1 = require("../../common");
 const i18next_1 = __importDefault(require("i18next"));
 const i18n_1 = require("../../../i18n/i18n");
-const v2_1 = require("../../../v2");
 const types_1 = require("../types");
+const v2_1 = require("../../../v2");
+const extensionLogger_1 = require("../../../extensionLogger");
+/**
+ * Adds the enum types for QuickVariant and QuickVariantX, based on the entity type annotations
+ * @param {EntityType} entityType
+ * @param appSchema - app specific JSON schema
+ * @param {ConverterOutput} oDataServiceAVT - combined service metadata, as returned by annotation vocabularies tools
+ */
+function addEnumForVariantPaths(entityType, appSchema, oDataServiceAVT) {
+    common_1.addEnumForSingleTabVariant(entityType, appSchema, 'QuickVariant');
+    common_1.addEnumForMultiTabVariant(oDataServiceAVT, appSchema, 'QuickVariantX');
+    common_1.addEnumForVariantEntitySet(oDataServiceAVT, appSchema, 'QuickVariantX');
+}
+exports.addEnumForVariantPaths = addEnumForVariantPaths;
 /**
  * Generates an app specific schema for the FE V2 Listreport from the generic schema.
  * Generic types are replaced by information from the app specific annotations.
@@ -47,9 +60,9 @@ function generateListReportSchemaV2(generateParameters, genericSchema, entityTyp
     appSchema['definitions'][types_1.ANALYTICALTABLE].properties.toolBar.$ref = lrToolBar;
     appSchema['definitions'][types_1.GRIDTABLE] = gridTableDefinition;
     appSchema['definitions'][types_1.GRIDTABLE].properties.toolBar.$ref = lrToolBar;
-    const entityType = generateParameters.serviceAVT.entityTypes.find((et) => et.name === entityTypeName);
+    const entityType = generateParameters === null || generateParameters === void 0 ? void 0 : generateParameters.serviceAVT.entityTypes.find((et) => et.name === entityTypeName);
     if (!entityType) {
-        v2_1.log(generateParameters.logger, {
+        extensionLogger_1.log(generateParameters.logger, {
             severity: "error" /* Error */,
             message: i18next_1.default.t('NOENTITYTYPE', { entityType: entityTypeName }),
             location: {
@@ -64,7 +77,7 @@ function generateListReportSchemaV2(generateParameters, genericSchema, entityTyp
         const pageKeys = [];
         const v2Page = import_1.findListReportPageV2(generateParameters.manifest[v2_1.ManifestSection.generic].pages, pageKeys);
         if (!v2Page) {
-            v2_1.log(generateParameters.logger, {
+            extensionLogger_1.log(generateParameters.logger, {
                 severity: "error" /* Error */,
                 message: i18next_1.default.t('NOALP'),
                 location: {
@@ -75,6 +88,7 @@ function generateListReportSchemaV2(generateParameters, genericSchema, entityTyp
             return;
         }
         utils_1.addListReportColumnExtensions(appSchema, entityType, v2Page, generateParameters.manifest, generateParameters.fragments);
+        addEnumForVariantPaths(entityType, appSchema, generateParameters.serviceAVT);
         //Delete generic definitions
         delete appSchema['definitions']['ResponsiveTableWithMultiSelect'];
         delete appSchema['definitions']['ResponsiveTableWithInlineDelete'];

package/dist/src/sync/v2/generate/listReport.js.map

@@ -1 +1 @@
-{"version":3,"file":"listReport.js","sourceRoot":"","sources":["../../../../../src/sync/v2/generate/listReport.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"listReport.js","sourceRoot":"","sources":["../../../../../src/sync/v2/generate/listReport.ts"],"names":[],"mappings":"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"}

package/dist/src/sync/v2/generate/objectPage.d.ts

@@ -5,7 +5,6 @@ export interface ObjectPageSectionData {
 }
 /**
  * Generates an app specific schema out of the generic schema.
- * Generic types are replaced by information from the app specific annotations.
  * @param {GenerateSchemaParameters} generateParameters - list of API input parameters
  * @param genericSchema - generic JSON schema of an object page
  * @param entityTypeName - the base entity type of the given page

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

@@ -7,6 +7,7 @@ const common_1 = require("../../common");
 const utils_1 = require("./utils");
 const import_1 = require("../import");
 const v2_1 = require("../../../v2");
+const extensionLogger_1 = require("../../../extensionLogger");
 const common_2 = require("../../../specification/common");
 const i18next_1 = __importDefault(require("i18next"));
 const i18n_1 = require("../../../i18n/i18n");
@@ -60,7 +61,7 @@ function addHeaderActionCallBackV2(entityType, appSchema, actionAnnotation, head
             const action = common_1.replaceAlias(item.Action, oDataServiceAVT);
             const { actionName, actionId } = common_1.getActionNameAndId(action, entityType);
             const description = item.Label || actionName;
-            const actionDefinitionKey = `HeaderAction<${actionId}>`;
+            const actionDefinitionKey = `HeaderAction<${common_1.prepareRef(actionId)}>`;
             appSchema['definitions'][actionDefinitionKey] = JSON.parse(JSON.stringify(appSchema['definitions']['HeaderAction']));
             const convertedIdentification = actionAnnotation.fullyQualifiedName.replace(`@${"com.sap.vocabularies.UI.v1.Identification" /* Identification */}`, `/@${"com.sap.vocabularies.UI.v1.Identification" /* Identification */}`);
             appSchema['definitions'][actionDefinitionKey].annotationPath = `/${convertedIdentification}/${index}`;
@@ -78,14 +79,31 @@ function addHeaderActionCallBackV2(entityType, appSchema, actionAnnotation, head
  * @param {string} entitySetName Entity set name.
  * @param {string} entityTypeName Entity type name.
  * @param {ConverterOutput} oDataServiceAVT Complete service information, as returned by annotation vocabularies tool
+ * @param {FacetConfig} facet information
+ * @param {string} facetKey - key of the facet, as listed in FacetConfigs
  * @param {FileData[]} [fragments] Array with XML fragments.
  * @return {string} Name of custom columns definition.
  */
-function ensureCustomColumnDefinitionExists(appSchema, manifest, entitySetName, entityTypeName, oDataServiceAVT, fragments) {
-    const customColumnsDefinitionName = `${utils_1.CUSTOM_COLUMNS_DEFINITION}<${entitySetName}>`;
+function ensureCustomColumnDefinitionExists(appSchema, manifest, entitySetName, entityTypeName, oDataServiceAVT, facet, facetKey, fragments) {
+    let suffix, customColumnsDefinitionName;
+    if (facet.ID && facet.Label) {
+        suffix = facet.ID + facet.Label.replace(/\s+/g, '');
+    }
+    else if (facet.ID) {
+        suffix = facet.ID;
+    }
+    else if (facet.Label) {
+        suffix = facet.Label.replace(/\s+/g, '');
+    }
+    if (suffix) {
+        customColumnsDefinitionName = `${utils_1.CUSTOM_COLUMNS_DEFINITION}<${entitySetName}><${facetKey}><${suffix}>`;
+    }
+    else {
+        customColumnsDefinitionName = `${utils_1.CUSTOM_COLUMNS_DEFINITION}<${entitySetName}><${facetKey}>`;
+    }
     if (appSchema['definitions'][customColumnsDefinitionName]) {
         // Definition is already created - we do not need to create it again
-        return utils_1.CUSTOM_COLUMNS_DEFINITION;
+        return customColumnsDefinitionName;
     }
     // Create type specific 'TableCustomColumn' definition - use entity set as type.
     const customColumnDefinitionName = `${utils_1.CUSTOM_COLUMN_DEFINITION}<${entitySetName}>`;
@@ -98,6 +116,53 @@ function ensureCustomColumnDefinitionExists(appSchema, manifest, entitySetName,
     utils_1.addListReportColumnExtensions(appSchema, entityType, v2Page, manifest, fragments, customColumnsDefinitionName, customColumnDefinitionName);
     return customColumnsDefinitionName;
 }
+/**
+ * Method fills new app schema section with properties.
+ * @param {object} appSchema App schema in general
+ * @param {object} appSchemaSection app schema section to be filled
+ * @param {FacetConfig} facet facet or section information
+ * @param {SectionTypeV2} sectionType (sub)section type
+ * @param {SectionTypeV2} mainSectionType main section type, used to fill app schema section
+ * @return {boolean} returns false in case further handling is required.
+ */
+function addAppSchemaDefinition(appSchema, appSchemaSection, facet, sectionType, mainSectionType) {
+    var _a;
+    if ((facet === null || facet === void 0 ? void 0 : facet.ID) || ((_a = facet === null || facet === void 0 ? void 0 : facet.target) === null || _a === void 0 ? void 0 : _a['qualifier'])) {
+        appSchemaSection['properties'] = JSON.parse(JSON.stringify(appSchema['definitions'][mainSectionType]['properties']));
+        if (appSchemaSection['properties'].visible) {
+            addFlexChangeForSection(appSchema, appSchemaSection, 'visible', sectionType);
+        }
+        return true;
+    }
+    else {
+        return false;
+    }
+}
+/**
+ * Method adds title and description to app schema section in case facet information is available.
+ * @param {object} appSchemaSection app schema section to be filled
+ * @param {FacetConfig} facet facet or section information
+ */
+function addFacetTitleDescription(appSchemaSection, facet) {
+    if (facet === null || facet === void 0 ? void 0 : facet.ID) {
+        appSchemaSection['title'] = common_1.FacetTitlePrefix + facet.ID;
+    }
+    if (facet === null || facet === void 0 ? void 0 : facet.Label) {
+        appSchemaSection['description'] = facet.Label;
+    }
+    if (!appSchemaSection['description']) {
+        appSchemaSection['description'] = facet.base;
+    }
+}
+/**
+ * Method adds reference to section property key.
+ * @param {object} sections - schema of current sections definition
+ * @param {string} key section key which will contain the reference
+ * @param {string} definitionKey key which the section should point to
+ */
+function addSectionReference(sections, key, definitionKey) {
+    sections['properties'][key] = { $ref: `${common_1.DEFINITION_LINK_PREFIX}${definitionKey}` };
+}
 /**
  * Reuse function for all table types, copies and adapts the generic definition
  * @param tableType - Table type
@@ -106,7 +171,7 @@ function ensureCustomColumnDefinitionExists(appSchema, manifest, entitySetName,
  * @param appSchema - app-specific schema, to be updated
  */
 function addTableDefinition(tableType, facetId, facet, appSchema) {
-    const schemaId = `${tableType}<${facetId}>`;
+    const schemaId = common_1.prepareRef(`${tableType}<${facetId}>`);
     appSchema['definitions'][schemaId] = JSON.parse(JSON.stringify(appSchema['definitions'][tableType]));
     appSchema['definitions'][schemaId]['properties']['columns']['$ref'] = common_1.DEFINITION_LINK_PREFIX + facetId;
     appSchema['definitions'][schemaId].properties.toolBar.$ref = `${common_1.DEFINITION_LINK_PREFIX}ObjectPageToolBar<${facetId}>`;
@@ -115,87 +180,80 @@ function addTableDefinition(tableType, facetId, facet, appSchema) {
         appSchema['definitions'][schemaId].title = common_1.FacetTitlePrefix + facet.ID;
     }
     appSchema['definitions'][schemaId].description = 'Table';
+    //adjust quickVariantSelection
+    appSchema['definitions'][schemaId].properties['quickVariantSelection'].$ref = `${common_1.DEFINITION_LINK_PREFIX}QuickVariantSelectionOP<${facetId}>`;
+    appSchema['definitions'][`QuickVariantSelectionOP<${facetId}>`] = JSON.parse(JSON.stringify(appSchema['definitions']['QuickVariantSelectionOP']));
+    appSchema['definitions'][`QuickVariant<${facetId}>`] = JSON.parse(JSON.stringify(appSchema['definitions']['QuickVariant']));
+    appSchema['definitions'][`QuickVariantSelectionOP<${facetId}>`].properties.variants.patternProperties['^[0-9]+$'].$ref = `${common_1.DEFINITION_LINK_PREFIX}QuickVariant<${facetId}>`;
+    common_1.addEnumForSingleTabVariant(facet.entityType, appSchema, `QuickVariant<${facetId}>`);
 }
 /**
  * Adds definitions for line items in object page sections to the app schema
  * @param {GenerateSchemaParameters} generateParameters - list of API input parameters
- * @param {string} facetId - key of the facet, as listed in FacetConfigs
+ * @param {string} facetKey - key of the facet, as listed in FacetConfigs
  * @param {object} appSchema - app schema in general
  * @param {FacetConfig} facet - the given facet from the UI annotations
  * @param {FacetConfigs} facets - list of all facets
+ * @param {SectionTypeV2} sectionType (sub)section type
  */
-function handleLineItem(generateParameters, facetId, appSchema, facet, facets, sectionType) {
-    var _a;
-    if (facet.base !== 'LineItem' || !facetId) {
+function handleLineItem(generateParameters, facetKey, appSchema, facet, facets, sectionType) {
+    if (facet.base !== 'LineItem' || !facetKey) {
         //no properties
         return;
     }
-    const navigationProperty = facetId.split('::')[0];
-    const schemaIdForOpSection = `${sectionType}<${facetId}>`;
-    appSchema['definitions'][schemaIdForOpSection] = common_1.createSectionWithoutProperties(facet, facetId);
+    const navigationProperty = facetKey.split('::')[0];
+    const schemaIdForOpSection = `${sectionType}<${facetKey}>`;
+    appSchema['definitions'][schemaIdForOpSection] = common_1.createSectionWithoutProperties(facet, facetKey);
     const appSchemaSection = appSchema['definitions'][schemaIdForOpSection];
-    if (facet.ID || ((_a = facet.target) === null || _a === void 0 ? void 0 : _a['qualifier'])) {
-        appSchemaSection.properties = JSON.parse(JSON.stringify(appSchema['definitions'][types_1.SectionTypeV2.SectionTable]['properties']));
-        if (appSchemaSection.properties.visible) {
-            addFlexChangeForSection(appSchema, appSchemaSection, 'visible', sectionType);
-        }
-    }
-    else {
+    if (!addAppSchemaDefinition(appSchema, appSchemaSection, facet, sectionType, types_1.SectionTypeV2.SectionTable)) {
         appSchemaSection.properties.table = JSON.parse(JSON.stringify(appSchema['definitions'][types_1.SectionTypeV2.SectionTable]['properties']['table']));
     }
     appSchemaSection.properties.table.anyOf = [
         {
-            $ref: `${common_1.DEFINITION_LINK_PREFIX}ObjectPageResponsiveTable<${facetId}>`
+            $ref: `${common_1.DEFINITION_LINK_PREFIX}ObjectPageResponsiveTable<${facetKey}>`
         },
         {
-            $ref: `${common_1.DEFINITION_LINK_PREFIX}ObjectPageAnalyticalTable<${facetId}>`
+            $ref: `${common_1.DEFINITION_LINK_PREFIX}ObjectPageAnalyticalTable<${facetKey}>`
         },
         {
-            $ref: `${common_1.DEFINITION_LINK_PREFIX}ObjectPageGridTable<${facetId}>`
+            $ref: `${common_1.DEFINITION_LINK_PREFIX}ObjectPageGridTable<${facetKey}>`
         },
         {
-            $ref: `${common_1.DEFINITION_LINK_PREFIX}ObjectPageTreeTable<${facetId}>`
+            $ref: `${common_1.DEFINITION_LINK_PREFIX}ObjectPageTreeTable<${facetKey}>`
         }
     ];
     appSchemaSection.annotationPath = facet.annotationPath;
-    common_1.addSectionTitleAndDescription(facet, appSchemaSection, facetId);
+    common_1.addSectionTitleAndDescription(facet, appSchemaSection, facetKey);
     // Find target entity
     const targetEntity = facet.entityType
-        ? generateParameters.serviceAVT.entitySets.find((es) => es.entityType.name === facet.entityType.name || es.name === facet.entityType.name)
-        : undefined;
-    addTableDefinition('ObjectPageResponsiveTable', facetId, facet, appSchema);
-    addTableDefinition('ObjectPageGridTable', facetId, facet, appSchema);
-    addTableDefinition('ObjectPageTreeTable', facetId, facet, appSchema);
-    addTableDefinition('ObjectPageAnalyticalTable', facetId, facet, appSchema);
+        ? generateParameters === null || generateParameters === void 0 ? void 0 : generateParameters.serviceAVT.entitySets.find((es) => es.entityType.name === facet.entityType.name || es.name === facet.entityType.name) : undefined;
+    addTableDefinition('ObjectPageResponsiveTable', facetKey, facet, appSchema);
+    addTableDefinition('ObjectPageGridTable', facetKey, facet, appSchema);
+    addTableDefinition('ObjectPageTreeTable', facetKey, facet, appSchema);
+    addTableDefinition('ObjectPageAnalyticalTable', facetKey, facet, appSchema);
     let customColumnDefinitionKey;
     if (targetEntity) {
         // Make sure that custom columns definitions are created for passed entity
-        customColumnDefinitionKey = ensureCustomColumnDefinitionExists(appSchema, generateParameters.manifest, targetEntity.name, facet.entityType.name, generateParameters.serviceAVT, generateParameters.fragments);
+        customColumnDefinitionKey = ensureCustomColumnDefinitionExists(appSchema, generateParameters.manifest, targetEntity.name, facet.entityType.name, generateParameters === null || generateParameters === void 0 ? void 0 : generateParameters.serviceAVT, facet, facetKey, generateParameters.fragments);
     }
     for (const facetKey in facets) {
         if (facets[facetKey].base === 'LineItem' && facetKey.includes(navigationProperty)) {
-            utils_1.addLineItemsType(appSchema, facets[facetKey].target, facets[facetKey].entityType, facetId, customColumnDefinitionKey);
+            utils_1.addLineItemsType(appSchema, facets[facetKey].target, facets[facetKey].entityType, facetKey, customColumnDefinitionKey);
         }
     }
 }
 /**
  * Adds definitions for subsections in object page sections to the app schema
- * @param facetId - key of the facet, as listed in FacetConfigs
- * @param appSchema - app schema in general
- * @param facet - the given facet from the UI annotations
- * @param facets - list of all facets
+ * @param {object} appSchema - app schema in general
+ * @param {string} definitionKey - key of app schema definition to be filled
+ * @param {FacetConfig} facet facet or section information
+ * @param {string} facetId - key of the facet, as listed in FacetConfigs
+ * @param {SectionTypeV2} sectionType (sub)section type
  */
-function handleSubSection(facetId, appSchema, facet, sectionType) {
-    const schemaIdForSection = facetId.replace(`@${"com.sap.vocabularies.UI.v1.Facets" /* Facets */}`, facet.base);
-    const definitionKey = `${sectionType}<${schemaIdForSection}>`;
+function handleSubSection(appSchema, definitionKey, facet, facetId, sectionType) {
     appSchema['definitions'][definitionKey] = common_1.createSectionWithoutProperties(facet, facetId);
     const appSchemaSection = appSchema['definitions'][definitionKey];
-    if (facet.ID) {
-        appSchemaSection.properties = JSON.parse(JSON.stringify(appSchema['definitions'][types_1.SectionTypeV2.SubSection]['properties']));
-        if (appSchemaSection.properties.visible) {
-            addFlexChangeForSection(appSchema, appSchemaSection, 'visible', sectionType);
-        }
-    }
+    addAppSchemaDefinition(appSchema, appSchemaSection, facet, sectionType, types_1.SectionTypeV2.SubSection);
     appSchemaSection.properties.subsections = {
         type: 'object',
         description: 'Subsections',
@@ -204,6 +262,79 @@ function handleSubSection(facetId, appSchema, facet, sectionType) {
         isViewNode: true
     };
 }
+/**
+ * Method fills new chart section with properties.
+ * @param {object} appSchema App schema in general
+ * @param {string} definitionKey - key of app schema definition to be filled
+ * @param {FacetConfig} facet facet or section information
+ * @param {string} facetKey - facet key.
+ * @param {SectionTypeV2} sectionType (sub)section type
+ */
+function handleSectionChart(appSchema, definitionKey, facet, facetKey, sectionType) {
+    appSchema['definitions'][definitionKey] = common_1.createSectionWithoutProperties(facet, facetKey);
+    const appSchemaSection = appSchema['definitions'][definitionKey];
+    addAppSchemaDefinition(appSchema, appSchemaSection, facet, sectionType, types_1.SectionTypeV2.SectionChart);
+}
+/**
+ * Method fills new form section in app schema with properties.
+ * @param {object} appSchema App schema in general
+ * @param {string} definitionKey - key of app schema definition to be filled
+ * @param {FacetConfig} facet facet or section information
+ * @param {string} facetKey - facet key.
+ * @param {SectionTypeV2} sectionType (sub)section type
+ * @return {object} returns filled form section in app schema.
+ */
+function handleAppSchemaFormSection(appSchema, definitionKey, facet, facetKey, sectionType) {
+    appSchema['definitions'][definitionKey] = common_1.createSectionWithoutProperties(facet, facetKey);
+    const appSchemaSection = appSchema['definitions'][definitionKey];
+    addAppSchemaDefinition(appSchema, appSchemaSection, facet, sectionType, types_1.SectionTypeV2.SectionForm);
+    addFacetTitleDescription(appSchemaSection, facet);
+    appSchemaSection.annotationPath = facet.annotationPath;
+    appSchemaSection.isViewNode = true;
+    return appSchemaSection;
+}
+/**
+ * Mapping of facet type to (sub)section type to enable correct further handling
+ * @param {FacetBase} facetType - facet type to be mapped
+ * @param {boolean} isSubSection - if section is subsection of section
+ * @return {SectionTypeV2} sectionType (sub)section type
+ */
+function getSectionType(facetType, isSubSection) {
+    const sectionTypeMapping = new Map([
+        [v2_1.FacetBase.CollectionFacet, types_1.SectionTypeV2.Section],
+        [v2_1.FacetBase.LineItem, types_1.SectionTypeV2.SectionTable],
+        [v2_1.FacetBase.Chart, types_1.SectionTypeV2.SectionChart],
+        [v2_1.FacetBase.Form, types_1.SectionTypeV2.SectionForm],
+        [v2_1.FacetBase.Identification, types_1.SectionTypeV2.SectionForm]
+    ]);
+    const subSectionTypeMapping = new Map([
+        [v2_1.FacetBase.CollectionFacet, types_1.SectionTypeV2.SubSection],
+        [v2_1.FacetBase.LineItem, types_1.SectionTypeV2.SubSectionTable],
+        [v2_1.FacetBase.Chart, types_1.SectionTypeV2.SubSectionChart],
+        [v2_1.FacetBase.Form, types_1.SectionTypeV2.SubSectionForm],
+        [v2_1.FacetBase.Identification, types_1.SectionTypeV2.SubSectionForm]
+    ]);
+    if (isSubSection) {
+        return subSectionTypeMapping.get(facetType);
+    }
+    else {
+        return sectionTypeMapping.get(facetType);
+    }
+}
+/**
+ * Method returns reference key, special handling of (sub)sections
+ * @param {FacetConfig} facet facet or section information
+ * @param {string} facetKey - facet key.
+ * @param {SectionTypeV2} sectionType (sub)section type
+ * @return {string} reference key
+ */
+function getReferenceKey(facet, facetKey, sectionType) {
+    let referenceKey = facetKey;
+    if (sectionType === (types_1.SectionTypeV2.Section || types_1.SectionTypeV2.SubSection)) {
+        referenceKey = referenceKey.replace(`@${"com.sap.vocabularies.UI.v1.Facets" /* Facets */}`, facet.base);
+    }
+    return `${referenceKey}`;
+}
 /**
  * Creates a section definition in app schema.
  * @param {GenerateSchemaParameters} generateParameters - list of API input parameters
@@ -211,67 +342,35 @@ function handleSubSection(facetId, appSchema, facet, sectionType) {
  * @param {string} facetKey - facet key.
  * @param {object} sections - schema of current sections definition.
  * @param {object} appSchema - app specific schema that potentially gets enhanced.
+ * @param {boolean} isSubSection - if section is subsection of section
  */
 function addSection(generateParameters, facets, facetKey, sections, appSchema, isSubSection = false) {
-    var _a;
     const facet = facets[facetKey];
-    switch (facet.base) {
-        case v2_1.FacetBase.CollectionFacet: {
+    const sectionType = getSectionType(facet.base, isSubSection);
+    const referenceKey = getReferenceKey(facet, facetKey, sectionType);
+    const definitionKey = `${sectionType}<${referenceKey}>`;
+    addSectionReference(sections, referenceKey, definitionKey);
+    switch (sectionType) {
+        case types_1.SectionTypeV2.Section:
+        case types_1.SectionTypeV2.SubSection: {
             //handle collection facets
-            const sectionType = (sections === null || sections === void 0 ? void 0 : sections['description']) === 'Subsections' ? types_1.SectionTypeV2.SubSection : types_1.SectionTypeV2.Section;
-            const schemaIdForSection = facetKey.replace(`@${"com.sap.vocabularies.UI.v1.Facets" /* Facets */}`, facet.base);
             isSubSection = true;
-            const definitionKey = `${sectionType}<${schemaIdForSection}>`;
-            sections['properties'][schemaIdForSection] = { $ref: `${common_1.DEFINITION_LINK_PREFIX}${definitionKey}` };
-            handleSubSection(facetKey, appSchema, facet, sectionType);
+            handleSubSection(appSchema, definitionKey, facet, facetKey, sectionType);
             const subSections = appSchema['definitions'][definitionKey].properties.subsections;
             for (const key in facet['facets']) {
                 addSection(generateParameters, facet['facets'], key, subSections, appSchema, isSubSection);
             }
             break;
         }
-        case v2_1.FacetBase.LineItem: {
-            //handle reference facet (if comprising line item)
-            const sectionType = isSubSection ? types_1.SectionTypeV2.SubSectionTable : types_1.SectionTypeV2.SectionTable;
-            sections['properties'][facetKey] = {
-                $ref: `${common_1.DEFINITION_LINK_PREFIX}${sectionType}<${facetKey}>`
-            };
+        case types_1.SectionTypeV2.SectionTable:
+        case types_1.SectionTypeV2.SubSectionTable: {
             handleLineItem(generateParameters, facetKey, appSchema, facet, facets, sectionType);
             break;
         }
-        case v2_1.FacetBase.Form:
-        case v2_1.FacetBase.Identification: {
-            const sectionType = isSubSection ? types_1.SectionTypeV2.SubSectionForm : types_1.SectionTypeV2.SectionForm;
-            const definitionKey = `${sectionType}<${facetKey}>`;
-            sections['properties'][facetKey] = {
-                $ref: `${common_1.DEFINITION_LINK_PREFIX}${definitionKey}`
-            };
-            appSchema['definitions'][definitionKey] = common_1.createSectionWithoutProperties(facet, facetKey);
-            const appSchemaSection = appSchema['definitions'][definitionKey];
-            if ((facet === null || facet === void 0 ? void 0 : facet.ID) || ((_a = facet.target) === null || _a === void 0 ? void 0 : _a['qualifier'])) {
-                appSchemaSection['properties'] = JSON.parse(JSON.stringify(appSchema['definitions'][types_1.SectionTypeV2.SectionForm]['properties']));
-                if (appSchemaSection.properties.visible) {
-                    addFlexChangeForSection(appSchema, appSchemaSection, 'visible', sectionType);
-                }
-            }
-            if (facet === null || facet === void 0 ? void 0 : facet.ID) {
-                appSchemaSection.title = common_1.FacetTitlePrefix + facet.ID;
-            }
-            if (facet === null || facet === void 0 ? void 0 : facet.Label) {
-                appSchemaSection.description = facet.Label;
-            }
-            let withActions = true;
-            appSchemaSection.annotationPath = facet.annotationPath;
-            appSchemaSection.isViewNode = true;
-            if (!appSchemaSection.description) {
-                if (facet.base === v2_1.FacetBase.Form) {
-                    appSchemaSection.description = 'Form';
-                }
-                else if (facet.base === 'Identification') {
-                    appSchemaSection.description = 'Identification';
-                    withActions = false;
-                }
-            }
+        case types_1.SectionTypeV2.SectionForm:
+        case types_1.SectionTypeV2.SubSectionForm: {
+            const withActions = facet.base !== v2_1.FacetBase.Identification;
+            const appSchemaSection = handleAppSchemaFormSection(appSchema, definitionKey, facet, facetKey, sectionType);
             common_1.handleForm(v2_1.SectionType.Section, facet, appSchemaSection, appSchema, common_2.FioriElementsVersion.v2, withActions);
             break;
         }
@@ -286,6 +385,7 @@ function addSection(generateParameters, facets, facetKey, sections, appSchema, i
  * @param {GenerateSchemaParameters} generateParameters - list of API input parameters
  * @param {object} appSchema - app specific schema that potentially gets enhanced
  * @param {EntityType} entityType - current entity type
+ * @param {string} entitySetName Entity set name
  * @param {SapUiAppPagesV2} pages - list of (manifest) pages
  */
 function addSections(generateParameters, appSchema, entityType, entitySetName, pages) {
@@ -304,7 +404,7 @@ function addSections(generateParameters, appSchema, entityType, entitySetName, p
         return;
     }
     // Get facet annotations
-    const facets = common_1.getObjectPageFacets(entityType, generateParameters.serviceAVT, common_2.FioriElementsVersion.v2, generateParameters.logger);
+    const facets = common_1.getObjectPageFacets(entityType, generateParameters === null || generateParameters === void 0 ? void 0 : generateParameters.serviceAVT, common_2.FioriElementsVersion.v2, generateParameters.logger);
     if (!facets || Object.keys(facets).length === 0) {
         return;
     }
@@ -355,7 +455,6 @@ function addRelatedFacetKeysType(schema, entityType, oDataServiceAVT, logger) {
 }
 /**
  * Generates an app specific schema out of the generic schema.
- * Generic types are replaced by information from the app specific annotations.
  * @param {GenerateSchemaParameters} generateParameters - list of API input parameters
  * @param genericSchema - generic JSON schema of an object page
  * @param entityTypeName - the base entity type of the given page
@@ -375,10 +474,9 @@ function generateObjectPageSchemaV2(generateParameters, genericSchema, entityTyp
     appSchema['properties']['sections'] = {
         $ref: common_1.DEFINITION_LINK_PREFIX + 'Sections'
     };
-    const entitySet = generateParameters.serviceAVT.entitySets &&
-        generateParameters.serviceAVT.entitySets.find((es) => es.entityType.name === entityTypeName || es.name === entityTypeName);
+    const entitySet = (generateParameters === null || generateParameters === void 0 ? void 0 : generateParameters.serviceAVT.entitySets) && (generateParameters === null || generateParameters === void 0 ? void 0 : generateParameters.serviceAVT.entitySets.find((es) => es.entityType.name === entityTypeName || es.name === entityTypeName));
     if (!entitySet) {
-        v2_1.log(generateParameters.logger, {
+        extensionLogger_1.log(generateParameters.logger, {
             severity: "error" /* Error */,
             message: i18next_1.default.t('NOENTITYSET4NAME', { entityType: entityTypeName }),
             location: {
@@ -390,7 +488,7 @@ function generateObjectPageSchemaV2(generateParameters, genericSchema, entityTyp
     const entityType = entitySet === null || entitySet === void 0 ? void 0 : entitySet.entityType;
     const pages = generateParameters.manifest[common_2.ManifestSection.generic].pages;
     if (!pages) {
-        v2_1.log(generateParameters.logger, {
+        extensionLogger_1.log(generateParameters.logger, {
             severity: "error" /* Error */,
             message: i18next_1.default.t('NOPAGES', { appId: generateParameters.manifest['sap.app']['id'] }),
             location: {
@@ -401,15 +499,11 @@ function generateObjectPageSchemaV2(generateParameters, genericSchema, entityTyp
         return appSchema;
     }
     // Add header
-    addHeader(appSchema, entityType, generateParameters.serviceAVT);
+    addHeader(appSchema, entityType, generateParameters === null || generateParameters === void 0 ? void 0 : generateParameters.serviceAVT);
     // Add sections
     addSections(generateParameters, appSchema, entityType, entitySet.name, pages);
     // Custom section facets
-    addRelatedFacetKeysType(appSchema, entityType, generateParameters.serviceAVT, generateParameters.logger);
-    // Remove Custom Column non existing extensions - TreeTableColumnsExtension does not exist in ALP
-    utils_1.removeElementsFromEnum(appSchema['definitions']['TableColumnExtensionTypeV2']['enum'], [
-        v2_1.TableColumnExtensionTypeV2.TreeTableColumnsExtension
-    ]);
+    addRelatedFacetKeysType(appSchema, entityType, generateParameters === null || generateParameters === void 0 ? void 0 : generateParameters.serviceAVT, generateParameters.logger);
     if (!appSchema['definitions']['Sections']) {
         if (appSchema['definitions']['RelatedFacetKeys'] &&
             appSchema['definitions']['RelatedFacetKeys']['oneOf'].length) {
@@ -425,7 +519,7 @@ function generateObjectPageSchemaV2(generateParameters, genericSchema, entityTyp
             delete appSchema['properties']['sections'];
         }
     }
-    common_1.addFooterActions(appSchema, entityType, generateParameters.serviceAVT);
+    common_1.addFooterActions(appSchema, entityType, generateParameters === null || generateParameters === void 0 ? void 0 : generateParameters.serviceAVT);
     // Eliminate generic definitions
     delete appSchema['definitions']['GenericSections'];
     delete appSchema['definitions']['ObjectPageSectionTableV2'];
@@ -439,7 +533,6 @@ function generateObjectPageSchemaV2(generateParameters, genericSchema, entityTyp
     delete appSchema['definitions']['ObjectPageGridTable'];
     delete appSchema['definitions']['ObjectPageToolBar'];
     delete appSchema['definitions']['ObjectPageToolBarActions'];
-    delete appSchema['definitions']['ObjectPageToolBarAction'];
     delete appSchema['definitions']['ObjectPageForm'];
     delete appSchema['definitions']['ObjectPageFormFields'];
     delete appSchema['definitions']['ObjectPageFormActions'];