@sap-ux/odata-service-inquirer 2.5.25 → 2.5.27

package/dist/prompts/edmx/entity-helper.d.ts

@@ -1,6 +1,7 @@
 import { OdataVersion } from '@sap-ux/odata-service-writer';
 import type { ConvertedMetadata, EntitySet } from '@sap-ux/vocabularies-types';
 import type { ListChoiceOptions } from 'inquirer';
+import type { TableType, TemplateType } from '@sap-ux/fiori-elements-writer';
 export type EntityAnswer = {
     entitySetName: string;
     entitySetType: string;
@@ -49,14 +50,6 @@ export declare function getEntityChoices(edmx: string, { entitySetFilter, defaul
  * @returns the navigation entity choices
  */
 export declare function getNavigationEntityChoices(metadata: ConvertedMetadata, odataVersion: OdataVersion, mainEntityName: string): ListChoiceOptions<NavigationEntityAnswer>[];
-/**
- * Returns only entity sets that have the `Aggregation.ApplySupported` annotation term with the `Transformations` property.
- * This can be found within the entity set annotations or the entity type annotations.
- *
- * @param entitySets the entity sets to filter
- * @returns the filtered entity sets
- */
-export declare function filterAggregateTransformations(entitySets: EntitySet[]): EntitySet[];
 /**
  * Returns only entities that have a type property of 'HasDraftEnabled'.
  *
@@ -64,4 +57,18 @@ export declare function filterAggregateTransformations(entitySets: EntitySet[]):
  * @returns the filtered entity sets
  */
 export declare function filterDraftEnabledEntities(entitySets: EntitySet[]): EntitySet[] | undefined;
+/**
+ * Get the default table type based on the template type and previous answers.
+ *
+ * @param templateType the template type of the application to be generated from the prompt answers
+ * @param metadata the metadata (edmx) string of the service
+ * @param odataVersion the OData version of the service
+ * @param mainEntitySetName the name of the main entity set
+ * @param currentTableType the current table type selected by the user
+ * @returns the default table type and a boolean indicating if AnalyticalTable should be set as default
+ */
+export declare function getDefaultTableType(templateType: TemplateType, metadata: ConvertedMetadata, odataVersion: OdataVersion, mainEntitySetName?: string, currentTableType?: TableType): {
+    tableType: TableType;
+    setAnalyticalTableDefault: boolean;
+};
 //# sourceMappingURL=entity-helper.d.ts.map

package/dist/prompts/edmx/entity-helper.js

@@ -5,13 +5,14 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getEntityChoices = getEntityChoices;
 exports.getNavigationEntityChoices = getNavigationEntityChoices;
-exports.filterAggregateTransformations = filterAggregateTransformations;
 exports.filterDraftEnabledEntities = filterDraftEnabledEntities;
+exports.getDefaultTableType = getDefaultTableType;
 const annotation_converter_1 = require("@sap-ux/annotation-converter");
 const edmx_parser_1 = require("@sap-ux/edmx-parser");
 const odata_service_writer_1 = require("@sap-ux/odata-service-writer");
 const i18n_1 = require("../../i18n");
 const logger_helper_1 = __importDefault(require("../logger-helper"));
+const inquirer_common_1 = require("@sap-ux/inquirer-common");
 /**
  * Finds the navigation property name that links a parameterised entity set to its target entity set.
  *
@@ -85,7 +86,7 @@ function getEntityChoices(edmx, { entitySetFilter, defaultMainEntityName } = {})
         }
         else if (entitySetFilter === 'filterAggregateTransformationsOnly' && odataVersion === odata_service_writer_1.OdataVersion.v4) {
             // Only for v4 odata version, if a v2 metadata is passed, this will be ignored
-            entitySets = filterAggregateTransformations(convertedMetadata.entitySets);
+            entitySets = (0, inquirer_common_1.filterAggregateTransformations)(convertedMetadata.entitySets);
         }
         else {
             entitySets = convertedMetadata.entitySets;
@@ -168,19 +169,6 @@ function getNavigationEntityChoices(metadata, odataVersion, mainEntityName) {
     }
     return choices;
 }
-/**
- * Returns only entity sets that have the `Aggregation.ApplySupported` annotation term with the `Transformations` property.
- * This can be found within the entity set annotations or the entity type annotations.
- *
- * @param entitySets the entity sets to filter
- * @returns the filtered entity sets
- */
-function filterAggregateTransformations(entitySets) {
-    return entitySets.filter((entitySet) => {
-        return (!!entitySet.annotations?.Aggregation?.ApplySupported?.Transformations ||
-            !!entitySet.entityType?.annotations?.Aggregation?.ApplySupported?.Transformations);
-    });
-}
 /**
  * Returns only entities that have a type property of 'HasDraftEnabled'.
  *
@@ -193,4 +181,41 @@ function filterDraftEnabledEntities(entitySets) {
         return !!entitySetTypeProperties.find((property) => property.name === 'HasDraftEntity');
     });
 }
+/**
+ * Get the default table type based on the template type and previous answers.
+ *
+ * @param templateType the template type of the application to be generated from the prompt answers
+ * @param metadata the metadata (edmx) string of the service
+ * @param odataVersion the OData version of the service
+ * @param mainEntitySetName the name of the main entity set
+ * @param currentTableType the current table type selected by the user
+ * @returns the default table type and a boolean indicating if AnalyticalTable should be set as default
+ */
+function getDefaultTableType(templateType, metadata, odataVersion, mainEntitySetName, currentTableType) {
+    let tableType;
+    let setAnalyticalTableDefault = false;
+    if ((templateType === 'lrop' || templateType === 'worklist') &&
+        odataVersion === odata_service_writer_1.OdataVersion.v4 &&
+        (0, inquirer_common_1.hasAggregateTransformationsForEntity)(metadata, mainEntitySetName)) {
+        // For V4, if the selected entity has aggregate transformations, use AnalyticalTable as default
+        tableType = 'AnalyticalTable';
+        setAnalyticalTableDefault = true;
+    }
+    else if (templateType === 'alp') {
+        // For ALP, use AnalyticalTable as default
+        tableType = 'AnalyticalTable';
+    }
+    else if (currentTableType) {
+        // If the user has already selected a table type use it
+        tableType = currentTableType;
+    }
+    else {
+        // Default to ResponsiveTable for other cases
+        tableType = 'ResponsiveTable';
+    }
+    return {
+        tableType,
+        setAnalyticalTableDefault
+    };
+}
 //# sourceMappingURL=entity-helper.js.map

package/dist/prompts/edmx/questions.js

@@ -171,7 +171,7 @@ function getTableLayoutQuestions(templateType, odataVersion, isCapService, metad
             },
             choices: tableTypeChoices,
             default: (prevAnswers) => {
-                const tableTypeDefault = getDefaultTableType(templateType, metadata, odataVersion, prevAnswers?.mainEntity?.entitySetName, prevAnswers?.tableType);
+                const tableTypeDefault = (0, entity_helper_1.getDefaultTableType)(templateType, metadata, odataVersion, prevAnswers?.mainEntity?.entitySetName, prevAnswers?.tableType);
                 setAnalyticalTableDefault = tableTypeDefault.setAnalyticalTableDefault;
                 return tableTypeDefault.tableType;
             },
@@ -218,56 +218,6 @@ function getEdmxSizeInKb(edmx) {
     }
     return 0;
 }
-/**
- * Get the default table type based on the template type and previous answers.
- *
- * @param templateType the template type of the application to be generated from the prompt answers
- * @param metadata the metadata (edmx) string of the service
- * @param odataVersion the OData version of the service
- * @param mainEntitySetName the name of the main entity set
- * @param currentTableType the current table type selected by the user
- * @returns the default table type and a boolean indicating if AnalyticalTable should be set as default
- */
-function getDefaultTableType(templateType, metadata, odataVersion, mainEntitySetName, currentTableType) {
-    let tableType;
-    let setAnalyticalTableDefault = false;
-    if ((templateType === 'lrop' || templateType === 'worklist') &&
-        odataVersion === odata_service_writer_1.OdataVersion.v4 &&
-        hasAggregateTransformationsForEntity(metadata, mainEntitySetName)) {
-        // For V4, if the selected entity has aggregate transformations, use AnalyticalTable as default
-        tableType = 'AnalyticalTable';
-        setAnalyticalTableDefault = true;
-    }
-    else if (templateType === 'alp') {
-        // For ALP, use AnalyticalTable as default
-        tableType = 'AnalyticalTable';
-    }
-    else if (currentTableType) {
-        // If the user has already selected a table type use it
-        tableType = currentTableType;
-    }
-    else {
-        // Default to ResponsiveTable for other cases
-        tableType = 'ResponsiveTable';
-    }
-    return {
-        tableType,
-        setAnalyticalTableDefault
-    };
-}
-/**
- * Checks if the given entity set name has aggregate transformations in the metadata.
- *
- * @param metadata The metadata (edmx) string of the service.
- * @param entitySetName The entity set name to check for aggregate transformations.
- * @returns true if the entity set has aggregate transformations, false otherwise.
- */
-function hasAggregateTransformationsForEntity(metadata, entitySetName) {
-    if (!entitySetName) {
-        return false;
-    }
-    return (0, entity_helper_1.filterAggregateTransformations)(metadata.entitySets).some((entitySet) => entitySet.name === entitySetName);
-}
 /**
  * Get the questions that may be used to prompt for adding annotations. Only a subset of the questions will be returned based on the template type and OData version.
  *

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@sap-ux/odata-service-inquirer",
   "description": "Prompts module that can prompt users for inputs required for odata service writing",
-  "version": "2.5.25",
+  "version": "2.5.27",
   "repository": {
     "type": "git",
     "url": "https://github.com/SAP/open-ux-tools.git",
@@ -30,14 +30,14 @@
     "os-name": "4.0.1",
     "@sap-ux/axios-extension": "1.22.4",
     "@sap-ux/btp-utils": "1.1.0",
-    "@sap-ux/fiori-generator-shared": "0.13.4",
+    "@sap-ux/fiori-generator-shared": "0.13.5",
     "@sap-ux/guided-answers-helper": "0.3.1",
-    "@sap-ux/telemetry": "0.6.11",
-    "@sap-ux/inquirer-common": "0.7.28",
+    "@sap-ux/telemetry": "0.6.12",
+    "@sap-ux/inquirer-common": "0.7.30",
     "@sap-ux/logger": "0.7.0",
     "@sap-ux/nodejs-utils": "0.2.2",
-    "@sap-ux/project-access": "1.30.8",
-    "@sap-ux/project-input-validator": "0.6.13",
+    "@sap-ux/project-access": "1.30.9",
+    "@sap-ux/project-input-validator": "0.6.14",
     "@sap-ux/store": "1.1.2"
   },
   "devDependencies": {
@@ -47,12 +47,12 @@
     "@types/inquirer": "8.2.6",
     "@types/lodash": "4.14.202",
     "jest-extended": "6.0.0",
-    "@sap-ux/fiori-generator-shared": "0.13.4",
-    "@sap-ux/fiori-elements-writer": "2.5.17",
-    "@sap-ux/fiori-freestyle-writer": "2.4.27",
+    "@sap-ux/fiori-generator-shared": "0.13.5",
+    "@sap-ux/fiori-elements-writer": "2.5.18",
+    "@sap-ux/fiori-freestyle-writer": "2.4.29",
     "@sap-ux/feature-toggle": "0.3.0",
-    "@sap-ux/odata-service-writer": "0.27.13",
-    "@sap-ux/cap-config-writer": "0.10.22"
+    "@sap-ux/odata-service-writer": "0.27.14",
+    "@sap-ux/cap-config-writer": "0.10.23"
   },
   "engines": {
     "node": ">=20.x"