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

package/dist/index.d.ts

@@ -2,7 +2,7 @@ import { type InquirerAdapter } from '@sap-ux/inquirer-common';
 import { type Logger } from '@sap-ux/logger';
 import { OdataVersion } from '@sap-ux/odata-service-writer';
 import { type ToolsSuiteTelemetryClient } from '@sap-ux/telemetry';
-import { ERROR_TYPE, ErrorHandler } from './error-handler/error-handler';
+import { ERROR_TYPE, ErrorHandler } from '@sap-ux/inquirer-common';
 import { SystemSelectionAnswerType } from './prompts/datasources/sap-system/system-selection';
 import { DatasourceType, promptNames, type CapRuntime, type CapService, type OdataServiceAnswers, type OdataServicePromptOptions, type OdataServiceQuestion, type SapSystemType } from './types';
 /**

package/dist/index.js

@@ -9,9 +9,9 @@ exports.prompt = prompt;
 const odata_service_writer_1 = require("@sap-ux/odata-service-writer");
 Object.defineProperty(exports, "OdataVersion", { enumerable: true, get: function () { return odata_service_writer_1.OdataVersion; } });
 const inquirer_autocomplete_prompt_1 = __importDefault(require("inquirer-autocomplete-prompt"));
-const error_handler_1 = require("./error-handler/error-handler");
-Object.defineProperty(exports, "ERROR_TYPE", { enumerable: true, get: function () { return error_handler_1.ERROR_TYPE; } });
-Object.defineProperty(exports, "ErrorHandler", { enumerable: true, get: function () { return error_handler_1.ErrorHandler; } });
+const inquirer_common_1 = require("@sap-ux/inquirer-common");
+Object.defineProperty(exports, "ERROR_TYPE", { enumerable: true, get: function () { return inquirer_common_1.ERROR_TYPE; } });
+Object.defineProperty(exports, "ErrorHandler", { enumerable: true, get: function () { return inquirer_common_1.ErrorHandler; } });
 const i18n_1 = require("./i18n");
 const prompts_1 = require("./prompts");
 const logger_helper_1 = __importDefault(require("./prompts/logger-helper"));
@@ -35,10 +35,13 @@ async function getPrompts(promptOptions, logger, enableGuidedAnswers = false, te
     if (logger) {
         logger_helper_1.default.logger = logger;
     }
-    error_handler_1.ErrorHandler.logger = logger_helper_1.default.logger;
-    error_handler_1.ErrorHandler.guidedAnswersEnabled = enableGuidedAnswers;
+    inquirer_common_1.ErrorHandler.logger = logger_helper_1.default.logger;
+    inquirer_common_1.ErrorHandler.guidedAnswersEnabled = enableGuidedAnswers;
+    // Sets the platform for error handler telem reporting, based on the `isYUI` option
+    inquirer_common_1.ErrorHandler.platform = (0, utils_1.getPromptHostEnvironment)().technical;
+    inquirer_common_1.ErrorHandler.guidedAnswersTrigger = '@sap-ux/odata-service-inquirer';
     utils_1.PromptState.isYUI = isYUI;
-    (0, utils_1.setTelemetryClient)(telemetryClient);
+    (0, inquirer_common_1.setTelemetryClient)(telemetryClient);
     return {
         prompts: await (0, prompts_1.getQuestions)(promptOptions),
         // Return reference to derived answers object that will be populated with user responses (after prompting is complete)

package/dist/prompts/connectionValidator.d.ts

@@ -2,7 +2,7 @@ import type { IValidationLink } from '@sap-devx/yeoman-ui-types';
 import type { AxiosRequestConfig, CatalogService, ODataService, ServiceInfo, ServiceProvider } from '@sap-ux/axios-extension';
 import { ODataVersion } from '@sap-ux/axios-extension';
 import { type Destination } from '@sap-ux/btp-utils';
-import { ERROR_TYPE } from '../error-handler/error-handler';
+import { ERROR_TYPE } from '@sap-ux/inquirer-common';
 /**
  * Structure to store validity information about url to be validated.
  */

package/dist/prompts/connectionValidator.js

@@ -7,13 +7,13 @@ exports.ConnectionValidator = void 0;
 const axios_extension_1 = require("@sap-ux/axios-extension");
 const btp_utils_1 = require("@sap-ux/btp-utils");
 const https_1 = __importDefault(require("https"));
-const error_handler_1 = require("../error-handler/error-handler");
+const inquirer_common_1 = require("@sap-ux/inquirer-common");
 const i18n_1 = require("../i18n");
 const types_1 = require("../types");
 const logger_helper_1 = __importDefault(require("./logger-helper"));
 const prompt_helpers_1 = require("./prompt-helpers");
 // Cert errors that may be ignored by prompt user
-const ignorableCertErrors = [error_handler_1.ERROR_TYPE.CERT_SELF_SIGNED, error_handler_1.ERROR_TYPE.CERT_SELF_SIGNED_CERT_IN_CHAIN];
+const ignorableCertErrors = [inquirer_common_1.ERROR_TYPE.CERT_SELF_SIGNED, inquirer_common_1.ERROR_TYPE.CERT_SELF_SIGNED_CERT_IN_CHAIN];
 /**
  * Class that can be used to determine the connectivity using a service url, system url, or service info (UAA Key details) or reentrance ticket.
  * This will determine if if the service/catalog is reachable, authentication is required and generates ting messages to guide the user.
@@ -360,8 +360,8 @@ class ConnectionValidator {
         if (!statusCode) {
             return false;
         }
-        const errorType = error_handler_1.ErrorHandler.getErrorType(statusCode);
-        return errorType === error_handler_1.ERROR_TYPE.NOT_FOUND || errorType === error_handler_1.ERROR_TYPE.AUTH;
+        const errorType = inquirer_common_1.ErrorHandler.getErrorType(statusCode);
+        return errorType === inquirer_common_1.ERROR_TYPE.NOT_FOUND || errorType === inquirer_common_1.ERROR_TYPE.AUTH;
     }
     /**
      * Callback for when the Abap cloud system refresh token changes.
@@ -458,7 +458,7 @@ class ConnectionValidator {
             // Return a more helpful error message
             return {
                 valResult: prompt_helpers_1.errorHandler.getValidationErrorHelp(error, false, destination) ?? errorLog,
-                errorType: prompt_helpers_1.errorHandler.getCurrentErrorType() ?? error_handler_1.ERROR_TYPE.DESTINATION_CONNECTION_ERROR
+                errorType: prompt_helpers_1.errorHandler.getCurrentErrorType() ?? inquirer_common_1.ERROR_TYPE.DESTINATION_CONNECTION_ERROR
             };
         }
     }
@@ -489,13 +489,13 @@ class ConnectionValidator {
             const errorLog = prompt_helpers_1.errorHandler.logErrorMsgs(status);
             return {
                 valResult: prompt_helpers_1.errorHandler.getValidationErrorHelp(status, false, destination) ?? errorLog,
-                errorType: prompt_helpers_1.errorHandler.getCurrentErrorType() ?? error_handler_1.ERROR_TYPE.DESTINATION_CONNECTION_ERROR
+                errorType: prompt_helpers_1.errorHandler.getCurrentErrorType() ?? inquirer_common_1.ERROR_TYPE.DESTINATION_CONNECTION_ERROR
             };
         }
         if (this.validity.authRequired) {
             return {
-                valResult: error_handler_1.ErrorHandler.getErrorMsgFromType(error_handler_1.ERROR_TYPE.AUTH),
-                errorType: error_handler_1.ERROR_TYPE.AUTH
+                valResult: inquirer_common_1.ErrorHandler.getErrorMsgFromType(inquirer_common_1.ERROR_TYPE.AUTH),
+                errorType: inquirer_common_1.ERROR_TYPE.AUTH
             };
         }
         return {
@@ -558,7 +558,7 @@ class ConnectionValidator {
         catch (error) {
             this.resetValidity();
             // More helpful context specific error
-            if (error_handler_1.ErrorHandler.getErrorType(error) === error_handler_1.ERROR_TYPE.CONNECTION) {
+            if (inquirer_common_1.ErrorHandler.getErrorType(error) === inquirer_common_1.ERROR_TYPE.CONNECTION) {
                 this.validity.reachable = false;
                 return prompt_helpers_1.errorHandler.logErrorMsgs((0, i18n_1.t)('errors.systemOrServiceUrlNotFound', { url: serviceUrl }));
             }
@@ -578,40 +578,40 @@ class ConnectionValidator {
             this.validity.authenticated = true;
             return true;
         }
-        else if (error_handler_1.ErrorHandler.getErrorType(status) === error_handler_1.ERROR_TYPE.NOT_FOUND) {
+        else if (inquirer_common_1.ErrorHandler.getErrorType(status) === inquirer_common_1.ERROR_TYPE.NOT_FOUND) {
             this.validity.reachable = false;
-            return error_handler_1.ErrorHandler.getErrorMsgFromType(error_handler_1.ERROR_TYPE.NOT_FOUND) ?? false;
+            return inquirer_common_1.ErrorHandler.getErrorMsgFromType(inquirer_common_1.ERROR_TYPE.NOT_FOUND) ?? false;
         }
-        else if (error_handler_1.ErrorHandler.isCertError(status)) {
+        else if (inquirer_common_1.ErrorHandler.isCertError(status)) {
             this.validity.reachable = true;
-            this.validity.canSkipCertError = ignorableCertErrors.includes(error_handler_1.ErrorHandler.getErrorType(status));
+            this.validity.canSkipCertError = ignorableCertErrors.includes(inquirer_common_1.ErrorHandler.getErrorType(status));
             this.validity.authenticated = false;
             return prompt_helpers_1.errorHandler.getValidationErrorHelp(status, false) ?? false;
         }
-        else if (error_handler_1.ErrorHandler.getErrorType(status) === error_handler_1.ERROR_TYPE.AUTH) {
+        else if (inquirer_common_1.ErrorHandler.getErrorType(status) === inquirer_common_1.ERROR_TYPE.AUTH) {
             this.validity.reachable = true;
             this.validity.authRequired = true;
             this.validity.authenticated = false;
             return true;
         }
-        else if (error_handler_1.ErrorHandler.getErrorType(status) === error_handler_1.ERROR_TYPE.REDIRECT) {
+        else if (inquirer_common_1.ErrorHandler.getErrorType(status) === inquirer_common_1.ERROR_TYPE.REDIRECT) {
             this.validity.reachable = true;
             return (0, i18n_1.t)('errors.urlRedirect');
         }
-        else if (error_handler_1.ErrorHandler.getErrorType(status) === error_handler_1.ERROR_TYPE.CONNECTION) {
+        else if (inquirer_common_1.ErrorHandler.getErrorType(status) === inquirer_common_1.ERROR_TYPE.CONNECTION) {
             this.validity.reachable = false;
-            return (error_handler_1.ErrorHandler.getErrorMsgFromType(error_handler_1.ERROR_TYPE.CONNECTION, (0, i18n_1.t)('texts.httpStatus', { httpStatus: status })) ?? false);
+            return (inquirer_common_1.ErrorHandler.getErrorMsgFromType(inquirer_common_1.ERROR_TYPE.CONNECTION, (0, i18n_1.t)('texts.httpStatus', { httpStatus: status })) ?? false);
         }
-        else if (error_handler_1.ErrorHandler.getErrorType(status) === error_handler_1.ERROR_TYPE.BAD_REQUEST) {
+        else if (inquirer_common_1.ErrorHandler.getErrorType(status) === inquirer_common_1.ERROR_TYPE.BAD_REQUEST) {
             this.validity.reachable = true;
-            return (error_handler_1.ErrorHandler.getErrorMsgFromType(error_handler_1.ERROR_TYPE.BAD_REQUEST, (0, i18n_1.t)('texts.httpStatus', { httpStatus: status })) ?? false);
+            return (inquirer_common_1.ErrorHandler.getErrorMsgFromType(inquirer_common_1.ERROR_TYPE.BAD_REQUEST, (0, i18n_1.t)('texts.httpStatus', { httpStatus: status })) ?? false);
         }
-        else if (error_handler_1.ErrorHandler.getErrorType(status) === error_handler_1.ERROR_TYPE.BAD_GATEWAY) {
+        else if (inquirer_common_1.ErrorHandler.getErrorType(status) === inquirer_common_1.ERROR_TYPE.BAD_GATEWAY) {
             this.validity.reachable = false;
-            return (error_handler_1.ErrorHandler.getErrorMsgFromType(error_handler_1.ERROR_TYPE.BAD_GATEWAY, (0, i18n_1.t)('texts.httpStatus', { httpStatus: status })) ?? false);
+            return (inquirer_common_1.ErrorHandler.getErrorMsgFromType(inquirer_common_1.ERROR_TYPE.BAD_GATEWAY, (0, i18n_1.t)('texts.httpStatus', { httpStatus: status })) ?? false);
         }
         this.validity.reachable = true;
-        return (error_handler_1.ErrorHandler.getErrorMsgFromType(error_handler_1.ErrorHandler.getErrorType(status), (0, i18n_1.t)('texts.httpStatus', { httpStatus: status })) ?? true);
+        return (inquirer_common_1.ErrorHandler.getErrorMsgFromType(inquirer_common_1.ErrorHandler.getErrorType(status), (0, i18n_1.t)('texts.httpStatus', { httpStatus: status })) ?? true);
     }
     /**
      * Is a string nil or whitespace only.
@@ -663,8 +663,8 @@ class ConnectionValidator {
             if (client) {
                 url.searchParams.append(types_1.SAP_CLIENT_KEY, client);
             }
-            const authError = error_handler_1.ErrorHandler.getErrorType(await this.checkUrl(url, undefined, undefined, { ignoreCertError })) ===
-                error_handler_1.ERROR_TYPE.AUTH;
+            const authError = inquirer_common_1.ErrorHandler.getErrorType(await this.checkUrl(url, undefined, undefined, { ignoreCertError })) ===
+                inquirer_common_1.ERROR_TYPE.AUTH;
             // Only if we get the specific auth error so we know that auth is required, otherwise we cannot determine so leave as undefined
             if (authError) {
                 this.validity.authRequired = true;
@@ -718,7 +718,7 @@ class ConnectionValidator {
                     return { valResult: true };
                 }
                 else if (this.validity.authenticated === false) {
-                    return { valResult: (0, i18n_1.t)('errors.authenticationFailed'), errorType: error_handler_1.ERROR_TYPE.AUTH };
+                    return { valResult: (0, i18n_1.t)('errors.authenticationFailed'), errorType: inquirer_common_1.ERROR_TYPE.AUTH };
                 }
             }
             return { valResult };

package/dist/prompts/datasources/cap-project/questions.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getLocalCapProjectPrompts = getLocalCapProjectPrompts;
 const odata_service_writer_1 = require("@sap-ux/odata-service-writer");
 const project_access_1 = require("@sap-ux/project-access");
+const fiori_generator_shared_1 = require("@sap-ux/fiori-generator-shared");
 const i18n_1 = require("../../../i18n");
 const types_1 = require("../../../types");
 const utils_1 = require("../../../utils");
@@ -140,7 +141,7 @@ function getLocalCapProjectPrompts(promptOptions) {
             }
         }
     ];
-    if ((0, utils_1.getHostEnvironment)() === types_1.hostEnvironment.cli) {
+    if ((0, utils_1.getPromptHostEnvironment)() === fiori_generator_shared_1.hostEnvironment.cli) {
         prompts.push({
             when: async (answers) => {
                 if (answers?.capService) {

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

@@ -1,4 +1,4 @@
-import type { ServiceInstanceInfo } from '@sap/cf-tools';
+import { type ServiceInstanceInfo } from '@sap/cf-tools';
 import type { Question } from 'inquirer';
 import { type OdataServiceAnswers, type OdataServicePromptOptions } from '../../../../types';
 import { ConnectionValidator } from '../../../connectionValidator';

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

@@ -5,22 +5,20 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getAbapOnBTPSystemQuestions = getAbapOnBTPSystemQuestions;
 exports.getCFDiscoverPrompts = getCFDiscoverPrompts;
+const fiori_generator_shared_1 = require("@sap-ux/fiori-generator-shared");
 const inquirer_common_1 = require("@sap-ux/inquirer-common");
 const cf_tools_1 = require("@sap/cf-tools");
-const error_handler_1 = require("../../../../error-handler/error-handler");
 const i18n_1 = require("../../../../i18n");
-const types_1 = require("../../../../types");
 const utils_1 = require("../../../../utils");
 const connectionValidator_1 = require("../../../connectionValidator");
 const logger_helper_1 = __importDefault(require("../../../logger-helper"));
 const prompt_helpers_1 = require("../../../prompt-helpers");
 const questions_1 = require("../new-system/questions");
-const types_2 = require("../new-system/types");
-const validators_1 = require("../validators");
-const cf_helper_1 = require("./cf-helper");
+const types_1 = require("../new-system/types");
 const service_selection_1 = require("../service-selection");
+const validators_1 = require("../validators");
 const abapOnBtpPromptNamespace = 'abapOnBtp';
-const systemUrlPromptName = `${abapOnBtpPromptNamespace}:${types_2.newSystemPromptNames.newSystemUrl}`;
+const systemUrlPromptName = `${abapOnBtpPromptNamespace}:${types_1.newSystemPromptNames.newSystemUrl}`;
 const cliCfAbapServicePromptName = 'cliCfAbapService';
 const abapOnBtpPromptNames = {
     'abapOnBtpAuthType': 'abapOnBtpAuthType',
@@ -133,10 +131,10 @@ function getCFDiscoverPrompts(connectionValidator) {
                 applyDefaultWhenDirty: true
             },
             choices: async () => {
-                choices = await (0, cf_helper_1.getABAPInstanceChoices)();
+                choices = await (0, inquirer_common_1.getCFAbapInstanceChoices)(prompt_helpers_1.errorHandler);
                 // Cannot continue if no ABAP environments are found on Yo CLI
                 if (choices.length === 0) {
-                    if ((0, utils_1.getHostEnvironment)() === types_1.hostEnvironment.cli) {
+                    if ((0, utils_1.getPromptHostEnvironment)() === fiori_generator_shared_1.hostEnvironment.cli) {
                         throw new Error((0, i18n_1.t)('errors.abapEnvsUnavailable'));
                     }
                 }
@@ -149,7 +147,7 @@ function getCFDiscoverPrompts(connectionValidator) {
                     return await validateServiceInfo(abapService, connectionValidator);
                 }
                 const errorType = prompt_helpers_1.errorHandler.getCurrentErrorType();
-                if (errorType === error_handler_1.ERROR_TYPE.NO_ABAP_ENVS) {
+                if (errorType === inquirer_common_1.ERROR_TYPE.NO_ABAP_ENVS) {
                     const errorMsg = prompt_helpers_1.errorHandler.getErrorMsg(true);
                     const seeLogMsg = (0, i18n_1.t)('texts.seeLogForDetails');
                     return `${errorMsg} ${seeLogMsg}`;
@@ -159,7 +157,7 @@ function getCFDiscoverPrompts(connectionValidator) {
         }
     ];
     // Only for CLI use as `list` prompt validation does not run on CLI
-    if ((0, utils_1.getHostEnvironment)() === types_1.hostEnvironment.cli) {
+    if ((0, utils_1.getPromptHostEnvironment)() === fiori_generator_shared_1.hostEnvironment.cli) {
         questions.push({
             when: async (answers) => {
                 const abapService = answers?.[abapOnBtpPromptNames.cloudFoundryAbapSystem];

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

@@ -7,8 +7,8 @@ export declare enum BasicCredentialsPromptNames {
 /**
  * Re-usable credentials prompts for connection to systems using basic auth.
  *
- * @param connectionValidator
- * @param promptNamespace
+ * @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

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

@@ -14,8 +14,8 @@ var BasicCredentialsPromptNames;
 /**
  * Re-usable credentials prompts for connection to systems using basic auth.
  *
- * @param connectionValidator
- * @param promptNamespace
+ * @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

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

@@ -4,9 +4,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getSystemServiceQuestion = getSystemServiceQuestion;
+const fiori_generator_shared_1 = require("@sap-ux/fiori-generator-shared");
 const inquirer_common_1 = require("@sap-ux/inquirer-common");
 const odata_service_writer_1 = require("@sap-ux/odata-service-writer");
-const error_handler_1 = require("../../../../error-handler/error-handler");
 const i18n_1 = require("../../../../i18n");
 const types_1 = require("../../../../types");
 const utils_1 = require("../../../../utils");
@@ -92,7 +92,7 @@ function getSystemServiceQuestion(connectValidator, promptNamespace, promptOptio
             }
             // if no choices are available and an error is present, return the error message
             if (serviceChoices.length === 0 && prompt_helpers_1.errorHandler.hasError()) {
-                return error_handler_1.ErrorHandler.getHelpForError(error_handler_1.ERROR_TYPE.SERVICES_UNAVAILABLE) ?? false;
+                return inquirer_common_1.ErrorHandler.getHelpForError(inquirer_common_1.ERROR_TYPE.SERVICES_UNAVAILABLE) ?? false;
             }
             // Dont re-request the same service details
             if (serviceAnswer && previousService?.servicePath !== serviceAnswer.servicePath) {
@@ -104,7 +104,7 @@ function getSystemServiceQuestion(connectValidator, promptNamespace, promptOptio
     };
     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.getHostEnvironment)() === types_1.hostEnvironment.cli && !promptOptions?.serviceSelection?.useAutoComplete) {
+    if ((0, utils_1.getPromptHostEnvironment)() === fiori_generator_shared_1.hostEnvironment.cli && !promptOptions?.serviceSelection?.useAutoComplete) {
         questions.push({
             when: async (answers) => {
                 const selectedService = answers?.[`${promptNamespace}:${types_1.promptNames.serviceSelection}`];
@@ -116,7 +116,7 @@ function getSystemServiceQuestion(connectValidator, promptNamespace, promptOptio
                     }
                 }
                 if (serviceChoices.length === 0 && prompt_helpers_1.errorHandler.hasError()) {
-                    const noServicesError = error_handler_1.ErrorHandler.getHelpForError(error_handler_1.ERROR_TYPE.SERVICES_UNAVAILABLE).toString();
+                    const noServicesError = inquirer_common_1.ErrorHandler.getHelpForError(inquirer_common_1.ERROR_TYPE.SERVICES_UNAVAILABLE).toString();
                     throw new Error(noServicesError);
                 }
                 return false;

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

@@ -13,6 +13,7 @@ exports.getSelectedServiceMessage = getSelectedServiceMessage;
 const yeoman_ui_types_1 = require("@sap-devx/yeoman-ui-types");
 const axios_extension_1 = require("@sap-ux/axios-extension");
 const fiori_generator_shared_1 = require("@sap-ux/fiori-generator-shared");
+const inquirer_common_1 = require("@sap-ux/inquirer-common");
 const odata_service_writer_1 = require("@sap-ux/odata-service-writer");
 const i18n_1 = require("../../../../i18n");
 const utils_1 = require("../../../../utils");
@@ -128,9 +129,9 @@ async function getServiceChoices(catalogs) {
 function sendDestinationServiceSuccessTelemetryEvent(destination) {
     // May return undefined if the same event was already sent within some time frame
     const telemetryData = fiori_generator_shared_1.TelemetryHelper.createTelemetryData({
-        destODataType: (0, utils_1.getTelemPropertyDestinationType)(destination)
+        destODataType: (0, inquirer_common_1.getTelemPropertyDestinationType)(destination)
     }) ?? {};
-    (0, utils_1.sendTelemetryEvent)(exports.telemEventBASServiceSuccess, telemetryData);
+    (0, inquirer_common_1.sendTelemetryEvent)(exports.telemEventBASServiceSuccess, telemetryData);
 }
 /**
  * Gets the service metadata and annotations for the specified service path.

package/dist/prompts/datasources/sap-system/system-selection/prompt-helpers.js

@@ -9,7 +9,7 @@ exports.getBackendSystemDisplayName = getBackendSystemDisplayName;
 exports.createSystemChoices = createSystemChoices;
 const btp_utils_1 = require("@sap-ux/btp-utils");
 const store_1 = require("@sap-ux/store");
-const error_handler_1 = require("../../../../error-handler/error-handler");
+const inquirer_common_1 = require("@sap-ux/inquirer-common");
 const i18n_1 = require("../../../../i18n");
 const utils_1 = require("../../../../utils");
 const logger_helper_1 = __importDefault(require("../../../logger-helper"));
@@ -47,7 +47,7 @@ async function connectWithBackendSystem(backendSystem, connectionValidator, requ
             }));
             // If authentication failed with existing credentials the user will be prompted to enter new credentials.
             // We log the error in case there is another issue (unresolveable) with the stored backend configuration.
-            if (errorType === error_handler_1.ERROR_TYPE.AUTH && backendSystem.username && backendSystem.password) {
+            if (errorType === inquirer_common_1.ERROR_TYPE.AUTH && backendSystem.username && backendSystem.password) {
                 logger_helper_1.default.logger.error((0, i18n_1.t)('errors.storedSystemConnectionError', { systemName: backendSystem.name, error: connectValResult }));
                 return true;
             }
@@ -75,7 +75,7 @@ async function connectWithBackendSystem(backendSystem, connectionValidator, requ
 async function connectWithDestination(destination, connectionValidator, requiredOdataVersion, addServicePath) {
     const { valResult: connectValResult, errorType } = await connectionValidator.validateDestination(destination, (0, utils_1.convertODataVersionType)(requiredOdataVersion), addServicePath);
     // If authentication failed with an auth error, and the system connection auth type is basic, we will defer validation to the credentials prompt.
-    if (errorType === error_handler_1.ERROR_TYPE.AUTH && connectionValidator.systemAuthType === 'basic') {
+    if (errorType === inquirer_common_1.ERROR_TYPE.AUTH && connectionValidator.systemAuthType === 'basic') {
         logger_helper_1.default.logger.error((0, i18n_1.t)('errors.destination.authError', { systemName: destination.Name, error: connectValResult }));
         return true;
     }

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

@@ -19,6 +19,7 @@ const questions_2 = require("../new-system/questions");
 const questions_3 = require("../service-selection/questions");
 const validators_1 = require("../validators");
 const prompt_helpers_1 = require("./prompt-helpers");
+const fiori_generator_shared_1 = require("@sap-ux/fiori-generator-shared");
 // 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^';
@@ -156,7 +157,7 @@ async function getSystemConnectionQuestions(connectionValidator, promptOptions)
         questions.push(servicePathPrompt);
     }
     // Only for CLI use as `list` prompt validation does not run on CLI unless autocomplete plugin is used
-    if ((0, utils_1.getHostEnvironment)() === types_1.hostEnvironment.cli && !promptOptions?.systemSelection?.useAutoComplete) {
+    if ((0, utils_1.getPromptHostEnvironment)() === fiori_generator_shared_1.hostEnvironment.cli && !promptOptions?.systemSelection?.useAutoComplete) {
         questions.push({
             when: async (answers) => {
                 const selectedSystem = answers?.[types_1.promptNames.systemSelection];

package/dist/prompts/datasources/service-url/questions.js

@@ -12,6 +12,7 @@ const connectionValidator_1 = require("../../connectionValidator");
 const logger_helper_1 = __importDefault(require("../../logger-helper"));
 const types_2 = require("./types");
 const validators_1 = require("./validators");
+const fiori_generator_shared_1 = require("@sap-ux/fiori-generator-shared");
 /**
  * Prompt for the service URL.
  *
@@ -207,7 +208,7 @@ function getServiceUrlQuestions({ serviceUrl: serviceUrlOpts, serviceUrlPassword
         getServiceUrlPrompt(connectValidator, requiredVersion),
         getIgnoreCertErrorsPrompt(connectValidator, requiredVersion)
     ];
-    if ((0, utils_1.getHostEnvironment)() === types_1.hostEnvironment.cli) {
+    if ((0, utils_1.getPromptHostEnvironment)() === fiori_generator_shared_1.hostEnvironment.cli) {
         questions.push(getCliIgnoreCertValidatePrompt(connectValidator, requiredVersion));
     }
     questions.push(getUsernamePrompt(connectValidator), getPasswordPrompt(connectValidator, requiredVersion));

package/dist/prompts/datasources/service-url/validators.js

@@ -5,7 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.validateService = validateService;
 const axios_extension_1 = require("@sap-ux/axios-extension");
-const error_handler_1 = require("../../../error-handler/error-handler");
+const inquirer_common_1 = require("@sap-ux/inquirer-common");
 const i18n_1 = require("../../../i18n");
 const types_1 = require("../../../types");
 const utils_1 = require("../../../utils");
@@ -68,9 +68,9 @@ async function validateService(url, { odataService, axiosConfig }, requiredVersi
     catch (error) {
         delete utils_1.PromptState.odataService.metadata;
         // Provide a more specific error message if the metadata service URL is not found
-        if (error_handler_1.ErrorHandler.getErrorType(error) === error_handler_1.ERROR_TYPE.NOT_FOUND) {
+        if (inquirer_common_1.ErrorHandler.getErrorType(error) === inquirer_common_1.ERROR_TYPE.NOT_FOUND) {
             // No metadata implies not a valid odata service
-            return error_handler_1.ErrorHandler.getErrorMsgFromType(error_handler_1.ERROR_TYPE.ODATA_URL_NOT_FOUND) ?? false;
+            return inquirer_common_1.ErrorHandler.getErrorMsgFromType(inquirer_common_1.ERROR_TYPE.ODATA_URL_NOT_FOUND) ?? false;
         }
         return prompt_helpers_1.errorHandler.logErrorMsgs(error);
     }

package/dist/prompts/prompt-helpers.d.ts

@@ -1,5 +1,5 @@
 import type { ListChoiceOptions } from 'inquirer';
-import { ErrorHandler } from '../error-handler/error-handler';
+import { ErrorHandler } from '@sap-ux/inquirer-common';
 import { type DatasourceTypePromptOptions } from '../types';
 export declare const errorHandler: ErrorHandler;
 /**

package/dist/prompts/prompt-helpers.js

@@ -2,11 +2,11 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.errorHandler = void 0;
 exports.getDatasourceTypeChoices = getDatasourceTypeChoices;
-const error_handler_1 = require("../error-handler/error-handler");
+const inquirer_common_1 = require("@sap-ux/inquirer-common");
 const i18n_1 = require("../i18n");
 const types_1 = require("../types");
 // Error handling is a cross-cutting concern, a single instance is required
-exports.errorHandler = new error_handler_1.ErrorHandler();
+exports.errorHandler = new inquirer_common_1.ErrorHandler();
 /**
  * Get the datasource type choices.
  *

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

@@ -128,35 +128,18 @@
     },
     "errors": {
         "destination": {
-            "unavailable": "The selected destination references an instance that is not available. Please check your destination configuration and try again.",
-            "notFound": "The destination is misconfigured, HTTP Error 404 returned, the requested resource could not be found.",
-            "authError": "The selected system is returning an authentication error. System name: {{systemName}}, error: {{- error}}",
-            "notReachable": "The selected system is not reachable. System name: {{systemName}}, error: {{- error}}",
-            "misconfigured": "The destination is misconfigured. $t(errors.destination.missingPropMsg, {\"destinationProperty\": \"{{destinationProperty}}\" })",
-            "missingPropMsg": "The property: `{{destinationProperty}}` is missing.",
-            "httpConnectionError": "A connection error occurred with the selected destination. Http code: {{- code}}. See log for more details."
-        },
-        "cannotReadCapServiceMetadata": "An error occurred reading CAP service metadata: {{serviceName}}. See log for more details.",
+            "authError": "The selected system is returning an authentication error. System name: {{systemName}}, error: {{- error}}"
+        },
+        "cannotReadCapServiceMetadata": "An error occurred reading CAP service metadata: {{serviceName}}. $t(texts.seeLogForDetails)",
         "capModelAndServicesLoadError": "An error occurred loading the CAP model and services. {{- error}}",
         "capServiceUrlPathNotDefined": "An error occurred reading CAP service metadata: {{serviceName}}. CAP service property `urlPath` is not defined but is required.",
         "unknownError": "An error occurred{{- error, addMsgWithColonFormatter}}",
-        "servicesUnavailable": "An error occurred retrieving service(s) for SAP System.",
-        "certificateError": "A certificate error has occurred: {{- error}}",
-        "urlCertValidationError": "The system URL is using {{certErrorReason}} security certificate.",
         "authenticationFailed": "Authentication incorrect. {{error}}",
-        "authenticationTimeout": "Authorization was not verified within the allowed time. Please ensure you have authenticated using the associated browser window.",
         "invalidUrl": "Invalid URL{{-input, addMsgWithColonFormatter}}",
         "connectionError": "A connection error occurred, please ensure the target host is available on the network: {{- error}}",
-        "timeout": "A connection timeout error occurred: {{- error}}",
-        "serverReturnedAnError": "The server returned an error. {{errorDesc}}",
-        "serverUnableToCompleteRequest": "The server was unable to complete the request",
-        "catalogServiceNotActive": "Catalog service is not active",
         "urlNotFound": "URL not found",
-        "odataServiceUrlNotFound": "The service URL you have provided is not a valid OData Service. Fiori applications require an OData service as the data source.",
         "noServicesAvailable": "There are no V{{version}} OData services available from the selected system and the template you have chosen supports V{{version}} OData services only",
-        "redirectError": "A redirect response was received from the server",
         "abapEnvsUnavailable": "ABAP environments unavailable",
-        "noSuchHostError": "No such host is known",
         "systemOrServiceUrlNotFound": "Please verify the url: {{- url}}, target system configuration and network connectivity",
         "urlRedirect": "The service URL is redirecting",
         "certValidationRequired": "Certificate validation is required to continue.",
@@ -165,34 +148,18 @@
         "serviceMetadataErrorUI": "$t(errors.serviceMetadataError, {\"servicePath\": \"{{- servicePath}}\" }). $t(texts.seeLogForDetails)",
         "serviceMetadataErrorLog": "$t(errors.serviceMetadataError, {\"servicePath\": \"{{- servicePath}}\" }). {{error}}",
         "serviceTypeRequestError": "Error retrieving service type: {{- error}}",
-        "noAbapEnvsInCFSpace": "No ABAP environments in CF space found.",
-        "abapEnvsCFDiscoveryFailed": "Discovering ABAP Environments failed. Please ensure you are logged into Cloud Foundry (see https://docs.cloudfoundry.org/cf-cli/getting-started.html#login).",
         "abapServiceAuthenticationFailed": "ABAP environment authentication using UAA failed.",
         "serviceCatalogRequest": "An error occurred requesting services from: {{- catalogRequestUri }} and entity set: {{entitySet}}. {{error}}",
         "storedSystemConnectionError": "An error occurred while validating the stored system connection info. System name: {{-systemName}}, error: {{- error}}",
         "noCatalogOrServiceAvailable": "No active system or OData service endpoint connection available to retrieve service(s).",
-        "systemConnectionValidationFailed": "A connection to the selected system could not be established.",
-        "allCatalogServiceRequestsFailed": "All catalog service requests failed for the selected system. OData version(s): V{{version}}.",
-        "internalServerError": "Internal server error{{-errorMsg, addMsgWithColonFormatter}}",
-        "badGateway": "Bad gateway{{- errorMsg, addMsgWithColonFormatter}}",
-        "badRequest": "Bad request{{- errorMsg, addMsgWithColonFormatter}}"
+        "allCatalogServiceRequestsFailed": "All catalog service requests failed for the selected system. OData version(s): V{{version}}."
     },
     "texts": {
-        "anExpiredCert": "an expired",
-        "aSelfSignedCert": "a self-signed",
-        "anUnknownOrInvalidCert": "an unknown or invalid",
-        "anUntrustedRootCert": "an untrusted root",
         "suggestedSystemNameClient": ", client {{client}}",
         "seeLogForDetails": "See log for more details.",
         "forUserName": "(for user [{{username}}])",
         "systemTypeBTP": "BTP",
         "systemTypeS4HC": "S4HC",
         "httpStatus": "http status {{httpStatus}}"
-    },
-    "guidedAnswers": {
-        "validationErrorHelpText": "Need help with this error?"
-    },
-    "telemetry": {
-        "unknownOsText": "Unknown"
     }
 }

package/dist/types.d.ts

@@ -1,4 +1,3 @@
-import type { IValidationLink } from '@sap-devx/yeoman-ui-types';
 import type { Annotations, ServiceProvider } from '@sap-ux/axios-extension';
 import type { Destination } from '@sap-ux/btp-utils';
 import type { CommonPromptOptions, YUIQuestion } from '@sap-ux/inquirer-common';
@@ -270,40 +269,6 @@ export type OdataServiceUrlPasswordOptions = Pick<CommonPromptOptions, 'addition
 type odataServiceInquirerPromptOptions = Record<promptNames.datasourceType, DatasourceTypePromptOptions> & Record<promptNames.metadataFilePath, MetadataPromptOptions> & Record<promptNames.capProject, CapProjectPromptOptions> & Record<promptNames.capService, CapServicePromptOptions> & Record<promptNames.serviceUrl, OdataServiceUrlPromptOptions> & Record<promptNames.serviceUrlPassword, OdataServiceUrlPasswordOptions> & Record<promptNames.serviceSelection, ServiceSelectionPromptOptions> & Record<promptNames.userSystemName, SystemNamePromptOptions> & Record<promptNames.systemSelection, SystemSelectionPromptOptions>;
 export type OdataServiceQuestion = YUIQuestion<OdataServiceAnswers>;
 export type OdataServicePromptOptions = Partial<odataServiceInquirerPromptOptions>;
-/**
- * Implementation of IValidationLink interface.
- * Provides a toString() for serialization on CLI since IValidationLink rendering is only supported by YeomanUI.
- */
-export declare class ValidationLink implements IValidationLink {
-    message: IValidationLink['message'];
-    link: IValidationLink['link'];
-    /**
-     * Constructor for ValidationLink.
-     *
-     * @param validationLink The validation link object to be used for serialization
-     */
-    constructor(validationLink: IValidationLink);
-    /**
-     * Serialize the validation link object to a string.
-     *
-     * @returns The validation link object as a string
-     */
-    toString(): string;
-}
-export declare const hostEnvironment: {
-    vscode: {
-        name: string;
-        technical: string;
-    };
-    bas: {
-        name: string;
-        technical: string;
-    };
-    cli: {
-        name: string;
-        technical: string;
-    };
-};
 export declare const SAP_CLIENT_KEY = "sap-client";
 export {};
 //# sourceMappingURL=types.d.ts.map