@sap/ux-specification 1.71.66 → 1.71.67

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

@@ -0,0 +1,84 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const utils_1 = require("./utils");
+const import_1 = require("../import");
+const common_1 = require("../../common");
+const i18next_1 = __importDefault(require("i18next"));
+const i18n_1 = require("../../../i18n/i18n");
+const extensionLogger_1 = require("../../../extensionLogger");
+const ux_specification_types_1 = require("@sap/ux-specification-types");
+const listReport_1 = require("./listReport");
+/**
+ * Generates an app specific schema out of the generic schema.
+ * Generic types are replaced by information from the app specific annotations.
+ * @param {GenerateAppSchemaParameters} generateParameters - list of API input parameters
+ * @param genericSchema - generic JSON schema of a list report
+ * @param entityTypeName - the base entity type of the given page
+ */
+function generateAnalyticalListReportSchemaV2(generateParameters, genericSchema, entityTypeName) {
+    var _a, _b, _c, _d, _e, _f;
+    // Initialize i18next
+    i18n_1.initI18n();
+    const appSchema = JSON.parse(JSON.stringify(genericSchema));
+    appSchema.properties[common_1.PropertyName.table].anyOf[0]['$ref'] =
+        common_1.DEFINITION_LINK_PREFIX + 'ALPResponsiveTable<LineItems>';
+    const tableDefinitionResponsive = JSON.parse(JSON.stringify(appSchema.definitions['ALPResponsiveTable']));
+    tableDefinitionResponsive.properties['columns']['$ref'] = `${common_1.DEFINITION_LINK_PREFIX}${common_1.DefinitionName.LineItems}`;
+    tableDefinitionResponsive.properties['toolBar']['$ref'] = `${common_1.DEFINITION_LINK_PREFIX}${common_1.DefinitionName.ToolBarLR}`;
+    appSchema.definitions['ALPResponsiveTable<LineItems>'] = tableDefinitionResponsive;
+    appSchema.properties[common_1.PropertyName.table]['anyOf'][1]['$ref'] = `${common_1.DEFINITION_LINK_PREFIX}ALPGridTable<LineItems>`;
+    const tableDefinitionGrid = JSON.parse(JSON.stringify(appSchema['definitions']['ALPGridTable']));
+    tableDefinitionGrid.properties['columns']['$ref'] = `${common_1.DEFINITION_LINK_PREFIX}${common_1.DefinitionName.LineItems}`;
+    tableDefinitionGrid.properties['toolBar']['$ref'] = `${common_1.DEFINITION_LINK_PREFIX}${common_1.DefinitionName.ToolBarLR}`;
+    appSchema.definitions['ALPGridTable<LineItems>'] = tableDefinitionGrid;
+    appSchema.properties[common_1.PropertyName.table]['anyOf'][2]['$ref'] = `${common_1.DEFINITION_LINK_PREFIX}ALPAnalyticalTable<LineItems>`;
+    const tableDefinitionAnalytical = JSON.parse(JSON.stringify(appSchema.definitions['ALPAnalyticalTable']));
+    tableDefinitionAnalytical.properties['columns']['$ref'] = `${common_1.DEFINITION_LINK_PREFIX}${common_1.DefinitionName.LineItems}`;
+    tableDefinitionAnalytical.properties['toolBar']['$ref'] = `${common_1.DEFINITION_LINK_PREFIX}${common_1.DefinitionName.ToolBarLR}`;
+    appSchema.definitions['ALPAnalyticalTable<LineItems>'] = tableDefinitionAnalytical;
+    // Remove Custom Column non existing extensions - TreeTableColumnsExtension does not exist in ALP
+    utils_1.removeElementsFromEnum(appSchema['definitions']['TableColumnExtensionTypeV2']['enum'], [
+        ux_specification_types_1.v2.TableColumnExtensionTypeV2.TreeTableColumnsExtension
+    ]);
+    const entityType = (_a = generateParameters === null || generateParameters === void 0 ? void 0 : generateParameters.serviceAVT.entityTypes) === null || _a === void 0 ? void 0 : _a.find((et) => et.name === entityTypeName);
+    if (!entityType) {
+        extensionLogger_1.log(generateParameters.logger, {
+            severity: "error" /* Error */,
+            message: i18next_1.default.t('NOENTITYTYPE', { entityType: entityTypeName }),
+            location: {
+                path: common_1.METADATAPATH
+            }
+        });
+    }
+    else {
+        //handle line items
+        const lineItemAnnotation = (_c = (_b = entityType === null || entityType === void 0 ? void 0 : entityType.annotations) === null || _b === void 0 ? void 0 : _b.UI) === null || _c === void 0 ? void 0 : _c.LineItem;
+        utils_1.addLineItemsType(appSchema, lineItemAnnotation, entityType);
+        //handle filter fields
+        const selectionFieldAnnotation = (_e = (_d = entityType === null || entityType === void 0 ? void 0 : entityType.annotations) === null || _d === void 0 ? void 0 : _d.UI) === null || _e === void 0 ? void 0 : _e.SelectionFields;
+        utils_1.addSelectionFields(appSchema, selectionFieldAnnotation, entityType);
+        const pageKeys = [];
+        const v2Page = import_1.findAnalyticalListPage(generateParameters.manifest[ux_specification_types_1.ManifestSection.generic].pages, pageKeys, generateParameters.logger);
+        if (!v2Page) {
+            return appSchema;
+        }
+        utils_1.addTableColumnExtensions(appSchema, entityType, v2Page, generateParameters.manifest, generateParameters.fragments);
+        const entitySet = (_f = generateParameters === null || generateParameters === void 0 ? void 0 : generateParameters.serviceAVT.entitySets) === null || _f === void 0 ? void 0 : _f.find((es) => es.name === v2Page.entitySet);
+        listReport_1.addEnumForVariantPaths(entityType, entitySet, appSchema, generateParameters.serviceAVT);
+        // Delete generic definitions that have been replaced
+        delete appSchema.definitions['ALPGridTable'];
+        delete appSchema.definitions['ALPResponsiveTable'];
+        delete appSchema.definitions['ALPAnalyticalTable'];
+        delete appSchema.definitions['GenericColumns'];
+        delete appSchema.definitions['TableColumnAction'];
+        delete appSchema.definitions['ToolBar'];
+        delete appSchema.definitions['GenericFooter'];
+        delete appSchema.definitions['Actions'];
+    }
+    return appSchema;
+}
+exports.generateAnalyticalListReportSchemaV2 = generateAnalyticalListReportSchemaV2;
+//# sourceMappingURL=analyticalListReport.js.map

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

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

package/dist/{types → src}/sync/v2/generate/generate.d.ts

@@ -1,5 +1,5 @@
-import type { FileData } from '../../common/types';
 import type { ExtensionLogger } from '../../../apiTypes';
+import type { FileData } from '../../common';
 /**
  * Generates an app specific schema out of the generic schema.
  * Generic types are replaced by information from the app specific annotations.

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

@@ -0,0 +1 @@
+{"version":3,"file":"generate.d.ts","sourceRoot":"","sources":["../../../../../src/sync/v2/generate/generate.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,eAAe,EAA+B,MAAM,mBAAmB,CAAC;AAEtF,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAC;AAE7C;;;;;;;;;;;;GAYG;AACH,wBAAgB,6BAA6B,CACzC,aAAa,EAAE,MAAM,EACrB,SAAS,EAAE,MAAM,EACjB,WAAW,EAAE,QAAQ,EAAE,EACvB,QAAQ,EAAE,MAAM,EAChB,SAAS,CAAC,EAAE,QAAQ,EAAE,EACtB,MAAM,CAAC,EAAE,eAAe,GACzB,MAAM,CAWR;AAED;;;;;;;;;;;;GAYG;AACH,wBAAgB,6BAA6B,CACzC,aAAa,EAAE,MAAM,EACrB,UAAU,EAAE,MAAM,EAClB,WAAW,EAAE,QAAQ,EAAE,EACvB,QAAQ,EAAE,MAAM,EAChB,SAAS,CAAC,EAAE,QAAQ,EAAE,EACtB,MAAM,CAAC,EAAE,eAAe,GACzB,MAAM,CAWR;AAED;;;;;;GAMG;AACH,wBAAgB,sBAAsB,CAAC,aAAa,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM,CAEtF;AAED;;;;;;;;;;;;;GAaG;AACH,wBAAgB,qCAAqC,CACjD,aAAa,EAAE,MAAM,EACrB,UAAU,EAAE,MAAM,EAClB,WAAW,EAAE,QAAQ,EAAE,EACvB,QAAQ,EAAE,MAAM,EAChB,SAAS,CAAC,EAAE,QAAQ,EAAE,EACtB,MAAM,CAAC,EAAE,eAAe,GACzB,MAAM,CAWR"}

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

@@ -0,0 +1,99 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const utils_1 = require("../../common/utils");
+const objectPage_1 = require("./objectPage");
+const listReport_1 = require("./listReport");
+const analyticalListReport_1 = require("./analyticalListReport");
+const overviewPage_1 = require("./overviewPage");
+const ux_specification_types_1 = require("@sap/ux-specification-types");
+/**
+ * Generates an app specific schema out of the generic schema.
+ * Generic types are replaced by information from the app specific annotations.
+ *
+ * @param {object} genericSchema - generic JSON schema of an object page
+ * @param {string} entitySet - the base entity type of the given page
+ * @param {FileData[]} annotations - list of all annotation files (file content plus URI as identifier)
+ * @param {object} manifest - manifest.json of the app
+ * @param {FileData[]} [fragments] - Array with XML fragments.
+ * @param {ExtensionLogger} logger - Logger class for logging messages
+ *
+ * @returns the app specific JSON schema
+ */
+function generateObjectPageInterfaceV2(genericSchema, entitySet, annotations, manifest, fragments, logger) {
+    const serviceAVT = utils_1.parseAndMergeAndConvert(annotations, logger);
+    const generateParameters = {
+        templateType: utils_1.TemplateType.ListReportObjectPageV2,
+        fioriElementsVersion: ux_specification_types_1.FioriElementsVersion.v2,
+        manifest,
+        fragments,
+        serviceAVT,
+        logger
+    };
+    return objectPage_1.generateObjectPageSchemaV2(generateParameters, genericSchema, entitySet);
+}
+exports.generateObjectPageInterfaceV2 = generateObjectPageInterfaceV2;
+/**
+ * Generates the app specific schema of a list report out of the generic schema.
+ * Generic types are replaced by information from the app specific annotations.
+ *
+ * @param genericSchema - generic JSON schema of a list report
+ * @param entityType - the base entity type of the given page
+ * @param annotations - list of all annotation files (file content plus URI as identifier)
+ * @param manifest - manifest.json of the app
+ * @param {FileData[]} fragments - list of fragment files and their content
+ * @param {ExtensionLogger} logger - Logger class for logging messages
+ *
+ * @returns the app specific JSON schema
+ */
+function generateListReportInterfaceV2(genericSchema, entityType, annotations, manifest, fragments, logger) {
+    const serviceAVT = utils_1.parseAndMergeAndConvert(annotations, logger);
+    const generateParameters = {
+        templateType: utils_1.TemplateType.ListReportObjectPageV2,
+        fioriElementsVersion: ux_specification_types_1.FioriElementsVersion.v2,
+        manifest,
+        fragments,
+        serviceAVT,
+        logger
+    };
+    return listReport_1.generateListReportSchemaV2(generateParameters, genericSchema, entityType);
+}
+exports.generateListReportInterfaceV2 = generateListReportInterfaceV2;
+/**
+ * Generates the app specific schema of an overview page
+ * @param genericSchema - file content of the generic schema
+ * @param manifest - manifest.json of the app
+ *
+ * @returns the generic schema, as equivalent to the app schema
+ */
+function generateOVPInterfaceV2(genericSchema, manifest) {
+    return overviewPage_1.generateOverviewPageSchemaV2(genericSchema, manifest);
+}
+exports.generateOVPInterfaceV2 = generateOVPInterfaceV2;
+/**
+ * Generates the app specific schema of an analytical list page out of the generic schema.
+ * Generic types are replaced by information from the app specific annotations.
+ *
+ * @param genericSchema - generic JSON schema of a list report
+ * @param entityType - the base entity type of the given page
+ * @param annotations - list of all annotation files (file content plus URI as identifier)
+ * @param manifest - manifest.json of the app
+ * @param {FileData[]} fragments - list of fragment files and their content
+ * @param {ExtensionLogger} logger - Logger class for logging messages
+ * @param {string} appId - application ID
+ *
+ * @returns the app specific JSON schema
+ */
+function generateAnalyticalListPageInterfaceV2(genericSchema, entityType, annotations, manifest, fragments, logger) {
+    const serviceAVT = utils_1.parseAndMergeAndConvert(annotations, logger);
+    const generateParameters = {
+        templateType: utils_1.TemplateType.AnalyticalListPageV2,
+        fioriElementsVersion: ux_specification_types_1.FioriElementsVersion.v2,
+        manifest,
+        fragments,
+        serviceAVT,
+        logger
+    };
+    return analyticalListReport_1.generateAnalyticalListReportSchemaV2(generateParameters, genericSchema, entityType);
+}
+exports.generateAnalyticalListPageInterfaceV2 = generateAnalyticalListPageInterfaceV2;
+//# sourceMappingURL=generate.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"generate.js","sourceRoot":"","sources":["../../../../../src/sync/v2/generate/generate.ts"],"names":[],"mappings":";;AAAA,8CAA2E;AAC3E,6CAA0D;AAC1D,6CAA0D;AAC1D,iEAA8E;AAC9E,iDAA8D;AAE9D,wEAAmE;AAGnE;;;;;;;;;;;;GAYG;AACH,SAAgB,6BAA6B,CACzC,aAAqB,EACrB,SAAiB,EACjB,WAAuB,EACvB,QAAgB,EAChB,SAAsB,EACtB,MAAwB;IAExB,MAAM,UAAU,GAAG,+BAAuB,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC;IAChE,MAAM,kBAAkB,GAAgC;QACpD,YAAY,EAAE,oBAAY,CAAC,sBAAsB;QACjD,oBAAoB,EAAE,6CAAoB,CAAC,EAAE;QAC7C,QAAQ;QACR,SAAS;QACT,UAAU;QACV,MAAM;KACT,CAAC;IACF,OAAO,uCAA0B,CAAC,kBAAkB,EAAE,aAAa,EAAE,SAAS,CAAC,CAAC;AACpF,CAAC;AAlBD,sEAkBC;AAED;;;;;;;;;;;;GAYG;AACH,SAAgB,6BAA6B,CACzC,aAAqB,EACrB,UAAkB,EAClB,WAAuB,EACvB,QAAgB,EAChB,SAAsB,EACtB,MAAwB;IAExB,MAAM,UAAU,GAAG,+BAAuB,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC;IAChE,MAAM,kBAAkB,GAAgC;QACpD,YAAY,EAAE,oBAAY,CAAC,sBAAsB;QACjD,oBAAoB,EAAE,6CAAoB,CAAC,EAAE;QAC7C,QAAQ;QACR,SAAS;QACT,UAAU;QACV,MAAM;KACT,CAAC;IACF,OAAO,uCAA0B,CAAC,kBAAkB,EAAE,aAAa,EAAE,UAAU,CAAC,CAAC;AACrF,CAAC;AAlBD,sEAkBC;AAED;;;;;;GAMG;AACH,SAAgB,sBAAsB,CAAC,aAAqB,EAAE,QAAgB;IAC1E,OAAO,2CAA4B,CAAC,aAAa,EAAE,QAAQ,CAAC,CAAC;AACjE,CAAC;AAFD,wDAEC;AAED;;;;;;;;;;;;;GAaG;AACH,SAAgB,qCAAqC,CACjD,aAAqB,EACrB,UAAkB,EAClB,WAAuB,EACvB,QAAgB,EAChB,SAAsB,EACtB,MAAwB;IAExB,MAAM,UAAU,GAAG,+BAAuB,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC;IAChE,MAAM,kBAAkB,GAAgC;QACpD,YAAY,EAAE,oBAAY,CAAC,oBAAoB;QAC/C,oBAAoB,EAAE,6CAAoB,CAAC,EAAE;QAC7C,QAAQ;QACR,SAAS;QACT,UAAU;QACV,MAAM;KACT,CAAC;IACF,OAAO,2DAAoC,CAAC,kBAAkB,EAAE,aAAa,EAAE,UAAU,CAAC,CAAC;AAC/F,CAAC;AAlBD,sFAkBC"}

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

@@ -0,0 +1,14 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+var generate_1 = require("./generate");
+exports.generateAnalyticalListPageInterfaceV2 = generate_1.generateAnalyticalListPageInterfaceV2;
+exports.generateListReportInterfaceV2 = generate_1.generateListReportInterfaceV2;
+exports.generateObjectPageInterfaceV2 = generate_1.generateObjectPageInterfaceV2;
+exports.generateOVPInterfaceV2 = generate_1.generateOVPInterfaceV2;
+var objectPage_1 = require("./objectPage");
+exports.generateObjectPageSchemaV2 = objectPage_1.generateObjectPageSchemaV2;
+var listReport_1 = require("./listReport");
+exports.generateListReportSchemaV2 = listReport_1.generateListReportSchemaV2;
+var analyticalListReport_1 = require("./analyticalListReport");
+exports.generateAnalyticalListReportSchemaV2 = analyticalListReport_1.generateAnalyticalListReportSchemaV2;
+//# sourceMappingURL=index.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/sync/v2/generate/index.ts"],"names":[],"mappings":";;AAAA,uCAKoB;AAJhB,2DAAA,qCAAqC,CAAA;AACrC,mDAAA,6BAA6B,CAAA;AAC7B,mDAAA,6BAA6B,CAAA;AAC7B,4CAAA,sBAAsB,CAAA;AAE1B,2CAA0D;AAAjD,kDAAA,0BAA0B,CAAA;AACnC,2CAA0D;AAAjD,kDAAA,0BAA0B,CAAA;AACnC,+DAA8E;AAArE,sEAAA,oCAAoC,CAAA"}

package/dist/{types → src}/sync/v2/generate/listReport.d.ts

@@ -1,6 +1,6 @@
-import type { GenerateAppSchemaParameters } from '../../../v2';
 import type { ConvertedMetadata, EntitySet, EntityType } from '@sap-ux/vocabularies-types';
 import type { Definition } from 'typescript-json-schema';
+import type { GenerateAppSchemaParameters } from '../../../apiTypes';
 /**
  * Adds the enum types for QuickVariant and QuickVariantX, based on the entity type annotations
  * @param {EntityType} entityType

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

@@ -0,0 +1 @@
+{"version":3,"file":"listReport.d.ts","sourceRoot":"","sources":["../../../../../src/sync/v2/generate/listReport.ts"],"names":[],"mappings":"AAgBA,OAAO,KAAK,EAAE,iBAAiB,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAC;AAC3F,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AACzD,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,mBAAmB,CAAC;AAErE;;;;;;GAMG;AACH,wBAAgB,sBAAsB,CAClC,UAAU,EAAE,UAAU,EACtB,SAAS,EAAE,SAAS,EACpB,SAAS,EAAE,UAAU,EACrB,eAAe,EAAE,iBAAiB,GACnC,IAAI,CAIN;AAED;;;;;;;;GAQG;AACH,wBAAgB,0BAA0B,CACtC,kBAAkB,EAAE,2BAA2B,EAC/C,aAAa,EAAE,MAAM,EACrB,cAAc,EAAE,MAAM,GACvB,MAAM,CA4FR"}

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

@@ -0,0 +1,116 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const utils_1 = require("./utils");
+const import_1 = require("../import");
+const common_1 = require("../../common");
+const i18next_1 = __importDefault(require("i18next"));
+const i18n_1 = require("../../../i18n/i18n");
+const ux_specification_types_1 = require("@sap/ux-specification-types");
+const extensionLogger_1 = require("../../../extensionLogger");
+const types_1 = require("../types");
+/**
+ * Adds the enum types for QuickVariant and QuickVariantX, based on the entity type annotations
+ * @param {EntityType} entityType
+ * @param {EntitySet} entitySet - current entity set of the page or view
+ * @param {Definition} appSchema - app specific JSON schema
+ * @param {ConvertedMetadata} oDataServiceAVT - combined service metadata, as returned by annotation vocabularies tools
+ */
+function addEnumForVariantPaths(entityType, entitySet, appSchema, oDataServiceAVT) {
+    common_1.addEnumForSingleTabVariant(entityType, appSchema, 'QuickVariant');
+    common_1.addEnumForMultiTabVariant(appSchema, 'QuickVariantX', entitySet);
+    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.
+ * @param {GenerateAppSchemaParameters} generateParameters - list of API input parameters
+ * @param {object} genericSchema - generic JSON schema of a list report
+ * @param {string} entityTypeName - the base entity type of the given page
+ * @param {EntityType[]} entityTypes - list of all entity types
+ * @returns appSchema - the application specific JSON schema
+ */
+function generateListReportSchemaV2(generateParameters, genericSchema, entityTypeName) {
+    var _a, _b, _c;
+    // Initialize i18next
+    i18n_1.initI18n();
+    const appSchema = JSON.parse(JSON.stringify(genericSchema));
+    if (!(generateParameters === null || generateParameters === void 0 ? void 0 : generateParameters.serviceAVT)) {
+        return appSchema;
+    }
+    appSchema['properties']['table']['anyOf']['0']['$ref'] = common_1.DEFINITION_LINK_PREFIX + types_1.RESPONSIVETABLE;
+    appSchema['properties']['table']['anyOf']['1']['$ref'] = common_1.DEFINITION_LINK_PREFIX + types_1.TREETABLE;
+    appSchema['properties']['table']['anyOf']['2']['$ref'] = common_1.DEFINITION_LINK_PREFIX + types_1.ANALYTICALTABLE;
+    appSchema['properties']['table']['anyOf']['3']['$ref'] = common_1.DEFINITION_LINK_PREFIX + types_1.GRIDTABLE;
+    const responsiveTableDefinition = JSON.parse(JSON.stringify(appSchema['definitions']['ResponsiveTable']));
+    const treeTableDefinition = JSON.parse(JSON.stringify(appSchema['definitions']['TreeTable']));
+    const analyticalTableDefinition = JSON.parse(JSON.stringify(appSchema['definitions']['AnalyticalTable']));
+    const gridTableDefinition = JSON.parse(JSON.stringify(appSchema['definitions']['GridTable']));
+    const lrLineItems = {
+        $ref: common_1.DEFINITION_LINK_PREFIX + common_1.DefinitionName.LineItems
+    };
+    responsiveTableDefinition['properties']['columns'] = lrLineItems;
+    treeTableDefinition['properties']['columns'] = lrLineItems;
+    analyticalTableDefinition['properties']['columns'] = lrLineItems;
+    gridTableDefinition['properties']['columns'] = lrLineItems;
+    const lrToolBar = common_1.DEFINITION_LINK_PREFIX + common_1.DefinitionName.ToolBarLR;
+    appSchema['definitions'][types_1.RESPONSIVETABLE] = responsiveTableDefinition;
+    appSchema['definitions'][types_1.RESPONSIVETABLE]['properties'].toolBar.$ref = lrToolBar;
+    appSchema['definitions'][types_1.TREETABLE] = treeTableDefinition;
+    appSchema['definitions'][types_1.TREETABLE]['properties'].toolBar.$ref = lrToolBar;
+    appSchema['definitions'][types_1.ANALYTICALTABLE] = analyticalTableDefinition;
+    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 === null || generateParameters === void 0 ? void 0 : generateParameters.serviceAVT.entityTypes.find((et) => et.name === entityTypeName);
+    if (!entityType) {
+        extensionLogger_1.log(generateParameters.logger, {
+            severity: "error" /* Error */,
+            message: i18next_1.default.t('NOENTITYTYPE', { entityType: entityTypeName }),
+            location: {
+                path: common_1.METADATAPATH
+            }
+        });
+    }
+    else {
+        //handle line items
+        const lineItemAnnotation = entityType.annotations && entityType.annotations.UI && entityType.annotations.UI.LineItem;
+        utils_1.addLineItemsType(appSchema, lineItemAnnotation, entityType);
+        //handle filter fields
+        const selectionFieldAnnotation = (_b = (_a = entityType === null || entityType === void 0 ? void 0 : entityType.annotations) === null || _a === void 0 ? void 0 : _a.UI) === null || _b === void 0 ? void 0 : _b.SelectionFields;
+        utils_1.addSelectionFields(appSchema, selectionFieldAnnotation, entityType);
+        const pageKeys = [];
+        const v2Page = import_1.findListReportPageV2(generateParameters.manifest[ux_specification_types_1.ManifestSection.generic].pages, pageKeys);
+        if (!v2Page) {
+            extensionLogger_1.log(generateParameters.logger, {
+                severity: "error" /* Error */,
+                message: i18next_1.default.t('NOALP'),
+                location: {
+                    path: common_1.MANIFESTPATH,
+                    range: [ux_specification_types_1.ManifestSection.generic]
+                }
+            });
+            return appSchema;
+        }
+        utils_1.addTableColumnExtensions(appSchema, entityType, v2Page, generateParameters.manifest, generateParameters.fragments);
+        const entitySet = (_c = generateParameters === null || generateParameters === void 0 ? void 0 : generateParameters.serviceAVT.entitySets) === null || _c === void 0 ? void 0 : _c.find((es) => es.name === v2Page.entitySet);
+        addEnumForVariantPaths(entityType, entitySet, appSchema, generateParameters.serviceAVT);
+        //Delete generic definitions
+        delete appSchema.definitions['ResponsiveTableWithMultiSelect'];
+        delete appSchema.definitions['ResponsiveTableWithInlineDelete'];
+        delete appSchema.definitions['TreeTable'];
+        delete appSchema.definitions['AnalyticalTable'];
+        delete appSchema.definitions['GridTable'];
+        delete appSchema.definitions['GenericColumns'];
+        delete appSchema.definitions['TableColumnAction'];
+        delete appSchema.definitions['ToolBar'];
+        delete appSchema.definitions['Actions'];
+        delete appSchema.definitions['GenericFooter'];
+    }
+    return appSchema;
+}
+exports.generateListReportSchemaV2 = generateListReportSchemaV2;
+//# sourceMappingURL=listReport.js.map

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

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

package/dist/{types → src}/sync/v2/generate/objectPage.d.ts

@@ -1,4 +1,4 @@
-import type { GenerateAppSchemaParameters } from '../../../v2';
+import type { GenerateAppSchemaParameters } from '../../../apiTypes';
 /**
  * Generates an app specific schema out of the generic schema.
  * @param {GenerateSchemaParameters} generateParameters - list of API input parameters

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

@@ -0,0 +1 @@
+{"version":3,"file":"objectPage.d.ts","sourceRoot":"","sources":["../../../../../src/sync/v2/generate/objectPage.ts"],"names":[],"mappings":"AA6CA,OAAO,KAAK,EAAE,2BAA2B,EAAmB,MAAM,mBAAmB,CAAC;AA8kBtF;;;;;;;GAOG;AACH,wBAAgB,0BAA0B,CACtC,kBAAkB,EAAE,2BAA2B,EAC/C,aAAa,EAAE,MAAM,EACrB,cAAc,EAAE,MAAM,GACvB,MAAM,CAiGR"}