@sap-ux/odata-service-inquirer 2.2.36 → 2.3.1

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

@@ -22,7 +22,6 @@ export type EntitySetFilter = 'filterDraftEnabled' | 'filterAggregateTransformat
  *
  * @param edmx metadata string
  * @param options
- * @param options.useEntityTypeAsName Choice options will use the non-namepspaced entity set type as the choice name (label) and value property `entitySetName` when true, otherwise the entity set name will be used.
  * @param options.entitySetFilter
  *     `filterDraftEnabled` : Only draft enabled entities wil be returned when true, useful for Form Object Page app generation.
  *     `filterAggregateTransformationsOnly` : Only return entity choices that have an aggregate annotation (Aggregation.ApplySupported) with the `Transformations` property set,
@@ -30,8 +29,7 @@ export type EntitySetFilter = 'filterDraftEnabled' | 'filterAggregateTransformat
  * @param options.defaultMainEntityName The default selected entity set name
  * @returns entity options
  */
-export declare function getEntityChoices(edmx: string, { useEntityTypeAsName, entitySetFilter, defaultMainEntityName }?: {
-    useEntityTypeAsName?: boolean;
+export declare function getEntityChoices(edmx: string, { entitySetFilter, defaultMainEntityName }?: {
     entitySetFilter?: EntitySetFilter;
     defaultMainEntityName?: string;
 }): EntityChoiceOptions;

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

@@ -16,7 +16,6 @@ const logger_helper_1 = __importDefault(require("../logger-helper"));
  *
  * @param edmx metadata string
  * @param options
- * @param options.useEntityTypeAsName Choice options will use the non-namepspaced entity set type as the choice name (label) and value property `entitySetName` when true, otherwise the entity set name will be used.
  * @param options.entitySetFilter
  *     `filterDraftEnabled` : Only draft enabled entities wil be returned when true, useful for Form Object Page app generation.
  *     `filterAggregateTransformationsOnly` : Only return entity choices that have an aggregate annotation (Aggregation.ApplySupported) with the `Transformations` property set,
@@ -24,7 +23,7 @@ const logger_helper_1 = __importDefault(require("../logger-helper"));
  * @param options.defaultMainEntityName The default selected entity set name
  * @returns entity options
  */
-function getEntityChoices(edmx, { useEntityTypeAsName = false, entitySetFilter, defaultMainEntityName } = {}) {
+function getEntityChoices(edmx, { entitySetFilter, defaultMainEntityName } = {}) {
     const choices = [];
     let draftRootIndex;
     let defaultMainEntityIndex;
@@ -51,15 +50,10 @@ function getEntityChoices(edmx, { useEntityTypeAsName = false, entitySetFilter,
             entitySets = convertedMetadata.entitySets;
         }
         entitySets.forEach((entitySet, index) => {
-            // Determine whether to use the entity set type name or the entity set name as the choice name.
-            // Note that in the case of the entity type name, the namespace will be removed.
-            const entitySetChoiceName = useEntityTypeAsName
-                ? entitySet.entityTypeName.substring(entitySet.entityTypeName.lastIndexOf('.') + 1)
-                : entitySet.name;
             const choice = {
-                name: entitySetChoiceName,
+                name: entitySet.name,
                 value: {
-                    entitySetName: entitySetChoiceName,
+                    entitySetName: entitySet.name,
                     entitySetType: entitySet.entityTypeName // Fully qualified entity type name
                 }
             };

package/dist/prompts/edmx/questions.js

@@ -62,7 +62,6 @@ function getEntitySelectionQuestions(metadata, templateType, isCapService = fals
         entitySetFilter = 'filterAggregateTransformationsOnly';
     }
     const entityChoices = (0, entity_helper_1.getEntityChoices)(metadata, {
-        useEntityTypeAsName: templateType === 'ovp',
         defaultMainEntityName: promptOptions?.defaultMainEntityName,
         entitySetFilter
     });
@@ -74,7 +73,7 @@ function getEntitySelectionQuestions(metadata, templateType, isCapService = fals
     const entityQuestions = [];
     // OVP only has filter entity, does not use tables and we do not add annotations
     if (templateType === 'ovp') {
-        entityQuestions.push(getFilterEntityTypeQuestions(entityChoices, useAutoComplete));
+        entityQuestions.push(getFilterEntitySetQuestions(entityChoices, useAutoComplete));
         // Return early since OVP does not have table layout prompts
         return entityQuestions;
     }
@@ -266,18 +265,18 @@ function getAddAnnotationQuestions(metadata, templateType, odataVersion, isCapSe
  * @param useAutoComplete Determines if entity related prompts should use auto complete on user input
  * @returns the ovp specific filter entity type selection question
  */
-function getFilterEntityTypeQuestions(entityChoices, useAutoComplete = false) {
+function getFilterEntitySetQuestions(entityChoices, useAutoComplete = false) {
     return {
         type: useAutoComplete ? 'autocomplete' : 'list',
-        name: types_1.EntityPromptNames.filterEntityType,
-        message: (0, i18n_1.t)('prompts.filterEntityType.message'),
+        name: types_1.EntityPromptNames.filterEntitySet,
+        message: (0, i18n_1.t)('prompts.filterEntitySet.message'),
         guiOptions: {
             breadcrumb: true
         },
         choices: entityChoices.choices,
         source: (preAnswers, input) => (0, inquirer_common_1.searchChoices)(input, entityChoices.choices),
         default: entityChoices.defaultMainEntityIndex ?? entityChoices.draftRootIndex ?? 0,
-        validate: () => (entityChoices.choices.length === 0 ? (0, i18n_1.t)('prompts.filterEntityType.noEntitiesError') : true)
+        validate: () => (entityChoices.choices.length === 0 ? (0, i18n_1.t)('prompts.filterEntitySet.noEntitiesError') : true)
     };
 }
 //# sourceMappingURL=questions.js.map

package/dist/translations/odata-service-inquirer.i18n.json

@@ -139,7 +139,7 @@
             "message": "Navigation entity",
             "choiceNone": "$t(texts.choiceNameNone)"
         },
-        "filterEntityType": {
+        "filterEntitySet": {
             "message": "Filter entity",
             "noEntitiesError": "$t(errors.noRelevantEntities)"
         },

package/dist/types.d.ts

@@ -139,7 +139,7 @@ export declare enum promptNames {
 export declare const EntityPromptNames: {
     readonly mainEntity: "mainEntity";
     readonly navigationEntity: "navigationEntity";
-    readonly filterEntityType: "filterEntityType";
+    readonly filterEntitySet: "filterEntitySet";
     readonly tableType: "tableType";
     readonly hierarchyQualifier: "hierarchyQualifier";
     readonly addFEOPAnnotations: "addFEOPAnnotations";
@@ -154,7 +154,7 @@ export type EntityPromptNames = (typeof EntityPromptNames)[keyof typeof EntityPr
 export interface EntitySelectionAnswers {
     [EntityPromptNames.mainEntity]?: EntityAnswer;
     [EntityPromptNames.navigationEntity]?: NavigationEntityAnswer;
-    [EntityPromptNames.filterEntityType]?: EntityAnswer;
+    [EntityPromptNames.filterEntitySet]?: EntityAnswer;
 }
 export interface TableConfigAnswers {
     [EntityPromptNames.tableType]?: TableType;

package/dist/types.js

@@ -73,7 +73,7 @@ var promptNames;
 exports.EntityPromptNames = {
     mainEntity: 'mainEntity',
     navigationEntity: 'navigationEntity',
-    filterEntityType: 'filterEntityType',
+    filterEntitySet: 'filterEntitySet',
     tableType: 'tableType',
     hierarchyQualifier: 'hierarchyQualifier',
     addFEOPAnnotations: 'addFEOPAnnotations',

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.2.36",
+  "version": "2.3.1",
   "repository": {
     "type": "git",
     "url": "https://github.com/SAP/open-ux-tools.git",
@@ -30,13 +30,13 @@
     "os-name": "4.0.1",
     "@sap-ux/axios-extension": "1.20.0",
     "@sap-ux/btp-utils": "1.0.3",
-    "@sap-ux/fiori-generator-shared": "0.10.2",
+    "@sap-ux/fiori-generator-shared": "0.11.0",
     "@sap-ux/guided-answers-helper": "0.2.2",
-    "@sap-ux/telemetry": "0.5.74",
-    "@sap-ux/inquirer-common": "0.6.36",
+    "@sap-ux/telemetry": "0.5.75",
+    "@sap-ux/inquirer-common": "0.6.37",
     "@sap-ux/logger": "0.6.0",
-    "@sap-ux/project-access": "1.29.18",
-    "@sap-ux/project-input-validator": "0.5.1",
+    "@sap-ux/project-access": "1.29.19",
+    "@sap-ux/project-input-validator": "0.5.2",
     "@sap-ux/store": "1.0.0"
   },
   "devDependencies": {
@@ -46,12 +46,12 @@
     "@types/inquirer": "8.2.6",
     "@types/lodash": "4.14.202",
     "jest-extended": "3.2.4",
-    "@sap-ux/fiori-generator-shared": "0.10.2",
-    "@sap-ux/fiori-elements-writer": "2.1.40",
-    "@sap-ux/fiori-freestyle-writer": "2.2.8",
+    "@sap-ux/fiori-generator-shared": "0.11.0",
+    "@sap-ux/fiori-elements-writer": "2.3.0",
+    "@sap-ux/fiori-freestyle-writer": "2.3.0",
     "@sap-ux/feature-toggle": "0.2.3",
-    "@sap-ux/odata-service-writer": "0.26.13",
-    "@sap-ux/cap-config-writer": "0.9.25"
+    "@sap-ux/odata-service-writer": "0.26.14",
+    "@sap-ux/cap-config-writer": "0.9.26"
   },
   "engines": {
     "node": ">=18.x"