@sap-ux/odata-service-inquirer 0.3.11 → 0.4.2

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

@@ -1,13 +1,4 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -29,9 +20,10 @@ const ignorableCertErrors = [error_handler_1.ERROR_TYPE.CERT_SELF_SIGNED, error_
  *
  */
 class ConnectionValidator {
-    constructor() {
-        this.validity = {};
-    }
+    validity = {};
+    _validatedUrl;
+    _odataService;
+    _axiosConfig;
     /**
      * Getter for the axios configuration.
      *
@@ -57,58 +49,55 @@ class ConnectionValidator {
      * @param [ignoreCertError] optional, ignore some certificate errors
      * @returns the status code or error returned by the connection attempt
      */
-    checkSapService(url, username, password, ignoreCertError = false) {
-        var _a, _b, _c;
-        return __awaiter(this, void 0, void 0, function* () {
-            const isBAS = (0, btp_utils_1.isAppStudio)();
-            try {
-                // Auto add trailing '/' to path
-                url.pathname = !((_a = url.pathname) === null || _a === void 0 ? void 0 : _a.endsWith('/')) ? `${url.pathname}/` : url.pathname;
-                // VSCode default extension proxy setting does not allow bypassing cert errors using httpsAgent (as used by Axios)
-                // so we must use globalAgent to bypass cert validation
-                if (ignoreCertError === true) {
-                    ConnectionValidator.setGlobalRejectUnauthorized(!ignoreCertError);
-                }
-                if (isBAS) {
-                    url.searchParams.append('saml2', 'disabled');
-                }
-                let axiosConfig = {
-                    params: url.searchParams,
-                    ignoreCertErrors: ignoreCertError,
-                    cookies: ''
-                };
-                if (username && password) {
-                    axiosConfig = Object.assign(axiosConfig, {
-                        auth: {
-                            username,
-                            password
-                        }
-                    });
-                }
-                this._axiosConfig = axiosConfig;
-                this._odataService = (0, axios_extension_1.createServiceForUrl)(url.origin + url.pathname, this._axiosConfig);
-                logger_helper_1.default.attachAxiosLogger(this._odataService.interceptors);
-                yield this._odataService.get('');
-                return 200;
+    async checkSapService(url, username, password, ignoreCertError = false) {
+        const isBAS = (0, btp_utils_1.isAppStudio)();
+        try {
+            // Auto add trailing '/' to path
+            url.pathname = !url.pathname?.endsWith('/') ? `${url.pathname}/` : url.pathname;
+            // VSCode default extension proxy setting does not allow bypassing cert errors using httpsAgent (as used by Axios)
+            // so we must use globalAgent to bypass cert validation
+            if (ignoreCertError === true) {
+                ConnectionValidator.setGlobalRejectUnauthorized(!ignoreCertError);
+            }
+            if (isBAS) {
+                url.searchParams.append('saml2', 'disabled');
             }
-            catch (e) {
-                logger_helper_1.default.logger.debug(`ConnectionValidator.checkSapService() - error: ${e.message}`);
-                if (e === null || e === void 0 ? void 0 : e.isAxiosError) {
-                    // Only throw for 500 on App Studio
-                    if (((_b = e === null || e === void 0 ? void 0 : e.response) === null || _b === void 0 ? void 0 : _b.status) === 500 && isBAS) {
-                        throw e;
+            let axiosConfig = {
+                params: url.searchParams,
+                ignoreCertErrors: ignoreCertError,
+                cookies: ''
+            };
+            if (username && password) {
+                axiosConfig = Object.assign(axiosConfig, {
+                    auth: {
+                        username,
+                        password
                     }
-                    return ((_c = e === null || e === void 0 ? void 0 : e.response) === null || _c === void 0 ? void 0 : _c.status) || (e === null || e === void 0 ? void 0 : e.code);
-                }
-                else {
+                });
+            }
+            this._axiosConfig = axiosConfig;
+            this._odataService = (0, axios_extension_1.createServiceForUrl)(url.origin + url.pathname, this._axiosConfig);
+            logger_helper_1.default.attachAxiosLogger(this._odataService.interceptors);
+            await this._odataService.get('');
+            return 200;
+        }
+        catch (e) {
+            logger_helper_1.default.logger.debug(`ConnectionValidator.checkSapService() - error: ${e.message}`);
+            if (e?.isAxiosError) {
+                // Only throw for 500 on App Studio
+                if (e?.response?.status === 500 && isBAS) {
                     throw e;
                 }
+                return e?.response?.status || e?.code;
             }
-            finally {
-                // Reset global cert validation
-                ConnectionValidator.setGlobalRejectUnauthorized(true);
+            else {
+                throw e;
             }
-        });
+        }
+        finally {
+            // Reset global cert validation
+            ConnectionValidator.setGlobalRejectUnauthorized(true);
+        }
     }
     /**
      * Validates the service url format as well as its reachability.
@@ -118,39 +107,36 @@ class ConnectionValidator {
      * @param forceReValidation force re-validation of the url
      * @returns true if the url is reachable, false if not, or an error message string
      */
-    validateUrl(serviceUrl, ignoreCertError = false, forceReValidation = false) {
-        var _a;
-        return __awaiter(this, void 0, void 0, function* () {
-            if (this.isEmptyString(serviceUrl)) {
-                this.resetValidity();
-                return false;
+    async validateUrl(serviceUrl, ignoreCertError = false, forceReValidation = false) {
+        if (this.isEmptyString(serviceUrl)) {
+            this.resetValidity();
+            return false;
+        }
+        try {
+            const url = new URL(serviceUrl);
+            if (!forceReValidation && this.isUrlValidated(serviceUrl)) {
+                return this.validity.reachable ?? false;
             }
-            try {
-                const url = new URL(serviceUrl);
-                if (!forceReValidation && this.isUrlValidated(serviceUrl)) {
-                    return (_a = this.validity.reachable) !== null && _a !== void 0 ? _a : false;
-                }
-                if (url.origin === 'null') {
-                    return (0, i18n_1.t)('errors.invalidUrl');
-                }
-                // Ignore path if a system url
-                const status = yield this.checkSapService(url, undefined, undefined, ignoreCertError);
-                logger_helper_1.default.logger.debug(`ConnectionValidator.validateUrl() - status: ${status}; url: ${serviceUrl}`);
-                this.validity.urlFormat = true;
-                this._validatedUrl = serviceUrl;
-                return this.getValidationResultFromStatusCode(status);
+            if (url.origin === 'null') {
+                return (0, i18n_1.t)('errors.invalidUrl');
             }
-            catch (error) {
-                // More helpful context specific error
-                if (error_handler_1.ErrorHandler.getErrorType(error) === error_handler_1.ERROR_TYPE.CONNECTION) {
-                    this.validity.reachable = false;
-                    return prompt_helpers_1.errorHandler.logErrorMsgs((0, i18n_1.t)('errors.serviceUrlNotFound', { url: serviceUrl }));
-                }
-                this.resetValidity();
-                const errorMsg = prompt_helpers_1.errorHandler.getErrorMsg(error);
-                return errorMsg !== null && errorMsg !== void 0 ? errorMsg : (0, i18n_1.t)('errors.invalidUrl');
+            // Ignore path if a system url
+            const status = await this.checkSapService(url, undefined, undefined, ignoreCertError);
+            logger_helper_1.default.logger.debug(`ConnectionValidator.validateUrl() - status: ${status}; url: ${serviceUrl}`);
+            this.validity.urlFormat = true;
+            this._validatedUrl = serviceUrl;
+            return this.getValidationResultFromStatusCode(status);
+        }
+        catch (error) {
+            // More helpful context specific error
+            if (error_handler_1.ErrorHandler.getErrorType(error) === error_handler_1.ERROR_TYPE.CONNECTION) {
+                this.validity.reachable = false;
+                return prompt_helpers_1.errorHandler.logErrorMsgs((0, i18n_1.t)('errors.serviceUrlNotFound', { url: serviceUrl }));
             }
-        });
+            this.resetValidity();
+            const errorMsg = prompt_helpers_1.errorHandler.getErrorMsg(error);
+            return errorMsg ?? (0, i18n_1.t)('errors.invalidUrl');
+        }
     }
     /**
      * Translate the status code into a validation result.
@@ -160,19 +146,18 @@ class ConnectionValidator {
      * @returns
      */
     getValidationResultFromStatusCode(status) {
-        var _a, _b, _c;
         if (status === 200) {
             this.validity.authenticated = true;
             this.validity.authRequired = false;
         }
         else if (status === 404) {
             this.validity.reachable = false;
-            return (_a = error_handler_1.ErrorHandler.getErrorMsgFromType(error_handler_1.ERROR_TYPE.NOT_FOUND)) !== null && _a !== void 0 ? _a : false;
+            return error_handler_1.ErrorHandler.getErrorMsgFromType(error_handler_1.ERROR_TYPE.NOT_FOUND) ?? false;
         }
         else if (error_handler_1.ErrorHandler.isCertError(status)) {
             this.validity.reachable = true;
             this.validity.canSkipCertError = ignorableCertErrors.includes(error_handler_1.ErrorHandler.getErrorType(status));
-            return (_b = prompt_helpers_1.errorHandler.getValidationErrorHelp(status, false)) !== null && _b !== void 0 ? _b : false;
+            return prompt_helpers_1.errorHandler.getValidationErrorHelp(status, false) ?? false;
         }
         else if (error_handler_1.ErrorHandler.getErrorType(status) === error_handler_1.ERROR_TYPE.AUTH) {
             this.validity.reachable = true;
@@ -184,7 +169,7 @@ class ConnectionValidator {
         }
         else if (status !== 404) {
             this.validity.reachable = false;
-            return (_c = error_handler_1.ErrorHandler.getErrorMsgFromType(error_handler_1.ERROR_TYPE.CONNECTION, `http code: ${status}`)) !== null && _c !== void 0 ? _c : false;
+            return error_handler_1.ErrorHandler.getErrorMsgFromType(error_handler_1.ERROR_TYPE.CONNECTION, `http code: ${status}`) ?? false;
         }
         this.validity.reachable = true;
         return true;
@@ -220,25 +205,22 @@ class ConnectionValidator {
      * @param ignoreCertError optional, ignore some certificate errors
      * @returns true if the authentication is successful, false if not, or an error message string
      */
-    validateAuth(serviceUrl, username, password, ignoreCertError = false) {
-        var _a;
-        return __awaiter(this, void 0, void 0, function* () {
-            if (!serviceUrl) {
-                return false;
-            }
-            if (!this.validity.reachable) {
-                return false;
-            }
-            try {
-                const url = new URL(serviceUrl);
-                this.validity.authenticated =
-                    (yield this.checkSapService(url, username, password, ignoreCertError)) === 200;
-                return this.validity.authenticated === true ? true : (0, i18n_1.t)('errors.authenticationFailed');
-            }
-            catch (error) {
-                return (_a = prompt_helpers_1.errorHandler.getErrorMsg(error)) !== null && _a !== void 0 ? _a : false;
-            }
-        });
+    async validateAuth(serviceUrl, username, password, ignoreCertError = false) {
+        if (!serviceUrl) {
+            return false;
+        }
+        if (!this.validity.reachable) {
+            return false;
+        }
+        try {
+            const url = new URL(serviceUrl);
+            this.validity.authenticated =
+                (await this.checkSapService(url, username, password, ignoreCertError)) === 200;
+            return this.validity.authenticated === true ? true : (0, i18n_1.t)('errors.authenticationFailed');
+        }
+        catch (error) {
+            return prompt_helpers_1.errorHandler.getErrorMsg(error) ?? false;
+        }
     }
     /**
      * Reset the validity state.

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

@@ -1,13 +1,4 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -38,8 +29,8 @@ function getServiceUrlPrompt(connectValidator, requiredVersion) {
             breadcrumb: true
         },
         message: (0, i18n_1.t)('prompts.odataServiceUrl.message', { odataVersion: requiredVersion }),
-        validate: (url) => __awaiter(this, void 0, void 0, function* () {
-            const urlValidationState = yield connectValidator.validateUrl(url);
+        validate: async (url) => {
+            const urlValidationState = await connectValidator.validateUrl(url);
             // Check if we have a cert error, the user will be prompted to ignore it later
             if (connectValidator.validity.canSkipCertError) {
                 return true;
@@ -51,7 +42,7 @@ function getServiceUrlPrompt(connectValidator, requiredVersion) {
                 return true;
             }
             return urlValidationState;
-        })
+        }
     };
 }
 /**
@@ -73,14 +64,14 @@ function getIgnoreCertErrorsPrompt(connectValidator, requiredVersion) {
         name: types_2.serviceUrlInternalPromptNames.ignoreCertError,
         message: (0, i18n_1.t)('prompts.ignoreCertErrors.message'),
         default: false,
-        validate: (ignoreCertError, { serviceUrl }) => __awaiter(this, void 0, void 0, function* () {
+        validate: async (ignoreCertError, { serviceUrl }) => {
             if (!serviceUrl) {
                 return false;
             }
             if (ignoreCertError) {
                 logger_helper_1.default.logger.warn((0, i18n_1.t)('prompts.validationMessages.warningCertificateValidationDisabled'));
             }
-            const validUrl = yield connectValidator.validateUrl(serviceUrl, ignoreCertError, true);
+            const validUrl = await connectValidator.validateUrl(serviceUrl, ignoreCertError, true);
             if (validUrl === true) {
                 if (!connectValidator.validity.authRequired) {
                     return (0, validators_1.validateService)(serviceUrl, connectValidator, requiredVersion, ignoreCertError);
@@ -88,7 +79,7 @@ function getIgnoreCertErrorsPrompt(connectValidator, requiredVersion) {
                 return true;
             }
             return validUrl;
-        })
+        }
     };
 }
 /**
@@ -103,7 +94,7 @@ function getCliIgnoreCertValidatePrompt(connectValidator, requiredVersion) {
         // Add dummy prompt for CLI to revalidate since "confirm" prompt validators don't run on CLI
         // The `when` condition should never return true (so it does not get rendered in GUI prompts) but will throw an error to exit generation
         // if the user chooses to not ignore cert errors or if the odata service is not valid
-        when: ({ serviceUrl, ignoreCertError }) => __awaiter(this, void 0, void 0, function* () {
+        when: async ({ serviceUrl, ignoreCertError }) => {
             if (serviceUrl && connectValidator.validity.canSkipCertError) {
                 // If the user choose to not ignore cert errors, we cannot continue
                 if (!ignoreCertError) {
@@ -112,20 +103,20 @@ function getCliIgnoreCertValidatePrompt(connectValidator, requiredVersion) {
                 // If the user choose to ignore cert errors, we need to re-validate
                 logger_helper_1.default.logger.warn((0, i18n_1.t)('prompts.validationMessages.warningCertificateValidationDisabled'));
                 // Re-check if auth required as the cert error would have prevented this check earlier
-                const validUrl = yield connectValidator.validateUrl(serviceUrl, ignoreCertError, true);
+                const validUrl = await connectValidator.validateUrl(serviceUrl, ignoreCertError, true);
                 if (validUrl !== true) {
                     throw new Error(validUrl.toString()); // exit
                 }
                 if (!connectValidator.validity.authRequired) {
                     // Will log on CLI
-                    const validService = yield (0, validators_1.validateService)(serviceUrl, connectValidator, requiredVersion, true);
+                    const validService = await (0, validators_1.validateService)(serviceUrl, connectValidator, requiredVersion, true);
                     if (validService !== true) {
                         throw new Error((0, i18n_1.t)('errors.exitingGeneration', { exitReason: validService.toString() }));
                     }
                 }
             }
             return false;
-        }),
+        },
         name: types_2.serviceUrlInternalPromptNames.cliIgnoreCertValidate
     };
 }
@@ -144,7 +135,7 @@ function getUsernamePrompt(connectValidator) {
         guiOptions: {
             mandatory: true
         },
-        validate: (user) => (user === null || user === void 0 ? void 0 : user.length) > 0
+        validate: (user) => user?.length > 0
     };
 }
 /**
@@ -166,16 +157,16 @@ function getPasswordPrompt(connectValidator, requiredVersion) {
         message: (0, i18n_1.t)('prompts.servicePassword.message'),
         guiType: 'login',
         mask: '*',
-        validate: (password, { username, serviceUrl, ignoreCertError }) => __awaiter(this, void 0, void 0, function* () {
+        validate: async (password, { username, serviceUrl, ignoreCertError }) => {
             if (!serviceUrl || !username || !password) {
                 return false;
             }
-            const validAuth = yield connectValidator.validateAuth(serviceUrl, username, password, ignoreCertError);
+            const validAuth = await connectValidator.validateAuth(serviceUrl, username, password, ignoreCertError);
             if (validAuth === true) {
                 return (0, validators_1.validateService)(serviceUrl, connectValidator, requiredVersion, ignoreCertError);
             }
             return validAuth;
-        })
+        }
     };
 }
 /**
@@ -189,7 +180,7 @@ function getPasswordPrompt(connectValidator, requiredVersion) {
 function getServiceUrlQuestions({ serviceUrl: serviceUrlOpts, serviceUrlPassword: passwordOpts } = {}) {
     // Connection validator maintains connection state and validity across multiple prompts
     const connectValidator = new connectionValidator_1.ConnectionValidator();
-    const requiredVersion = serviceUrlOpts === null || serviceUrlOpts === void 0 ? void 0 : serviceUrlOpts.requiredOdataVersion;
+    const requiredVersion = serviceUrlOpts?.requiredOdataVersion;
     utils_1.PromptState.reset();
     let questions = [
         getServiceUrlPrompt(connectValidator, requiredVersion),
@@ -201,11 +192,11 @@ function getServiceUrlQuestions({ serviceUrl: serviceUrlOpts, serviceUrlPassword
     questions.push(getUsernamePrompt(connectValidator), getPasswordPrompt(connectValidator, requiredVersion));
     // Add additional messages to prompts if specified in the prompt options
     let promptsOptToExtend = {};
-    if (serviceUrlOpts === null || serviceUrlOpts === void 0 ? void 0 : serviceUrlOpts.additionalMessages) {
+    if (serviceUrlOpts?.additionalMessages) {
         promptsOptToExtend = { serviceUrl: serviceUrlOpts };
     }
-    if (passwordOpts === null || passwordOpts === void 0 ? void 0 : passwordOpts.additionalMessages) {
-        promptsOptToExtend = Object.assign(Object.assign({}, promptsOptToExtend), { serviceUrlPassword: passwordOpts });
+    if (passwordOpts?.additionalMessages) {
+        promptsOptToExtend = { ...promptsOptToExtend, serviceUrlPassword: passwordOpts };
     }
     if (promptsOptToExtend) {
         questions = (0, inquirer_common_1.extendWithOptions)(questions, promptsOptToExtend, utils_1.PromptState.odataService);

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

@@ -1,13 +1,4 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -33,63 +24,60 @@ const connectionValidator_1 = require("./connectionValidator");
  * @param ignoreCertError if true some certificate errors are ignored
  * @returns true if a valid odata service was returned, false or an error message string otherwise
  */
-function validateService(url, { odataService, axiosConfig }, requiredVersion = undefined, ignoreCertError = false) {
-    var _a, _b;
-    return __awaiter(this, void 0, void 0, function* () {
+async function validateService(url, { odataService, axiosConfig }, requiredVersion = undefined, ignoreCertError = false) {
+    try {
+        if (ignoreCertError === true) {
+            connectionValidator_1.ConnectionValidator.setGlobalRejectUnauthorized(!ignoreCertError);
+        }
+        const metadata = await odataService.metadata();
+        const serviceOdataVersion = (0, utils_1.parseOdataVersion)(metadata);
+        if (requiredVersion && requiredVersion !== serviceOdataVersion) {
+            return `${(0, i18n_1.t)('errors.odataServiceVersionMismatch', {
+                serviceVersion: serviceOdataVersion,
+                requiredVersion
+            })}`;
+        }
+        // Remove all occurrences of the origin from the metadata to make backend uris relative
+        utils_1.PromptState.odataService.metadata = (0, utils_1.originToRelative)(metadata);
+        utils_1.PromptState.odataService.odataVersion = serviceOdataVersion;
+        // Extract sap-client and keep the rest of the query params as part of the url
+        const fullUrl = new URL(url);
+        const sapClient = fullUrl.searchParams.get(types_1.SAP_CLIENT_KEY) ?? undefined;
+        fullUrl.searchParams.delete(types_1.SAP_CLIENT_KEY);
+        utils_1.PromptState.odataService.servicePath = `${fullUrl.pathname}${fullUrl.search}`;
+        utils_1.PromptState.odataService.origin = fullUrl.origin;
+        utils_1.PromptState.odataService.sapClient = sapClient;
+        // Best effort attempt to get annotations but dont throw an error if it fails as this may not even be an Abap system
         try {
-            if (ignoreCertError === true) {
-                connectionValidator_1.ConnectionValidator.setGlobalRejectUnauthorized(!ignoreCertError);
-            }
-            const metadata = yield odataService.metadata();
-            const serviceOdataVersion = (0, utils_1.parseOdataVersion)(metadata);
-            if (requiredVersion && requiredVersion !== serviceOdataVersion) {
-                return `${(0, i18n_1.t)('errors.odataServiceVersionMismatch', {
-                    serviceVersion: serviceOdataVersion,
-                    requiredVersion
-                })}`;
-            }
-            // Remove all occurrences of the origin from the metadata to make backend uris relative
-            utils_1.PromptState.odataService.metadata = (0, utils_1.originToRelative)(metadata);
-            utils_1.PromptState.odataService.odataVersion = serviceOdataVersion;
-            // Extract sap-client and keep the rest of the query params as part of the url
-            const fullUrl = new URL(url);
-            const sapClient = (_a = fullUrl.searchParams.get(types_1.SAP_CLIENT_KEY)) !== null && _a !== void 0 ? _a : undefined;
-            fullUrl.searchParams.delete(types_1.SAP_CLIENT_KEY);
-            utils_1.PromptState.odataService.servicePath = `${fullUrl.pathname}${fullUrl.search}`;
-            utils_1.PromptState.odataService.origin = fullUrl.origin;
-            utils_1.PromptState.odataService.sapClient = sapClient;
-            // Best effort attempt to get annotations but dont throw an error if it fails as this may not even be an Abap system
-            try {
-                // Create an abap provider instance to get the annotations using the same request config
-                const abapProvider = (0, axios_extension_1.createForAbap)(axiosConfig);
-                const catalogService = abapProvider.catalog(serviceOdataVersion);
-                logger_helper_1.default.attachAxiosLogger(catalogService.interceptors);
-                logger_helper_1.default.logger.debug('Getting annotations for service');
-                const annotations = yield catalogService.getAnnotations({ path: fullUrl.pathname });
-                logger_helper_1.default.logger.debug(`Annotations array of length: ${annotations === null || annotations === void 0 ? void 0 : annotations.length} returned`);
-                if ((annotations === null || annotations === void 0 ? void 0 : annotations.length) === 0 || !annotations) {
-                    logger_helper_1.default.logger.info((0, i18n_1.t)('prompts.validationMessages.annotationsNotFound'));
-                }
-                utils_1.PromptState.odataService.annotations = annotations;
-            }
-            catch (err) {
+            // Create an abap provider instance to get the annotations using the same request config
+            const abapProvider = (0, axios_extension_1.createForAbap)(axiosConfig);
+            const catalogService = abapProvider.catalog(serviceOdataVersion);
+            logger_helper_1.default.attachAxiosLogger(catalogService.interceptors);
+            logger_helper_1.default.logger.debug('Getting annotations for service');
+            const annotations = await catalogService.getAnnotations({ path: fullUrl.pathname });
+            logger_helper_1.default.logger.debug(`Annotations array of length: ${annotations?.length} returned`);
+            if (annotations?.length === 0 || !annotations) {
                 logger_helper_1.default.logger.info((0, i18n_1.t)('prompts.validationMessages.annotationsNotFound'));
             }
-            return true;
+            utils_1.PromptState.odataService.annotations = annotations;
         }
-        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) {
-                // No metadata implies not a valid odata service
-                return (_b = error_handler_1.ErrorHandler.getErrorMsgFromType(error_handler_1.ERROR_TYPE.ODATA_URL_NOT_FOUND)) !== null && _b !== void 0 ? _b : false;
-            }
-            return prompt_helpers_1.errorHandler.logErrorMsgs(error);
+        catch (err) {
+            logger_helper_1.default.logger.info((0, i18n_1.t)('prompts.validationMessages.annotationsNotFound'));
         }
-        finally {
-            connectionValidator_1.ConnectionValidator.setGlobalRejectUnauthorized(true);
+        return true;
+    }
+    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) {
+            // 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 prompt_helpers_1.errorHandler.logErrorMsgs(error);
+    }
+    finally {
+        connectionValidator_1.ConnectionValidator.setGlobalRejectUnauthorized(true);
+    }
 }
 exports.validateService = validateService;
 //# sourceMappingURL=validators.js.map

package/dist/prompts/logger-helper.js

@@ -29,6 +29,7 @@ const AxiosLogger = __importStar(require("axios-logger"));
  * Static logger prevents passing of logger references through all functions, as this is a cross-cutting concern.
  */
 class LoggerHelper {
+    static _logger = new logger_1.ToolsLogger({ logPrefix: '@sap-ux/odata-service-inquirer' });
     /**
      * Get the logger.
      *
@@ -81,6 +82,5 @@ class LoggerHelper {
         });
     }
 }
-LoggerHelper._logger = new logger_1.ToolsLogger({ logPrefix: '@sap-ux/odata-service-inquirer' });
 exports.default = LoggerHelper;
 //# sourceMappingURL=logger-helper.js.map

package/dist/prompts/prompts.js

@@ -1,13 +1,4 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -28,13 +19,11 @@ const questions_2 = require("./datasources/service-url/questions");
  * @param promptOptions - options that can control some of the prompt behavior. See {@link OdataServicePromptOptions} for details
  * @returns the prompts used to provide input for OData service generation
  */
-function getQuestions(promptOptions) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const questions = [getDatasourceTypeQuestion(promptOptions === null || promptOptions === void 0 ? void 0 : promptOptions.datasourceType)];
-        // Add conditional questions depending on the selected source
-        questions.push(...(yield getDatasourceTypeConditionalQuestions(promptOptions)));
-        return questions;
-    });
+async function getQuestions(promptOptions) {
+    const questions = [getDatasourceTypeQuestion(promptOptions?.datasourceType)];
+    // Add conditional questions depending on the selected source
+    questions.push(...(await getDatasourceTypeConditionalQuestions(promptOptions)));
+    return questions;
 }
 exports.getQuestions = getQuestions;
 /**
@@ -44,7 +33,6 @@ exports.getQuestions = getQuestions;
  * @returns the datasource type question
  */
 function getDatasourceTypeQuestion(options) {
-    var _a;
     const choices = (0, prompt_helpers_1.getDatasourceTypeChoices)(options);
     return {
         type: 'list',
@@ -52,18 +40,17 @@ function getDatasourceTypeQuestion(options) {
         guiOptions: {
             breadcrumb: true
         },
-        default: (_a = options === null || options === void 0 ? void 0 : options.default) !== null && _a !== void 0 ? _a : -1,
+        default: options?.default ?? -1,
         message: (0, i18n_1.t)('prompts.datasourceType.message'),
         choices,
         additionalMessages: (source) => {
-            var _a;
             if ([
                 types_1.DatasourceType.businessHub,
                 types_1.DatasourceType.none,
                 types_1.DatasourceType.projectSpecificDestination,
                 types_1.DatasourceType.sapSystem
             ].includes(source)) {
-                (_a = logger_helper_1.default.logger) === null || _a === void 0 ? void 0 : _a.warn((0, i18n_1.t)('prompts.datasourceType.notYetImplementedWarningMessage', { datasourceType: source }));
+                logger_helper_1.default.logger?.warn((0, i18n_1.t)('prompts.datasourceType.notYetImplementedWarningMessage', { datasourceType: source }));
                 return {
                     message: (0, i18n_1.t)('prompts.datasourceType.notYetImplementedWarningMessage', { datasourceType: source }),
                     severity: yeoman_ui_types_1.Severity.warning
@@ -86,14 +73,12 @@ function getDatasourceTypeQuestion(options) {
  * @param promptOptions - options that can control some of the prompt behavior. See {@link OdataServicePromptOptions} for details
  * @returns the conditional questions based on the datasource type answer
  */
-function getDatasourceTypeConditionalQuestions(promptOptions) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const conditionalQuestions = [];
-        conditionalQuestions.push(...(0, inquirer_common_1.withCondition)([(0, metadata_file_1.getMetadataFileQuestion)(promptOptions === null || promptOptions === void 0 ? void 0 : promptOptions.metadataFilePath)], (answers) => answers.datasourceType === types_1.DatasourceType.metadataFile));
-        conditionalQuestions.push(...(0, inquirer_common_1.withCondition)((0, questions_1.getLocalCapProjectPrompts)(promptOptions), (answers) => answers.datasourceType === types_1.DatasourceType.capProject));
-        conditionalQuestions.push(...(0, inquirer_common_1.withCondition)((0, questions_2.getServiceUrlQuestions)(promptOptions), (answers) => answers.datasourceType === types_1.DatasourceType.odataServiceUrl));
-        //...further data sources to be added here
-        return conditionalQuestions;
-    });
+async function getDatasourceTypeConditionalQuestions(promptOptions) {
+    const conditionalQuestions = [];
+    conditionalQuestions.push(...(0, inquirer_common_1.withCondition)([(0, metadata_file_1.getMetadataFileQuestion)(promptOptions?.metadataFilePath)], (answers) => answers.datasourceType === types_1.DatasourceType.metadataFile));
+    conditionalQuestions.push(...(0, inquirer_common_1.withCondition)((0, questions_1.getLocalCapProjectPrompts)(promptOptions), (answers) => answers.datasourceType === types_1.DatasourceType.capProject));
+    conditionalQuestions.push(...(0, inquirer_common_1.withCondition)((0, questions_2.getServiceUrlQuestions)(promptOptions), (answers) => answers.datasourceType === types_1.DatasourceType.odataServiceUrl));
+    //...further data sources to be added here
+    return conditionalQuestions;
 }
 //# sourceMappingURL=prompts.js.map