@sap-ux/odata-service-inquirer 0.5.60 → 0.6.1

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

@@ -1,6 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.abapOnPremInternalPromptNames = void 0;
 exports.getAbapOnPremQuestions = getAbapOnPremQuestions;
 exports.getAbapOnPremSystemQuestions = getAbapOnPremSystemQuestions;
 const inquirer_common_1 = require("@sap-ux/inquirer-common");
@@ -8,16 +7,17 @@ const project_input_validator_1 = require("@sap-ux/project-input-validator");
 const i18n_1 = require("../../../../i18n");
 const utils_1 = require("../../../../utils");
 const connectionValidator_1 = require("../../../connectionValidator");
-const questions_1 = require("../new-system/questions");
+const questions_1 = require("../credentials/questions");
+const questions_2 = require("../new-system/questions");
 const types_1 = require("../new-system/types");
+const service_selection_1 = require("../service-selection");
 const abapOnPremPromptNamespace = 'abapOnPrem';
 const systemUrlPromptName = `${abapOnPremPromptNamespace}:${types_1.newSystemPromptNames.newSystemUrl}`;
-var abapOnPremInternalPromptNames;
-(function (abapOnPremInternalPromptNames) {
-    abapOnPremInternalPromptNames["sapClient"] = "sapClient";
-    abapOnPremInternalPromptNames["systemUsername"] = "abapSystemUsername";
-    abapOnPremInternalPromptNames["systemPassword"] = "abapSystemPassword";
-})(abapOnPremInternalPromptNames || (exports.abapOnPremInternalPromptNames = abapOnPremInternalPromptNames = {}));
+const usernamePromptName = `${abapOnPremPromptNamespace}:${questions_1.BasicCredentialsPromptNames.systemUsername}`;
+const passwordPromptName = `${abapOnPremPromptNamespace}:${questions_1.BasicCredentialsPromptNames.systemPassword}`;
+const abapOnPremPromptNames = {
+    sapClient: 'sapClient'
+};
 /**
  * Get the Abap on-premise datasource questions.
  *
@@ -30,7 +30,7 @@ function getAbapOnPremQuestions(promptOptions) {
     // Prompt options
     const requiredOdataVersion = promptOptions?.serviceSelection?.requiredOdataVersion;
     const questions = getAbapOnPremSystemQuestions(promptOptions?.userSystemName, connectValidator, requiredOdataVersion);
-    questions.push(...(0, questions_1.getSystemServiceQuestion)(connectValidator, abapOnPremPromptNamespace, promptOptions));
+    questions.push(...(0, service_selection_1.getSystemServiceQuestion)(connectValidator, abapOnPremPromptNamespace, promptOptions));
     return questions;
 }
 /**
@@ -43,12 +43,14 @@ function getAbapOnPremQuestions(promptOptions) {
  */
 function getAbapOnPremSystemQuestions(systemNamePromptOptions, connectionValidator, requiredOdataVersion) {
     const connectValidator = connectionValidator ?? new connectionValidator_1.ConnectionValidator();
-    let validClient = true;
+    // Object reference to access dynamic sapClient value in prompts where the previous answers are not available.
+    // This allows re-usability of the credentials prompts where a client prompt was not used (client was loaded from store).
+    const sapClientRef = { sapClient: undefined, isValid: true };
     const questions = [
-        (0, questions_1.getSystemUrlQuestion)(connectValidator, abapOnPremPromptNamespace, requiredOdataVersion),
+        (0, questions_2.getSystemUrlQuestion)(connectValidator, abapOnPremPromptNamespace, requiredOdataVersion),
         {
             type: 'input',
-            name: abapOnPremInternalPromptNames.sapClient,
+            name: abapOnPremPromptNames.sapClient,
             message: (0, i18n_1.t)('prompts.sapClient.message'),
             guiOptions: {
                 breadcrumb: (0, i18n_1.t)('prompts.sapClient.breadcrumb')
@@ -56,58 +58,22 @@ function getAbapOnPremSystemQuestions(systemNamePromptOptions, connectionValidat
             validate: (client) => {
                 const valRes = (0, project_input_validator_1.validateClient)(client);
                 if (valRes === true) {
-                    validClient = true;
+                    sapClientRef.sapClient = client;
+                    sapClientRef.isValid = true;
                     return true;
                 }
-                validClient = false;
+                sapClientRef.sapClient = undefined;
+                sapClientRef.isValid = false;
                 return valRes;
             }
         },
-        {
-            when: () => connectValidator.isAuthRequired(),
-            type: 'input',
-            name: abapOnPremInternalPromptNames.systemUsername,
-            message: (0, i18n_1.t)('prompts.systemUsername.message'),
-            guiOptions: {
-                mandatory: true
-            },
-            default: '',
-            validate: (user) => user?.length > 0
-        },
-        {
-            when: () => connectValidator.isAuthRequired(),
-            type: 'password',
-            guiOptions: {
-                mandatory: true
-            },
-            name: abapOnPremInternalPromptNames.systemPassword,
-            message: (0, i18n_1.t)('prompts.systemPassword.message'),
-            guiType: 'login',
-            mask: '*',
-            default: '',
-            validate: async (password, answers) => {
-                if (!(connectValidator.validatedUrl && answers.abapSystemUsername && password && validClient)) {
-                    return false;
-                }
-                const valResult = await connectValidator.validateAuth(connectValidator.validatedUrl, answers.abapSystemUsername, password, {
-                    sapClient: answers.sapClient,
-                    isSystem: true
-                });
-                if (valResult === true && connectValidator.serviceProvider) {
-                    utils_1.PromptState.odataService.connectedSystem = {
-                        serviceProvider: connectValidator.serviceProvider
-                    };
-                    return true;
-                }
-                return valResult;
-            }
-        }
+        ...(0, questions_1.getCredentialsPrompts)(connectValidator, abapOnPremPromptNamespace, sapClientRef)
     ];
     if (systemNamePromptOptions?.hide !== true) {
         // New system question will allow user to give the system a user friendly name
-        questions.push((0, inquirer_common_1.withCondition)([(0, questions_1.getUserSystemNameQuestion)(connectValidator, abapOnPremPromptNamespace)], (answers) => !!answers?.[systemUrlPromptName] &&
+        questions.push((0, inquirer_common_1.withCondition)([(0, questions_2.getUserSystemNameQuestion)(connectValidator, abapOnPremPromptNamespace)], (answers) => !!answers?.[systemUrlPromptName] &&
             connectValidator.validity.reachable === true &&
-            (connectValidator.validity.authenticated || connectValidator.validity.authRequired !== true))[0]);
+            (connectValidator.validity.authenticated || connectValidator.validity.authRequired === false))[0]);
     }
     return questions;
 }

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

@@ -0,0 +1,21 @@
+import type { Answers, Question } from 'inquirer';
+import type { ConnectionValidator } from '../../../connectionValidator';
+export declare enum BasicCredentialsPromptNames {
+    systemUsername = "systemUsername",
+    systemPassword = "systemPassword"
+}
+/**
+ * Re-usable credentials prompts for connection to systems using basic auth.
+ *
+ * @param connectionValidator the connection validator to be used for the credentials validation
+ * @param promptNamespace the namespace to be used for the prompts when used multiple times in the same prompt set
+ * @param sapClient
+ * @param sapClient.sapClient the sapClient value to be used along with the credentials validation
+ * @param sapClient.isValid validation of credentials is deferred until a valid sapClient is provided or undefined
+ * @returns the credentials prompts
+ */
+export declare function getCredentialsPrompts<T extends Answers>(connectionValidator: ConnectionValidator, promptNamespace?: string, sapClient?: {
+    sapClient: string | undefined;
+    isValid: boolean;
+}): Question<T>[];
+//# sourceMappingURL=questions.d.ts.map

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

@@ -0,0 +1,123 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.BasicCredentialsPromptNames = void 0;
+exports.getCredentialsPrompts = getCredentialsPrompts;
+const btp_utils_1 = require("@sap-ux/btp-utils");
+const i18n_1 = require("../../../../i18n");
+const types_1 = require("../../../../types");
+const utils_1 = require("../../../../utils");
+var BasicCredentialsPromptNames;
+(function (BasicCredentialsPromptNames) {
+    BasicCredentialsPromptNames["systemUsername"] = "systemUsername";
+    BasicCredentialsPromptNames["systemPassword"] = "systemPassword";
+})(BasicCredentialsPromptNames || (exports.BasicCredentialsPromptNames = BasicCredentialsPromptNames = {}));
+/**
+ * Re-usable credentials prompts for connection to systems using basic auth.
+ *
+ * @param connectionValidator the connection validator to be used for the credentials validation
+ * @param promptNamespace the namespace to be used for the prompts when used multiple times in the same prompt set
+ * @param sapClient
+ * @param sapClient.sapClient the sapClient value to be used along with the credentials validation
+ * @param sapClient.isValid validation of credentials is deferred until a valid sapClient is provided or undefined
+ * @returns the credentials prompts
+ */
+function getCredentialsPrompts(connectionValidator, promptNamespace, sapClient) {
+    const usernamePromptName = `${promptNamespace ? promptNamespace + ':' : ''}${BasicCredentialsPromptNames.systemUsername}`;
+    const passwordPromptName = `${promptNamespace ? promptNamespace + ':' : ''}${BasicCredentialsPromptNames.systemPassword}`;
+    // Optimization to prevent re-checking of auth
+    let authRequired;
+    return [
+        {
+            when: async () => {
+                authRequired = await connectionValidator.isAuthRequired();
+                return connectionValidator.systemAuthType === 'basic' && authRequired;
+            },
+            type: 'input',
+            name: usernamePromptName,
+            message: (0, i18n_1.t)('prompts.systemUsername.message'),
+            guiOptions: {
+                mandatory: true
+            },
+            default: '',
+            validate: (user) => user?.length > 0
+        },
+        {
+            when: () => connectionValidator.systemAuthType === 'basic' && authRequired,
+            type: 'password',
+            guiOptions: {
+                mandatory: true,
+                applyDefaultWhenDirty: true // Reset when the system changes, this avoids automatic reauth with the existing creds if the user changes the system selection
+            },
+            guiType: 'login',
+            name: passwordPromptName,
+            message: (0, i18n_1.t)('prompts.systemPassword.message'),
+            mask: '*',
+            default: '',
+            validate: async (password, answers) => {
+                if (!(connectionValidator.validatedUrl &&
+                    answers?.[usernamePromptName] &&
+                    password &&
+                    (sapClient?.isValid || !sapClient))) {
+                    return false;
+                }
+                // We may have a previously selected system
+                const selectedSystem = answers?.[types_1.promptNames.systemSelection];
+                let selectedSystemClient;
+                let isSystem = true;
+                if (selectedSystem?.type === 'backendSystem') {
+                    selectedSystemClient = selectedSystem.system?.client;
+                }
+                else if (selectedSystem?.type === 'destination') {
+                    // Note no need to set the client as its specified by the destination itself
+                    const destination = selectedSystem.system;
+                    if ((0, btp_utils_1.isFullUrlDestination)(destination) || (0, btp_utils_1.isPartialUrlDestination)(destination)) {
+                        isSystem = false;
+                    }
+                }
+                const { valResult } = await connectionValidator.validateAuth(connectionValidator.validatedUrl, answers?.[usernamePromptName], password, {
+                    sapClient: sapClient?.sapClient || selectedSystemClient,
+                    isSystem
+                });
+                if (valResult === true && connectionValidator.serviceProvider) {
+                    updatePromptStateWithConnectedSystem(connectionValidator.serviceProvider, selectedSystem, {
+                        username: answers?.[usernamePromptName],
+                        password: password
+                    });
+                    return true;
+                }
+                return valResult;
+            }
+        }
+    ];
+}
+/**
+ * Updates the prompt state with the connected system.
+ *
+ * @param serviceProvider the connected system service provider which is used to update the prompt state
+ * @param selectedSystem  the selected system, either a backend system or a destination
+ * @param credentials
+ * @param credentials.username the username
+ * @param credentials.password the password
+ */
+function updatePromptStateWithConnectedSystem(serviceProvider, selectedSystem, { username, password }) {
+    utils_1.PromptState.odataService.connectedSystem = {
+        serviceProvider
+    };
+    // Update the existing backend system with the new credentials that may be used to update in the store.
+    if (selectedSystem?.type === 'backendSystem') {
+        const backendSystem = selectedSystem.system;
+        // Have the credentials changed..
+        if (backendSystem.username !== username || backendSystem.password !== password) {
+            utils_1.PromptState.odataService.connectedSystem.backendSystem = Object.assign(backendSystem, {
+                username: username,
+                password,
+                newOrUpdated: true
+            });
+        }
+        // If the connection is successful and a destination was selected, assign the connected destination to the prompt state.
+    }
+    else if (selectedSystem?.type === 'destination') {
+        utils_1.PromptState.odataService.connectedSystem.destination = selectedSystem.system;
+    }
+}
+//# sourceMappingURL=questions.js.map

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

@@ -1,11 +1,13 @@
+/**
+ * New system prompting questions for re-use in multiple sap-system datasource prompt sets.
+ */
 import { type InputQuestion } from '@sap-ux/inquirer-common';
 import type { OdataVersion } from '@sap-ux/odata-service-writer';
 import type { Answers, Question } from 'inquirer';
-import type { OdataServiceAnswers, OdataServicePromptOptions, SapSystemType } from '../../../../types';
+import type { OdataServicePromptOptions, SapSystemType } from '../../../../types';
 import { promptNames } from '../../../../types';
 import type { ConnectionValidator } from '../../../connectionValidator';
 import { newSystemPromptNames } from './types';
-export declare const newSystemChoiceValue = "!@\u00A3*&937newSystem*X~qy^";
 /**
  * Internal only answers to service URL prompting not returned with OdataServiceAnswers.
  */
@@ -13,12 +15,6 @@ export interface NewSystemAnswers {
     [newSystemPromptNames.newSystemType]?: SapSystemType;
     [promptNames.userSystemName]?: string;
 }
-declare const systemSelectionPromptNames: {
-    readonly system: "system";
-};
-export interface SystemSelectionAnswer extends OdataServiceAnswers {
-    [systemSelectionPromptNames.system]?: string;
-}
 /**
  * Provides prompts that allow the creation of a new system connection.
  *
@@ -45,22 +41,4 @@ export declare function getSystemUrlQuestion<T extends Answers>(connectValidator
  * @returns the new system name prompt
  */
 export declare function getUserSystemNameQuestion(connectValidator: ConnectionValidator, promptNamespace?: string): InputQuestion<Partial<NewSystemAnswers>>;
-/**
- * Create a value for the service selection prompt message, which may include thge active connected user name.
- *
- * @param username The connected user name
- * @returns The service selection prompt message
- */
-export declare function getSelectedServiceLabel(username: string | undefined): string;
-/**
- * Get the service selection prompt for a system connection. The service selection prompt is used to select a service from the system catalog.
- *
- * @param connectValidator A reference to the active connection validator, used to validate the service selection and retrieve service details.
- * @param promptNamespace The namespace for the prompt, used to identify the prompt instance and namespaced answers.
- *     This is used to avoid conflicts with other prompts of the same types.
- * @param promptOptions Options for the service selection prompt see {@link OdataServicePromptOptions}
- * @returns the service selection prompt
- */
-export declare function getSystemServiceQuestion<T extends Answers>(connectValidator: ConnectionValidator, promptNamespace: string, promptOptions?: OdataServicePromptOptions): Question<T>[];
-export {};
 //# sourceMappingURL=questions.d.ts.map

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

@@ -1,37 +1,21 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.newSystemChoiceValue = void 0;
 exports.getNewSystemQuestions = getNewSystemQuestions;
 exports.getSystemUrlQuestion = getSystemUrlQuestion;
 exports.getUserSystemNameQuestion = getUserSystemNameQuestion;
-exports.getSelectedServiceLabel = getSelectedServiceLabel;
-exports.getSystemServiceQuestion = getSystemServiceQuestion;
-const yeoman_ui_types_1 = require("@sap-devx/yeoman-ui-types");
-const axios_extension_1 = require("@sap-ux/axios-extension");
+/**
+ * New system prompting questions for re-use in multiple sap-system datasource prompt sets.
+ */
 const inquirer_common_1 = require("@sap-ux/inquirer-common");
 const store_1 = require("@sap-ux/store");
 const i18n_1 = require("../../../../i18n");
 const types_1 = require("../../../../types");
 const utils_1 = require("../../../../utils");
+const questions_1 = require("../abap-on-btp/questions");
+const questions_2 = require("../abap-on-prem/questions");
 const prompt_helpers_1 = require("../prompt-helpers");
 const validators_1 = require("../validators");
-const service_helper_1 = require("./service-helper");
 const types_2 = require("./types");
-const questions_1 = require("../abap-on-prem/questions");
-const questions_2 = require("../abap-on-btp/questions");
-const logger_helper_1 = __importDefault(require("../../../logger-helper"));
-const prompt_helpers_2 = require("../../../prompt-helpers");
-const error_handler_1 = require("../../../../error-handler/error-handler");
-// New system choice value is a hard to guess string to avoid conflicts with existing system names or user named systems
-// since it will be used as a new system value in the system selection prompt.
-exports.newSystemChoiceValue = '!@£*&937newSystem*X~qy^';
-const cliServicePromptName = 'cliServiceSelection';
-const systemSelectionPromptNames = {
-    system: 'system'
-};
 /**
  * Convert the system connection scheme (Service Key, Rentrance Ticket, etc) to the store specific authentication type.
  * Note the absence of CF Discovery, in this case the service key file (UAA) is also used for the Abap connectivity.
@@ -69,8 +53,8 @@ function getNewSystemQuestions(promptOptions) {
             message: (0, i18n_1.t)('prompts.newSystemType.message')
         }
     ];
-    questions.push(...(0, inquirer_common_1.withCondition)((0, questions_1.getAbapOnPremQuestions)(promptOptions), (answers) => answers.newSystemType === 'abapOnPrem'));
-    questions.push(...(0, inquirer_common_1.withCondition)((0, questions_2.getAbapOnBTPSystemQuestions)(promptOptions), (answers) => answers.newSystemType === 'abapOnBtp'));
+    questions.push(...(0, inquirer_common_1.withCondition)((0, questions_2.getAbapOnPremQuestions)(promptOptions), (answers) => answers.newSystemType === 'abapOnPrem'));
+    questions.push(...(0, inquirer_common_1.withCondition)((0, questions_1.getAbapOnBTPSystemQuestions)(promptOptions), (answers) => answers.newSystemType === 'abapOnBtp'));
     return questions;
 }
 /**
@@ -97,11 +81,16 @@ function getSystemUrlQuestion(connectValidator, promptNamespace, requiredOdataVe
                 isSystem: true,
                 odataVersion: (0, utils_1.convertODataVersionType)(requiredOdataVersion)
             });
-            // If basic auth not required we should have an active connection
-            if (valResult === true && !connectValidator.validity.authRequired && connectValidator.serviceProvider) {
-                utils_1.PromptState.odataService.connectedSystem = {
-                    serviceProvider: connectValidator.serviceProvider
-                };
+            // If basic auth not required we should have an active connection (could be a re-entrance ticket supported system url)
+            if (valResult === true) {
+                if (!connectValidator.validity.authRequired && connectValidator.serviceProvider) {
+                    utils_1.PromptState.odataService.connectedSystem = {
+                        serviceProvider: connectValidator.serviceProvider
+                    };
+                }
+                else {
+                    connectValidator.systemAuthType = 'basic';
+                }
             }
             return valResult;
         }
@@ -169,6 +158,7 @@ function getUserSystemNameQuestion(connectValidator, promptNamespace) {
                         refreshToken: connectValidator.refreshToken
                     });
                     utils_1.PromptState.odataService.connectedSystem.backendSystem = backendSystem;
+                    utils_1.PromptState.odataService.connectedSystem.backendSystem.newOrUpdated = true;
                 }
             }
             return isValid;
@@ -176,144 +166,4 @@ function getUserSystemNameQuestion(connectValidator, promptNamespace) {
     };
     return newSystemNamePrompt;
 }
-/**
- * Create a value for the service selection prompt message, which may include thge active connected user name.
- *
- * @param username The connected user name
- * @returns The service selection prompt message
- */
-function getSelectedServiceLabel(username) {
-    let message = (0, i18n_1.t)('prompts.systemService.message');
-    if (username) {
-        message = message.concat(` ${(0, i18n_1.t)('texts.forUserName', { username })}`);
-    }
-    return message;
-}
-/**
- * Get the service selection prompt for a system connection. The service selection prompt is used to select a service from the system catalog.
- *
- * @param connectValidator A reference to the active connection validator, used to validate the service selection and retrieve service details.
- * @param promptNamespace The namespace for the prompt, used to identify the prompt instance and namespaced answers.
- *     This is used to avoid conflicts with other prompts of the same types.
- * @param promptOptions Options for the service selection prompt see {@link OdataServicePromptOptions}
- * @returns the service selection prompt
- */
-function getSystemServiceQuestion(connectValidator, promptNamespace, promptOptions) {
-    let serviceChoices = [];
-    // Prevent re-requesting services repeatedly by only requesting them once and when the system or client is changed
-    let previousSystemUrl;
-    let previousClient;
-    let previousService;
-    const requiredOdataVersion = promptOptions?.serviceSelection?.requiredOdataVersion;
-    const newSystemServiceQuestion = {
-        when: () => connectValidator.validity.authenticated || connectValidator.validity.authRequired === false,
-        name: `${promptNamespace}:${types_1.promptNames.serviceSelection}`,
-        type: promptOptions?.serviceSelection?.useAutoComplete ? 'autocomplete' : 'list',
-        message: () => getSelectedServiceLabel(connectValidator.connectedUserName),
-        guiOptions: {
-            breadcrumb: (0, i18n_1.t)('prompts.systemService.breadcrumb'),
-            mandatory: true,
-            applyDefaultWhenDirty: true
-        },
-        source: (prevAnswers, input) => (0, inquirer_common_1.searchChoices)(input, serviceChoices),
-        choices: async () => {
-            if (serviceChoices.length === 0 ||
-                previousSystemUrl !== connectValidator.validatedUrl ||
-                previousClient !== connectValidator.validatedClient) {
-                let catalogs = [];
-                if (requiredOdataVersion && connectValidator.catalogs[requiredOdataVersion]) {
-                    catalogs.push(connectValidator.catalogs[requiredOdataVersion]);
-                }
-                else {
-                    catalogs = Object.values(connectValidator.catalogs).filter((cat) => cat !== undefined);
-                }
-                previousSystemUrl = connectValidator.validatedUrl;
-                previousClient = connectValidator.validatedClient;
-                serviceChoices = await (0, service_helper_1.getServiceChoices)(catalogs);
-            }
-            return serviceChoices;
-        },
-        additionalMessages: (selectedService) => getSelectedServiceMessage(serviceChoices, selectedService, connectValidator, requiredOdataVersion),
-        default: () => (0, utils_1.getDefaultChoiceIndex)(serviceChoices),
-        // Warning: only executes in YUI not cli
-        validate: async (service) => {
-            if (!connectValidator.validatedUrl) {
-                return false;
-            }
-            // if no choices are available and an error is present, return the error message
-            if (serviceChoices.length === 0 && prompt_helpers_2.errorHandler.hasError()) {
-                return error_handler_1.ErrorHandler.getHelpForError(error_handler_1.ERROR_TYPE.SERVICES_UNAVAILABLE) ?? false;
-            }
-            // Dont re-request the same service details
-            if (service && previousService?.servicePath !== service.servicePath) {
-                previousService = service;
-                return (0, service_helper_1.getServiceDetails)(service, connectValidator);
-            }
-            return true;
-        }
-    };
-    const questions = [newSystemServiceQuestion];
-    // Only for CLI use as `list` prompt validation does not run on CLI
-    if ((0, utils_1.getHostEnvironment)() === types_1.hostEnvironment.cli) {
-        questions.push({
-            when: async (answers) => {
-                const selectedService = answers?.[`${promptNamespace}:${types_1.promptNames.serviceSelection}`];
-                if (selectedService && connectValidator.validatedUrl) {
-                    const result = await (0, service_helper_1.getServiceDetails)(selectedService, connectValidator);
-                    if (typeof result === 'string') {
-                        logger_helper_1.default.logger.error(result);
-                        throw new Error(result);
-                    }
-                }
-                if (serviceChoices.length === 0 && prompt_helpers_2.errorHandler.hasError()) {
-                    const noServicesError = error_handler_1.ErrorHandler.getHelpForError(error_handler_1.ERROR_TYPE.SERVICES_UNAVAILABLE).toString();
-                    throw new Error(noServicesError);
-                }
-                return false;
-            },
-            name: `${promptNamespace}:${cliServicePromptName}`
-        });
-    }
-    return questions;
-}
-/**
- * Get the service selection prompt additional message. This prompt will make an additional call to the system backend
- * to retrieve the service type and display a warning message if the service type is not UI.
- *
- * @param serviceChoices a list of service choices
- * @param selectedService the selected service
- * @param connectValidator the connection validator
- * @param requiredOdataVersion the required OData version for the service
- * @returns the service selection prompt additional message
- */
-async function getSelectedServiceMessage(serviceChoices, selectedService, connectValidator, requiredOdataVersion) {
-    if (serviceChoices?.length === 0) {
-        if (requiredOdataVersion) {
-            return {
-                message: (0, i18n_1.t)('prompts.warnings.noServicesAvailableForOdataVersion', {
-                    odataVersion: requiredOdataVersion
-                }),
-                severity: yeoman_ui_types_1.Severity.warning
-            };
-        }
-        else {
-            return {
-                message: (0, i18n_1.t)('prompts.warnings.noServicesAvailable'),
-                severity: yeoman_ui_types_1.Severity.warning
-            };
-        }
-    }
-    if (selectedService) {
-        let serviceType = selectedService.serviceType;
-        if (selectedService.serviceODataVersion === axios_extension_1.ODataVersion.v2) {
-            serviceType = await (0, service_helper_1.getServiceType)(selectedService.servicePath, selectedService.serviceType, connectValidator.catalogs[axios_extension_1.ODataVersion.v2]);
-        }
-        if (serviceType && serviceType !== axios_extension_1.ServiceType.UI) {
-            return {
-                message: (0, i18n_1.t)('prompts.warnings.nonUIServiceTypeWarningMessage', { serviceType: 'A2X' }),
-                severity: yeoman_ui_types_1.Severity.warning
-            };
-        }
-    }
-}
 //# sourceMappingURL=questions.js.map

package/dist/prompts/datasources/sap-system/new-system/types.d.ts

@@ -1,13 +1,3 @@
-import type { ODataVersion } from '@sap-ux/axios-extension';
-/**
- * Sap System service answer
- */
-export type ServiceAnswer = {
-    servicePath: string;
-    serviceODataVersion: ODataVersion;
-    toString: () => string;
-    serviceType?: string;
-};
 export declare const newSystemPromptNames: {
     readonly newSystemType: "newSystemType";
     readonly newSystemUrl: "newSystemUrl";

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

@@ -0,0 +1,3 @@
+export * from './questions';
+export * from './types';
+//# sourceMappingURL=index.d.ts.map

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

@@ -0,0 +1,19 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./questions"), exports);
+__exportStar(require("./types"), exports);
+//# sourceMappingURL=index.js.map

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

@@ -0,0 +1,15 @@
+import type { Question } from 'inquirer';
+import type { OdataServicePromptOptions } from '../../../../types';
+import type { ConnectionValidator } from '../../../connectionValidator';
+import { type ServiceAnswer } from './types';
+/**
+ * Get the service selection prompt for an Abap system connection (on-prem or on-btp). The service selection prompt is used to select a service from the system catalog.
+ *
+ * @param connectValidator A reference to the active connection validator, used to validate the service selection and retrieve service details.
+ * @param promptNamespace The namespace for the prompt, used to identify the prompt instance and namespaced answers.
+ *     This is used to avoid conflicts with other prompts of the same 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>[];
+//# sourceMappingURL=questions.d.ts.map