@sap-ux/odata-service-inquirer 0.7.9 → 0.7.10

package/dist/prompts/datasources/sap-system/abap-on-btp/questions.js

@@ -71,7 +71,7 @@ function getAbapOnBTPSystemQuestions(promptOptions) {
             (connectValidator.validity.authenticated ?? connectValidator.validity.authRequired !== true))[0]);
     }
     // Service selection prompt
-    questions.push(...(0, service_selection_1.getSystemServiceQuestion)(connectValidator, abapOnBtpPromptNamespace, promptOptions));
+    questions.push(...(0, service_selection_1.getSystemServiceQuestion)(connectValidator, abapOnBtpPromptNamespace, promptOptions?.serviceSelection));
     return questions;
 }
 /**

package/dist/prompts/datasources/sap-system/abap-on-prem/questions.js

@@ -30,7 +30,7 @@ function getAbapOnPremQuestions(promptOptions) {
     // Prompt options
     const requiredOdataVersion = promptOptions?.serviceSelection?.requiredOdataVersion;
     const questions = getAbapOnPremSystemQuestions(promptOptions?.userSystemName, connectValidator, requiredOdataVersion);
-    questions.push(...(0, service_selection_1.getSystemServiceQuestion)(connectValidator, abapOnPremPromptNamespace, promptOptions));
+    questions.push(...(0, service_selection_1.getSystemServiceQuestion)(connectValidator, abapOnPremPromptNamespace, promptOptions?.serviceSelection));
     return questions;
 }
 /**

package/dist/prompts/datasources/sap-system/service-selection/questions.d.ts

@@ -1,5 +1,5 @@
 import type { Question } from 'inquirer';
-import type { OdataServicePromptOptions } from '../../../../types';
+import type { ServiceSelectionPromptOptions } from '../../../../types';
 import type { ConnectionValidator } from '../../../connectionValidator';
 import { type ServiceAnswer } from './types';
 /**
@@ -11,5 +11,5 @@ import { type ServiceAnswer } from './types';
  * @param promptOptions Options for the service selection prompt see {@link OdataServicePromptOptions}
  * @returns the service selection prompt
  */
-export declare function getSystemServiceQuestion(connectValidator: ConnectionValidator, promptNamespace: string, promptOptions?: OdataServicePromptOptions): Question<ServiceAnswer>[];
+export declare function getSystemServiceQuestion(connectValidator: ConnectionValidator, promptNamespace: string, promptOptions?: ServiceSelectionPromptOptions): Question<ServiceAnswer>[];
 //# sourceMappingURL=questions.d.ts.map

package/dist/prompts/datasources/sap-system/service-selection/questions.js

@@ -29,11 +29,12 @@ function getSystemServiceQuestion(connectValidator, promptNamespace, promptOptio
     let previousSystemUrl;
     let previousClient;
     let previousService;
-    const requiredOdataVersion = promptOptions?.serviceSelection?.requiredOdataVersion;
-    const systemServiceQuestion = {
+    const requiredOdataVersion = promptOptions?.requiredOdataVersion;
+    const serviceSelectionPromptName = `${promptNamespace}:${types_1.promptNames.serviceSelection}`;
+    let systemServiceQuestion = {
         when: () => connectValidator.validity.authenticated || connectValidator.validity.authRequired === false,
-        name: `${promptNamespace}:${types_1.promptNames.serviceSelection}`,
-        type: promptOptions?.serviceSelection?.useAutoComplete ? 'autocomplete' : 'list',
+        name: serviceSelectionPromptName,
+        type: promptOptions?.useAutoComplete ? 'autocomplete' : 'list',
         message: () => (0, service_helper_1.getSelectedServiceLabel)(connectValidator.connectedUserName),
         guiOptions: {
             breadcrumb: (0, i18n_1.t)('prompts.systemService.breadcrumb'),
@@ -86,7 +87,7 @@ function getSystemServiceQuestion(connectValidator, promptNamespace, promptOptio
         validate: async (service) => {
             let serviceAnswer = service;
             // Autocomplete passes the entire choice object as the answer, so we need to extract the value
-            if (promptOptions?.serviceSelection?.useAutoComplete && service.value) {
+            if (promptOptions?.useAutoComplete && service.value) {
                 serviceAnswer = service.value;
             }
             if (!connectValidator.validatedUrl) {
@@ -104,9 +105,16 @@ function getSystemServiceQuestion(connectValidator, promptNamespace, promptOptio
             return true;
         }
     };
+    // Add additional messages to prompts if specified in the prompt options
+    if (promptOptions?.additionalMessages) {
+        const promptOptsToApply = {
+            [serviceSelectionPromptName]: { additionalMessages: promptOptions.additionalMessages }
+        };
+        systemServiceQuestion = (0, inquirer_common_1.extendWithOptions)([systemServiceQuestion], promptOptsToApply, utils_1.PromptState.odataService)[0];
+    }
     const questions = [systemServiceQuestion];
     // Only for CLI use as `list` prompt validation does not run on CLI unless autocomplete plugin is used
-    if ((0, utils_1.getPromptHostEnvironment)() === fiori_generator_shared_1.hostEnvironment.cli && !promptOptions?.serviceSelection?.useAutoComplete) {
+    if ((0, utils_1.getPromptHostEnvironment)() === fiori_generator_shared_1.hostEnvironment.cli && !promptOptions?.useAutoComplete) {
         questions.push({
             when: async (answers) => {
                 const selectedService = answers?.[`${promptNamespace}:${types_1.promptNames.serviceSelection}`];

package/dist/prompts/datasources/sap-system/service-selection/service-helper.js

@@ -220,7 +220,7 @@ async function getServiceDetails(service, connectionValidator, requiredOdataVers
     utils_1.PromptState.odataService.annotations = serviceResult?.annotations;
     utils_1.PromptState.odataService.metadata = serviceResult?.metadata;
     utils_1.PromptState.odataService.odataVersion =
-        version ?? service.serviceODataVersion === axios_extension_1.ODataVersion.v2 ? odata_service_writer_1.OdataVersion.v2 : odata_service_writer_1.OdataVersion.v4;
+        version ?? (service.serviceODataVersion === axios_extension_1.ODataVersion.v2 ? odata_service_writer_1.OdataVersion.v2 : odata_service_writer_1.OdataVersion.v4);
     utils_1.PromptState.odataService.servicePath = service.servicePath;
     utils_1.PromptState.odataService.origin = origin;
     utils_1.PromptState.odataService.sapClient = connectionValidator.validatedClient;

package/dist/prompts/datasources/sap-system/system-selection/questions.js

@@ -67,7 +67,7 @@ async function getSystemSelectionQuestions(promptOptions) {
     const questions = await getSystemConnectionQuestions(connectValidator, promptOptions);
     // Existing system (BackendSystem or Destination) selected,
     // In future, make the service prompt optional by wrapping in condition `[promptOptions?.serviceSelection?.hide]`
-    questions.push(...(0, inquirer_common_1.withCondition)((0, questions_3.getSystemServiceQuestion)(connectValidator, systemSelectionPromptNamespace, promptOptions), (answers) => answers.systemSelection?.type !== 'newSystemChoice'));
+    questions.push(...(0, inquirer_common_1.withCondition)((0, questions_3.getSystemServiceQuestion)(connectValidator, systemSelectionPromptNamespace, promptOptions?.serviceSelection), (answers) => answers.systemSelection?.type !== 'newSystemChoice'));
     // Create new system connection for storage only supported on non-App Studio environments
     if (!(0, btp_utils_1.isAppStudio)()) {
         questions.push(...(0, inquirer_common_1.withCondition)((0, questions_2.getNewSystemQuestions)(promptOptions), (answers) => answers.systemSelection?.type === 'newSystemChoice'));

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": "0.7.9",
+  "version": "0.7.10",
   "repository": {
     "type": "git",
     "url": "https://github.com/SAP/open-ux-tools.git",
@@ -26,16 +26,16 @@
     "i18next": "23.5.1",
     "inquirer-autocomplete-prompt": "2.0.1",
     "os-name": "4.0.1",
-    "@sap-ux/axios-extension": "1.17.7",
-    "@sap-ux/btp-utils": "0.17.1",
     "@sap-ux/fiori-generator-shared": "0.7.15",
+    "@sap-ux/btp-utils": "0.17.1",
     "@sap-ux/guided-answers-helper": "0.1.1",
-    "@sap-ux/telemetry": "0.5.48",
-    "@sap-ux/inquirer-common": "0.5.12",
     "@sap-ux/logger": "0.6.0",
+    "@sap-ux/axios-extension": "1.17.7",
+    "@sap-ux/telemetry": "0.5.48",
     "@sap-ux/project-access": "1.28.9",
     "@sap-ux/project-input-validator": "0.3.4",
-    "@sap-ux/store": "1.0.0"
+    "@sap-ux/store": "1.0.0",
+    "@sap-ux/inquirer-common": "0.5.12"
   },
   "devDependencies": {
     "@sap-devx/yeoman-ui-types": "1.14.4",
@@ -45,7 +45,7 @@
     "jest-extended": "3.2.4",
     "@sap-ux/fiori-generator-shared": "0.7.15",
     "@sap-ux/feature-toggle": "0.2.3",
-    "@sap-ux/odata-service-writer": "0.24.1"
+    "@sap-ux/odata-service-writer": "0.24.2"
   },
   "engines": {
     "node": ">=18.x"