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

package/dist/error-handler/error-handler.js

@@ -89,6 +89,105 @@ exports.ERROR_MAP = {
  * This class will also log errors and provide help links for validation errors in some limited use cases.
  */
 class ErrorHandler {
+    /** The last error message generated */
+    currentErrorMsg;
+    /** The last error message type generated if determined */
+    currentErrorType;
+    static _guidedAnswersEnabled;
+    static _logger;
+    // Get the required localized parameterized error message
+    // Note that these are general fallback end-user error messages.
+    // More specific error messages can be used at the point of error generation.
+    static _errorMsg = (error) => ({
+        [ERROR_TYPE.CERT]: (0, i18n_1.t)('errors.certificateError', { error }),
+        [ERROR_TYPE.CERT_EXPIRED]: (0, i18n_1.t)('errors.urlCertValidationError', { certErrorReason: (0, i18n_1.t)('texts.anExpiredCert') }),
+        [ERROR_TYPE.CERT_SELF_SIGNED]: (0, i18n_1.t)('errors.urlCertValidationError', {
+            certErrorReason: (0, i18n_1.t)('texts.aSelfSignedCert')
+        }),
+        [ERROR_TYPE.CERT_UKNOWN_OR_INVALID]: (0, i18n_1.t)('errors.urlCertValidationError', {
+            certErrorReason: (0, i18n_1.t)('texts.anUnknownOrInvalidCert')
+        }),
+        [ERROR_TYPE.CERT_SELF_SIGNED_CERT_IN_CHAIN]: (0, i18n_1.t)('errors.urlCertValidationError', {
+            certErrorReason: (0, i18n_1.t)('texts.anUntrustedRootCert')
+        }),
+        [ERROR_TYPE.AUTH]: (0, i18n_1.t)('errors.authenticationFailed', { error }),
+        [ERROR_TYPE.AUTH_TIMEOUT]: (0, i18n_1.t)('errors.authenticationTimeout'),
+        [ERROR_TYPE.INVALID_URL]: (0, i18n_1.t)('errors.invalidUrl'),
+        [ERROR_TYPE.CONNECTION]: (0, i18n_1.t)('errors.connectionError', {
+            error: error?.message || JSON.stringify(error)
+        }),
+        [ERROR_TYPE.UNKNOWN]: (0, i18n_1.t)('errors.unknownError', {
+            error: error?.message || JSON.stringify(error)
+        }),
+        [ERROR_TYPE.SERVICES_UNAVAILABLE]: (0, i18n_1.t)('errors.servicesUnavailable'),
+        [ERROR_TYPE.SERVICE_UNAVAILABLE]: (0, i18n_1.t)('errors.serviceUnavailable'),
+        [ERROR_TYPE.CATALOG_SERVICE_NOT_ACTIVE]: (0, i18n_1.t)('errors.catalogServiceNotActive'),
+        [ERROR_TYPE.INTERNAL_SERVER_ERROR]: (0, i18n_1.t)('errors.internalServerError', { error: error?.message }),
+        [ERROR_TYPE.NOT_FOUND]: (0, i18n_1.t)('errors.urlNotFound'),
+        [ERROR_TYPE.ODATA_URL_NOT_FOUND]: (0, i18n_1.t)('errors.odataServiceUrlNotFound'),
+        [ERROR_TYPE.BAD_GATEWAY]: (0, i18n_1.t)('errors.badGateway'),
+        [ERROR_TYPE.DESTINATION_UNAVAILABLE]: (0, i18n_1.t)('errors.destinationUnavailable'),
+        [ERROR_TYPE.DESTINATION_NOT_FOUND]: (0, i18n_1.t)('errors.destinationNotFound'),
+        [ERROR_TYPE.DESTINATION_MISCONFIGURED]: (0, i18n_1.t)('errors.destinationMisconfigured'),
+        [ERROR_TYPE.NO_V2_SERVICES]: (0, i18n_1.t)('errors.noServicesAvailable', { version: '2' }),
+        [ERROR_TYPE.NO_V4_SERVICES]: (0, i18n_1.t)('errors.noServicesAvailable', { version: '4' }),
+        [ERROR_TYPE.DESTINATION_BAD_GATEWAY_503]: (0, i18n_1.t)('errors.destinationUnavailable'),
+        [ERROR_TYPE.REDIRECT]: (0, i18n_1.t)('errors.redirectError'),
+        [ERROR_TYPE.NO_SUCH_HOST]: (0, i18n_1.t)('errors.noSuchHostError'),
+        [ERROR_TYPE.NO_ABAP_ENVS]: (0, i18n_1.t)('error.abapEnvsUnavailable')
+    });
+    /**
+     * Get the Guided Answers (help) node for the specified error type.
+     *
+     * @param errorType The error type for which a help node (help content id) may be returned
+     * @returns The Guided Answers node for the specified error type
+     */
+    static getHelpNode = (errorType) => {
+        const errorToHelp = {
+            [ERROR_TYPE.SERVICES_UNAVAILABLE]: (0, btp_utils_1.isAppStudio)()
+                ? help_topics_1.HELP_NODES.BAS_CATALOG_SERVICES_REQUEST_FAILED
+                : undefined,
+            [ERROR_TYPE.CERT]: help_topics_1.HELP_NODES.CERTIFICATE_ERROR,
+            [ERROR_TYPE.CERT_SELF_SIGNED]: help_topics_1.HELP_NODES.CERTIFICATE_ERROR,
+            [ERROR_TYPE.CERT_UKNOWN_OR_INVALID]: help_topics_1.HELP_NODES.CERTIFICATE_ERROR,
+            [ERROR_TYPE.CERT_SELF_SIGNED_CERT_IN_CHAIN]: help_topics_1.HELP_NODES.CERTIFICATE_ERROR,
+            [ERROR_TYPE.DESTINATION_MISCONFIGURED]: help_topics_1.HELP_NODES.DESTINATION_MISCONFIGURED,
+            [ERROR_TYPE.DESTINATION_UNAVAILABLE]: help_topics_1.HELP_NODES.DESTINATION_UNAVAILABLE,
+            [ERROR_TYPE.DESTINATION_NOT_FOUND]: help_topics_1.HELP_NODES.DESTINATION_NOT_FOUND,
+            [ERROR_TYPE.BAD_GATEWAY]: help_topics_1.HELP_NODES.BAD_GATEWAY,
+            [ERROR_TYPE.DESTINATION_BAD_GATEWAY_503]: help_topics_1.HELP_NODES.DESTINATION_BAD_GATEWAY_503,
+            [ERROR_TYPE.NO_V4_SERVICES]: help_topics_1.HELP_NODES.NO_V4_SERVICES,
+            [ERROR_TYPE.AUTH]: undefined,
+            [ERROR_TYPE.AUTH_TIMEOUT]: undefined,
+            [ERROR_TYPE.REDIRECT]: undefined,
+            [ERROR_TYPE.CERT_EXPIRED]: undefined,
+            [ERROR_TYPE.UNKNOWN]: undefined,
+            [ERROR_TYPE.INVALID_URL]: undefined,
+            [ERROR_TYPE.CONNECTION]: undefined,
+            [ERROR_TYPE.SERVICE_UNAVAILABLE]: undefined,
+            [ERROR_TYPE.NO_ABAP_ENVS]: undefined,
+            [ERROR_TYPE.CATALOG_SERVICE_NOT_ACTIVE]: undefined,
+            [ERROR_TYPE.NO_SUCH_HOST]: undefined,
+            [ERROR_TYPE.NOT_FOUND]: undefined,
+            [ERROR_TYPE.ODATA_URL_NOT_FOUND]: undefined,
+            [ERROR_TYPE.INTERNAL_SERVER_ERROR]: undefined,
+            [ERROR_TYPE.NO_V2_SERVICES]: undefined
+        };
+        return errorToHelp[errorType];
+    };
+    /**
+     * Find an error property for mapping to a general error type from most to least significant.
+     *
+     * @param error any type of error or object that has an error code, status, name or message
+     * @returns a value that can be used to look up a general error type
+     */
+    static findErrorValueForMapping = (error) => error.response?.data?.error?.code ||
+        error.response?.status ||
+        error.response?.data ||
+        error.code ||
+        (['TypeError', 'Error'].includes(error.name) ? error.message : error.name) || // For generic error types use the message otherwise the name is more relevant
+        error.message ||
+        error;
     /**
      * Create an instance of the ErrorHandler.
      *
@@ -96,7 +195,7 @@ class ErrorHandler {
      * @param enableGuidedAnswers if true, the end user validation errors will include guided answers to provide help
      */
     constructor(logger, enableGuidedAnswers = false) {
-        ErrorHandler._logger = logger !== null && logger !== void 0 ? logger : new logger_1.ToolsLogger({ logPrefix: '@sap-ux/odata-service-inquirer' });
+        ErrorHandler._logger = logger ?? new logger_1.ToolsLogger({ logPrefix: '@sap-ux/odata-service-inquirer' });
         ErrorHandler.guidedAnswersEnabled = enableGuidedAnswers;
     }
     /**
@@ -169,7 +268,6 @@ class ErrorHandler {
      * @returns A user-friendly message for display in-line
      */
     logErrorMsgs(error, userMsg, retainError = true) {
-        var _a;
         let resolvedError = {
             errorMsg: '',
             errorType: ERROR_TYPE.UNKNOWN
@@ -177,7 +275,7 @@ class ErrorHandler {
         // Overloaded to allow ERROR_TYPE for convenience
         if (Object.values(ERROR_TYPE).includes(error)) {
             const errorType = error;
-            resolvedError.errorMsg = (_a = ErrorHandler.getErrorMsgFromType(errorType)) !== null && _a !== void 0 ? _a : errorType.toString();
+            resolvedError.errorMsg = ErrorHandler.getErrorMsgFromType(errorType) ?? errorType.toString();
             resolvedError.errorType = errorType;
         }
         else if (typeof error === 'string') {
@@ -188,7 +286,7 @@ class ErrorHandler {
         }
         ErrorHandler._logger.error(userMsg ? `${userMsg} ${resolvedError.errorMsg}` : resolvedError.errorMsg);
         if (retainError) {
-            this.currentErrorMsg = userMsg !== null && userMsg !== void 0 ? userMsg : resolvedError.errorMsg;
+            this.currentErrorMsg = userMsg ?? resolvedError.errorMsg;
             this.currentErrorType = resolvedError.errorType;
         }
         return resolvedError.errorMsg;
@@ -200,14 +298,13 @@ class ErrorHandler {
      * @returns The mapped error message and error type
      */
     static mapErrorToMsg(error) {
-        var _a;
         let errorType;
         if (Object.values(ERROR_TYPE).includes(error)) {
             errorType = error;
         }
         else {
             // Map error type using more to less specific information if available
-            errorType = (_a = ErrorHandler.getErrorType(this.findErrorValueForMapping(error))) !== null && _a !== void 0 ? _a : ERROR_TYPE.UNKNOWN;
+            errorType = ErrorHandler.getErrorType(this.findErrorValueForMapping(error)) ?? ERROR_TYPE.UNKNOWN;
         }
         return {
             errorMsg: ErrorHandler._errorMsg(error)[errorType],
@@ -224,14 +321,13 @@ class ErrorHandler {
      * @returns The error message
      */
     getErrorMsg(error, reset, fallback) {
-        var _a;
         let errorMsg;
         if (error) {
             errorMsg = ErrorHandler.mapErrorToMsg(error).errorMsg;
         }
         // Get previous error message
         if (!errorMsg) {
-            errorMsg = (_a = this.currentErrorMsg) !== null && _a !== void 0 ? _a : (fallback ? ErrorHandler.getErrorMsgFromType(fallback) : undefined);
+            errorMsg = this.currentErrorMsg ?? (fallback ? ErrorHandler.getErrorMsgFromType(fallback) : undefined);
         }
         if (reset) {
             this.currentErrorMsg = null;
@@ -249,7 +345,6 @@ class ErrorHandler {
      * @returns An instance of @see {ValidationLink}
      */
     getValidationErrorHelp(error, reset = false) {
-        var _a;
         let errorHelp;
         let errorMsg;
         if (error) {
@@ -259,7 +354,7 @@ class ErrorHandler {
             }
         }
         else if (!error) {
-            errorMsg = (_a = this.currentErrorMsg) !== null && _a !== void 0 ? _a : '';
+            errorMsg = this.currentErrorMsg ?? '';
             if (this.currentErrorType) {
                 errorHelp = ErrorHandler.getHelpForError(this.currentErrorType, errorMsg);
             }
@@ -268,7 +363,7 @@ class ErrorHandler {
             this.currentErrorMsg = null;
             this.currentErrorType = null;
         }
-        return errorHelp !== null && errorHelp !== void 0 ? errorHelp : errorMsg;
+        return errorHelp ?? errorMsg;
     }
     /**
      * Get the error message for the specified error type.
@@ -332,10 +427,10 @@ class ErrorHandler {
      */
     static getHelpForError(errorType, errorMsg) {
         const helpNode = ErrorHandler.getHelpNode(errorType);
-        const mappedErrorMsg = errorMsg !== null && errorMsg !== void 0 ? errorMsg : ErrorHandler.getErrorMsgFromType(errorType);
+        const mappedErrorMsg = errorMsg ?? ErrorHandler.getErrorMsgFromType(errorType);
         if (helpNode) {
             const valLink = {
-                message: mappedErrorMsg !== null && mappedErrorMsg !== void 0 ? mappedErrorMsg : '',
+                message: mappedErrorMsg ?? '',
                 link: {
                     text: (0, i18n_1.t)('guidedAnswers.validationErrorHelpText'),
                     icon: images_1.GUIDED_ANSWERS_ICON,
@@ -364,100 +459,4 @@ class ErrorHandler {
     }
 }
 exports.ErrorHandler = ErrorHandler;
-// Get the required localized parameterized error message
-// Note that these are general fallback end-user error messages.
-// More specific error messages can be used at the point of error generation.
-ErrorHandler._errorMsg = (error) => ({
-    [ERROR_TYPE.CERT]: (0, i18n_1.t)('errors.certificateError', { error }),
-    [ERROR_TYPE.CERT_EXPIRED]: (0, i18n_1.t)('errors.urlCertValidationError', { certErrorReason: (0, i18n_1.t)('texts.anExpiredCert') }),
-    [ERROR_TYPE.CERT_SELF_SIGNED]: (0, i18n_1.t)('errors.urlCertValidationError', {
-        certErrorReason: (0, i18n_1.t)('texts.aSelfSignedCert')
-    }),
-    [ERROR_TYPE.CERT_UKNOWN_OR_INVALID]: (0, i18n_1.t)('errors.urlCertValidationError', {
-        certErrorReason: (0, i18n_1.t)('texts.anUnknownOrInvalidCert')
-    }),
-    [ERROR_TYPE.CERT_SELF_SIGNED_CERT_IN_CHAIN]: (0, i18n_1.t)('errors.urlCertValidationError', {
-        certErrorReason: (0, i18n_1.t)('texts.anUntrustedRootCert')
-    }),
-    [ERROR_TYPE.AUTH]: (0, i18n_1.t)('errors.authenticationFailed', { error }),
-    [ERROR_TYPE.AUTH_TIMEOUT]: (0, i18n_1.t)('errors.authenticationTimeout'),
-    [ERROR_TYPE.INVALID_URL]: (0, i18n_1.t)('errors.invalidUrl'),
-    [ERROR_TYPE.CONNECTION]: (0, i18n_1.t)('errors.connectionError', {
-        error: (error === null || error === void 0 ? void 0 : error.message) || JSON.stringify(error)
-    }),
-    [ERROR_TYPE.UNKNOWN]: (0, i18n_1.t)('errors.unknownError', {
-        error: (error === null || error === void 0 ? void 0 : error.message) || JSON.stringify(error)
-    }),
-    [ERROR_TYPE.SERVICES_UNAVAILABLE]: (0, i18n_1.t)('errors.servicesUnavailable'),
-    [ERROR_TYPE.SERVICE_UNAVAILABLE]: (0, i18n_1.t)('errors.serviceUnavailable'),
-    [ERROR_TYPE.CATALOG_SERVICE_NOT_ACTIVE]: (0, i18n_1.t)('errors.catalogServiceNotActive'),
-    [ERROR_TYPE.INTERNAL_SERVER_ERROR]: (0, i18n_1.t)('errors.internalServerError', { error: error === null || error === void 0 ? void 0 : error.message }),
-    [ERROR_TYPE.NOT_FOUND]: (0, i18n_1.t)('errors.urlNotFound'),
-    [ERROR_TYPE.ODATA_URL_NOT_FOUND]: (0, i18n_1.t)('errors.odataServiceUrlNotFound'),
-    [ERROR_TYPE.BAD_GATEWAY]: (0, i18n_1.t)('errors.badGateway'),
-    [ERROR_TYPE.DESTINATION_UNAVAILABLE]: (0, i18n_1.t)('errors.destinationUnavailable'),
-    [ERROR_TYPE.DESTINATION_NOT_FOUND]: (0, i18n_1.t)('errors.destinationNotFound'),
-    [ERROR_TYPE.DESTINATION_MISCONFIGURED]: (0, i18n_1.t)('errors.destinationMisconfigured'),
-    [ERROR_TYPE.NO_V2_SERVICES]: (0, i18n_1.t)('errors.noServicesAvailable', { version: '2' }),
-    [ERROR_TYPE.NO_V4_SERVICES]: (0, i18n_1.t)('errors.noServicesAvailable', { version: '4' }),
-    [ERROR_TYPE.DESTINATION_BAD_GATEWAY_503]: (0, i18n_1.t)('errors.destinationUnavailable'),
-    [ERROR_TYPE.REDIRECT]: (0, i18n_1.t)('errors.redirectError'),
-    [ERROR_TYPE.NO_SUCH_HOST]: (0, i18n_1.t)('errors.noSuchHostError'),
-    [ERROR_TYPE.NO_ABAP_ENVS]: (0, i18n_1.t)('error.abapEnvsUnavailable')
-});
-/**
- * Get the Guided Answers (help) node for the specified error type.
- *
- * @param errorType The error type for which a help node (help content id) may be returned
- * @returns The Guided Answers node for the specified error type
- */
-ErrorHandler.getHelpNode = (errorType) => {
-    const errorToHelp = {
-        [ERROR_TYPE.SERVICES_UNAVAILABLE]: (0, btp_utils_1.isAppStudio)()
-            ? help_topics_1.HELP_NODES.BAS_CATALOG_SERVICES_REQUEST_FAILED
-            : undefined,
-        [ERROR_TYPE.CERT]: help_topics_1.HELP_NODES.CERTIFICATE_ERROR,
-        [ERROR_TYPE.CERT_SELF_SIGNED]: help_topics_1.HELP_NODES.CERTIFICATE_ERROR,
-        [ERROR_TYPE.CERT_UKNOWN_OR_INVALID]: help_topics_1.HELP_NODES.CERTIFICATE_ERROR,
-        [ERROR_TYPE.CERT_SELF_SIGNED_CERT_IN_CHAIN]: help_topics_1.HELP_NODES.CERTIFICATE_ERROR,
-        [ERROR_TYPE.DESTINATION_MISCONFIGURED]: help_topics_1.HELP_NODES.DESTINATION_MISCONFIGURED,
-        [ERROR_TYPE.DESTINATION_UNAVAILABLE]: help_topics_1.HELP_NODES.DESTINATION_UNAVAILABLE,
-        [ERROR_TYPE.DESTINATION_NOT_FOUND]: help_topics_1.HELP_NODES.DESTINATION_NOT_FOUND,
-        [ERROR_TYPE.BAD_GATEWAY]: help_topics_1.HELP_NODES.BAD_GATEWAY,
-        [ERROR_TYPE.DESTINATION_BAD_GATEWAY_503]: help_topics_1.HELP_NODES.DESTINATION_BAD_GATEWAY_503,
-        [ERROR_TYPE.NO_V4_SERVICES]: help_topics_1.HELP_NODES.NO_V4_SERVICES,
-        [ERROR_TYPE.AUTH]: undefined,
-        [ERROR_TYPE.AUTH_TIMEOUT]: undefined,
-        [ERROR_TYPE.REDIRECT]: undefined,
-        [ERROR_TYPE.CERT_EXPIRED]: undefined,
-        [ERROR_TYPE.UNKNOWN]: undefined,
-        [ERROR_TYPE.INVALID_URL]: undefined,
-        [ERROR_TYPE.CONNECTION]: undefined,
-        [ERROR_TYPE.SERVICE_UNAVAILABLE]: undefined,
-        [ERROR_TYPE.NO_ABAP_ENVS]: undefined,
-        [ERROR_TYPE.CATALOG_SERVICE_NOT_ACTIVE]: undefined,
-        [ERROR_TYPE.NO_SUCH_HOST]: undefined,
-        [ERROR_TYPE.NOT_FOUND]: undefined,
-        [ERROR_TYPE.ODATA_URL_NOT_FOUND]: undefined,
-        [ERROR_TYPE.INTERNAL_SERVER_ERROR]: undefined,
-        [ERROR_TYPE.NO_V2_SERVICES]: undefined
-    };
-    return errorToHelp[errorType];
-};
-/**
- * Find an error property for mapping to a general error type from most to least significant.
- *
- * @param error any type of error or object that has an error code, status, name or message
- * @returns a value that can be used to look up a general error type
- */
-ErrorHandler.findErrorValueForMapping = (error) => {
-    var _a, _b, _c, _d, _e;
-    return ((_c = (_b = (_a = error.response) === null || _a === void 0 ? void 0 : _a.data) === null || _b === void 0 ? void 0 : _b.error) === null || _c === void 0 ? void 0 : _c.code) ||
-        ((_d = error.response) === null || _d === void 0 ? void 0 : _d.status) ||
-        ((_e = error.response) === null || _e === void 0 ? void 0 : _e.data) ||
-        error.code ||
-        (['TypeError', 'Error'].includes(error.name) ? error.message : error.name) || // For generic error types use the message otherwise the name is more relevant
-        error.message ||
-        error;
-};
 //# sourceMappingURL=error-handler.js.map

package/dist/i18n.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 };
 };
@@ -20,19 +11,17 @@ exports.defaultProjectNumber = 1;
 /**
  * Initialize i18next with the translations for this module.
  */
-function initI18nOdataServiceInquirer() {
-    return __awaiter(this, void 0, void 0, function* () {
-        yield i18next_1.default.init({
-            lng: 'en',
-            fallbackLng: 'en',
-            missingInterpolationHandler: () => '',
-            interpolation: {
-                format: function odataVersionFormatter(odataVersion) {
-                    return odataVersion ? ` V${odataVersion}` : '';
-                }
+async function initI18nOdataServiceInquirer() {
+    await i18next_1.default.init({
+        lng: 'en',
+        fallbackLng: 'en',
+        missingInterpolationHandler: () => '',
+        interpolation: {
+            format: function odataVersionFormatter(odataVersion) {
+                return odataVersion ? ` V${odataVersion}` : '';
             }
-        }, () => i18next_1.default.addResourceBundle('en', odataServiceInquirerNamespace, odata_service_inquirer_i18n_json_1.default));
-    });
+        }
+    }, () => i18next_1.default.addResourceBundle('en', odataServiceInquirerNamespace, odata_service_inquirer_i18n_json_1.default));
 }
 exports.initI18nOdataServiceInquirer = initI18nOdataServiceInquirer;
 /**
@@ -43,8 +32,8 @@ exports.initI18nOdataServiceInquirer = initI18nOdataServiceInquirer;
  * @returns {string} localized string stored for the given key
  */
 function t(key, options) {
-    if (!(options === null || options === void 0 ? void 0 : options.ns)) {
-        options = Object.assign(options !== null && options !== void 0 ? options : {}, { ns: odataServiceInquirerNamespace });
+    if (!options?.ns) {
+        options = Object.assign(options ?? {}, { ns: odataServiceInquirerNamespace });
     }
     return i18next_1.default.t(key, options);
 }

package/dist/index.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 };
 };
@@ -36,21 +27,19 @@ const i18n_1 = require("./i18n");
  * @param isYUI - if true, the prompt is being called from the Yeoman UI extension host
  * @returns the prompts used to provide input for odata service generation and a reference to the answers object which will be populated with the user's responses once `inquirer.prompt` returns
  */
-function getPrompts(promptOptions, logger, enableGuidedAnswers = false, telemetryClient, isYUI = false) {
-    return __awaiter(this, void 0, void 0, function* () {
-        // prompt texts must be loaded before the prompts are created, wait for the i18n bundle to be initialized
-        yield (0, i18n_1.initI18nOdataServiceInquirer)();
-        logger_helper_1.default.logger = logger !== null && logger !== void 0 ? logger : new logger_1.ToolsLogger({ logPrefix: '@sap-ux/odata-service-inquirer' });
-        error_handler_1.ErrorHandler.logger = logger_helper_1.default.logger;
-        error_handler_1.ErrorHandler.guidedAnswersEnabled = enableGuidedAnswers;
-        utils_1.PromptState.isYUI = isYUI;
-        (0, utils_1.setTelemetryClient)(telemetryClient);
-        return {
-            prompts: yield (0, prompts_1.getQuestions)(promptOptions),
-            // Return reference to derived answers object that will be populated with user responses (after prompting is complete)
-            answers: utils_1.PromptState.odataService
-        };
-    });
+async function getPrompts(promptOptions, logger, enableGuidedAnswers = false, telemetryClient, isYUI = false) {
+    // prompt texts must be loaded before the prompts are created, wait for the i18n bundle to be initialized
+    await (0, i18n_1.initI18nOdataServiceInquirer)();
+    logger_helper_1.default.logger = logger ?? new logger_1.ToolsLogger({ logPrefix: '@sap-ux/odata-service-inquirer' });
+    error_handler_1.ErrorHandler.logger = logger_helper_1.default.logger;
+    error_handler_1.ErrorHandler.guidedAnswersEnabled = enableGuidedAnswers;
+    utils_1.PromptState.isYUI = isYUI;
+    (0, utils_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)
+        answers: utils_1.PromptState.odataService
+    };
 }
 exports.getPrompts = getPrompts;
 /**
@@ -64,15 +53,13 @@ exports.getPrompts = getPrompts;
  * @param isYUI - if true, the prompt is being called from the Yeoman UI extension host
  * @returns the prompt answers
  */
-function prompt(adapter, promptOptions, logger, enableGuidedAnswers, telemetryClient, isYUI = false) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const odataServicePrompts = (yield getPrompts(promptOptions, logger, enableGuidedAnswers, telemetryClient, isYUI))
-            .prompts;
-        const answers = yield adapter.prompt(odataServicePrompts);
-        // Add dervied service answers to the answers object
-        Object.assign(answers, utils_1.PromptState.odataService);
-        return answers;
-    });
+async function prompt(adapter, promptOptions, logger, enableGuidedAnswers, telemetryClient, isYUI = false) {
+    const odataServicePrompts = (await getPrompts(promptOptions, logger, enableGuidedAnswers, telemetryClient, isYUI))
+        .prompts;
+    const answers = await adapter.prompt(odataServicePrompts);
+    // Add dervied service answers to the answers object
+    Object.assign(answers, utils_1.PromptState.odataService);
+    return answers;
 }
 exports.prompt = prompt;
 //# sourceMappingURL=index.js.map