@sap-ux/odata-service-inquirer 2.2.27 → 2.2.28

package/dist/index.d.ts

@@ -4,8 +4,8 @@ import { OdataVersion } from '@sap-ux/odata-service-writer';
 import { type ToolsSuiteTelemetryClient } from '@sap-ux/telemetry';
 import type { Question } from 'inquirer';
 import type { ServiceAnswer } from './prompts/datasources/sap-system/service-selection';
-import { type SystemSelectionAnswers, SystemSelectionAnswerType } from './prompts/datasources/sap-system/system-selection';
-import type { CfAbapEnvServiceChoice, NewSystemChoice } from './prompts/datasources/sap-system/system-selection/prompt-helpers';
+import { type SystemSelectionAnswers } from './prompts/datasources/sap-system/system-selection';
+import type { CfAbapEnvServiceChoice, NewSystemChoice, SystemSelectionAnswerType } from './prompts/datasources/sap-system/system-selection/prompt-helpers';
 import type { Annotations } from '@sap-ux/axios-extension';
 import type { TemplateType } from '@sap-ux/fiori-elements-writer';
 import { DatasourceType, promptNames, type OdataServiceAnswers, type OdataServicePromptOptions, type OdataServiceQuestion, type SapSystemType, type EntityPromptOptions, EntityRelatedAnswers } from './types';

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

@@ -14,7 +14,7 @@ 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 shared_prompts_1 = require("../shared-prompts/shared-prompts");
 const types_1 = require("../new-system/types");
 const service_selection_1 = require("../service-selection");
 const prompt_helpers_2 = require("../system-selection/prompt-helpers");
@@ -54,7 +54,7 @@ function getAbapOnBTPSystemQuestions(promptOptions) {
     });
     // Re-entrance ticket system prompt
     questions.push((0, inquirer_common_1.withCondition)([
-        (0, questions_1.getSystemUrlQuestion)(connectValidator, abapOnBtpPromptNamespace, promptOptions?.serviceSelection?.requiredOdataVersion)
+        (0, shared_prompts_1.getSystemUrlQuestion)(connectValidator, abapOnBtpPromptNamespace, promptOptions?.serviceSelection?.requiredOdataVersion)
     ], (answers) => {
         if (answers?.abapOnBtpAuthType === 'reentranceTicket') {
             connectValidator.systemAuthType = answers.abapOnBtpAuthType;
@@ -68,7 +68,7 @@ function getAbapOnBTPSystemQuestions(promptOptions) {
     // New system store name propmt
     if (promptOptions?.userSystemName?.hide !== true) {
         // New system question will allow user to give the system a user friendly name
-        questions.push((0, inquirer_common_1.withCondition)([(0, questions_1.getUserSystemNameQuestion)(connectValidator, abapOnBtpPromptNamespace)], () => !!connectValidator.validatedUrl &&
+        questions.push((0, inquirer_common_1.withCondition)([(0, shared_prompts_1.getUserSystemNameQuestion)(connectValidator, abapOnBtpPromptNamespace)], () => !!connectValidator.validatedUrl &&
             connectValidator.validity.reachable === true &&
             (connectValidator.validity.authenticated ?? connectValidator.validity.authRequired !== true))[0]);
     }
@@ -130,7 +130,7 @@ async function validateCFServiceInfo(abapService, connectionValidator, requiredO
         // Connected system name is only used for VSCode as a default stored system name
         connectionValidator.connectedSystemName = await (0, btp_utils_1.generateABAPCloudDestinationName)(cfAbapServiceName);
         utils_1.PromptState.odataService.connectedSystem = {
-            serviceProvider: connectionValidator.serviceProvider
+            serviceProvider: (0, utils_1.removeCircularFromServiceProvider)(connectionValidator.serviceProvider)
         };
     }
     return true;
@@ -221,7 +221,7 @@ function getServiceKeyPrompt(connectionValidator) {
             const connectValResult = await connectionValidator.validateServiceInfo(serviceKeyValResult);
             if (connectValResult === true && connectionValidator.serviceProvider) {
                 utils_1.PromptState.odataService.connectedSystem = {
-                    serviceProvider: connectionValidator.serviceProvider
+                    serviceProvider: (0, utils_1.removeCircularFromServiceProvider)(connectionValidator.serviceProvider)
                 };
             }
             return connectValResult;

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

@@ -8,7 +8,7 @@ const i18n_1 = require("../../../../i18n");
 const utils_1 = require("../../../../utils");
 const connectionValidator_1 = require("../../../connectionValidator");
 const questions_1 = require("../credentials/questions");
-const questions_2 = require("../new-system/questions");
+const shared_prompts_1 = require("../shared-prompts/shared-prompts");
 const types_1 = require("../new-system/types");
 const service_selection_1 = require("../service-selection");
 const abapOnPremPromptNamespace = 'abapOnPrem';
@@ -47,7 +47,7 @@ function getAbapOnPremSystemQuestions(systemNamePromptOptions, connectionValidat
     // This allows re-usability of the credentials prompts where a client prompt was not used (client was loaded from store).
     const sapClientRef = { sapClient: undefined, isValid: true };
     const questions = [
-        (0, questions_2.getSystemUrlQuestion)(connectValidator, abapOnPremPromptNamespace, requiredOdataVersion),
+        (0, shared_prompts_1.getSystemUrlQuestion)(connectValidator, abapOnPremPromptNamespace, requiredOdataVersion),
         {
             type: 'input',
             name: abapOnPremPromptNames.sapClient,
@@ -71,7 +71,7 @@ function getAbapOnPremSystemQuestions(systemNamePromptOptions, connectionValidat
     ];
     if (systemNamePromptOptions?.hide !== true) {
         // New system question will allow user to give the system a user friendly name
-        questions.push((0, inquirer_common_1.withCondition)([(0, questions_2.getUserSystemNameQuestion)(connectValidator, abapOnPremPromptNamespace)], (answers) => !!answers?.[systemUrlPromptName] &&
+        questions.push((0, inquirer_common_1.withCondition)([(0, shared_prompts_1.getUserSystemNameQuestion)(connectValidator, abapOnPremPromptNamespace)], (answers) => !!answers?.[systemUrlPromptName] &&
             connectValidator.validity.reachable === true &&
             (connectValidator.validity.authenticated || connectValidator.validity.authRequired === false))[0]);
     }

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

@@ -1,12 +1,5 @@
-/**
- * New system prompting questions for re-use in multiple sap-system datasource prompt sets.
- */
-import { type InputQuestion } from '@sap-ux/inquirer-common';
-import type { OdataVersion } from '@sap-ux/odata-service-writer';
-import type { Answers, Question } from 'inquirer';
-import type { OdataServicePromptOptions, SapSystemType } from '../../../../types';
-import { promptNames } from '../../../../types';
-import type { ConnectionValidator } from '../../../connectionValidator';
+import type { Question } from 'inquirer';
+import type { OdataServicePromptOptions, SapSystemType, promptNames } from '../../../../types';
 import { newSystemPromptNames } from './types';
 /**
  * Internal only answers to service URL prompting not returned with OdataServiceAnswers.
@@ -22,23 +15,4 @@ export interface NewSystemAnswers {
  * @returns questions for creating a new system connection
  */
 export declare function getNewSystemQuestions(promptOptions?: OdataServicePromptOptions): Question<NewSystemAnswers>[];
-/**
- * Get the system url prompt. The system url prompt is used to connect to a new system using the user input system url.
- *
- * @param connectValidator a connection validator instance used to validate the system url
- * @param promptNamespace The namespace for the prompt, used to identify the prompt instance and namespaced answers.
- * @param requiredOdataVersion The required OData version for the system connection, only catalogs supporting the specifc odata version will be used.
- * @returns the system url prompt
- */
-export declare function getSystemUrlQuestion<T extends Answers>(connectValidator: ConnectionValidator, promptNamespace?: string, requiredOdataVersion?: OdataVersion): InputQuestion<T>;
-/**
- * Get a prompt for new system name.
- *
- * @param connectValidator A reference to the active connection validator,
- *     at prompt execution time the connection properties will be used to create a new BackendSystem, set into the PromptState.odataService.connectedSystem
- * @param promptNamespace The namespace for the prompt, used to identify the prompt instance and namespaced answers.
- *     This prevents conflicts with other prompts of the same types where the same prompt is used by multiple other prompts but cannot share the name.
- * @returns the new system name prompt
- */
-export declare function getUserSystemNameQuestion(connectValidator: ConnectionValidator, promptNamespace?: string): InputQuestion<Partial<NewSystemAnswers>>;
 //# sourceMappingURL=questions.d.ts.map

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

@@ -1,40 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getNewSystemQuestions = getNewSystemQuestions;
-exports.getSystemUrlQuestion = getSystemUrlQuestion;
-exports.getUserSystemNameQuestion = getUserSystemNameQuestion;
 /**
  * New system prompting questions for re-use in multiple sap-system datasource prompt sets.
  */
 const inquirer_common_1 = require("@sap-ux/inquirer-common");
-const store_1 = require("@sap-ux/store");
 const i18n_1 = require("../../../../i18n");
-const types_1 = require("../../../../types");
-const utils_1 = require("../../../../utils");
 const questions_1 = require("../abap-on-btp/questions");
 const questions_2 = require("../abap-on-prem/questions");
-const prompt_helpers_1 = require("../prompt-helpers");
-const validators_1 = require("../validators");
-const types_2 = require("./types");
-/**
- * Convert the system connection scheme (Service Key, Rentrance Ticket, etc) to the store specific authentication type.
- * Note the absence of CF Discovery, in this case the service key file (UAA) is also used for the Abap connectivity.
- *
- * @param systemAuthType The system authentication type
- * @returns The store specific authentication type
- */
-function systemAuthTypeToAuthenticationType(systemAuthType) {
-    switch (systemAuthType) {
-        case 'serviceKey':
-            return store_1.AuthenticationType.OAuth2RefreshToken;
-        case 'reentranceTicket':
-            return store_1.AuthenticationType.ReentranceTicket;
-        case 'basic':
-            return store_1.AuthenticationType.Basic;
-        default:
-            return undefined;
-    }
-}
+const types_1 = require("./types");
 /**
  * Provides prompts that allow the creation of a new system connection.
  *
@@ -45,7 +19,7 @@ function getNewSystemQuestions(promptOptions) {
     const questions = [
         {
             type: 'list',
-            name: types_2.newSystemPromptNames.newSystemType,
+            name: types_1.newSystemPromptNames.newSystemType,
             choices: [
                 { name: (0, i18n_1.t)('prompts.newSystemType.choiceAbapOnBtp'), value: 'abapOnBtp' },
                 { name: (0, i18n_1.t)('prompts.newSystemType.choiceAbapOnPrem'), value: 'abapOnPrem' }
@@ -57,114 +31,4 @@ function getNewSystemQuestions(promptOptions) {
     questions.push(...(0, inquirer_common_1.withCondition)((0, questions_1.getAbapOnBTPSystemQuestions)(promptOptions), (answers) => answers.newSystemType === 'abapOnBtp'));
     return questions;
 }
-/**
- * Get the system url prompt. The system url prompt is used to connect to a new system using the user input system url.
- *
- * @param connectValidator a connection validator instance used to validate the system url
- * @param promptNamespace The namespace for the prompt, used to identify the prompt instance and namespaced answers.
- * @param requiredOdataVersion The required OData version for the system connection, only catalogs supporting the specifc odata version will be used.
- * @returns the system url prompt
- */
-function getSystemUrlQuestion(connectValidator, promptNamespace, requiredOdataVersion) {
-    const promptName = `${promptNamespace ? promptNamespace + ':' : ''}${types_2.newSystemPromptNames.newSystemUrl}`;
-    const newSystemUrlQuestion = {
-        type: 'input',
-        name: promptName,
-        message: (0, i18n_1.t)('prompts.systemUrl.message'),
-        guiOptions: {
-            hint: (0, i18n_1.t)('prompts.systemUrl.description'),
-            mandatory: true,
-            breadcrumb: true
-        },
-        validate: async (url) => {
-            utils_1.PromptState.resetConnectedSystem();
-            const valResult = await connectValidator.validateUrl(url, {
-                isSystem: true,
-                odataVersion: (0, utils_1.convertODataVersionType)(requiredOdataVersion)
-            });
-            // If basic auth not required we should have an active connection (could be a re-entrance ticket supported system url)
-            if (valResult === true) {
-                if (!connectValidator.validity.authRequired && connectValidator.serviceProvider) {
-                    utils_1.PromptState.odataService.connectedSystem = {
-                        serviceProvider: connectValidator.serviceProvider
-                    };
-                }
-                else {
-                    connectValidator.systemAuthType = 'basic';
-                }
-            }
-            return valResult;
-        }
-    };
-    return newSystemUrlQuestion;
-}
-/**
- * Get a prompt for new system name.
- *
- * @param connectValidator A reference to the active connection validator,
- *     at prompt execution time the connection properties will be used to create a new BackendSystem, set into the PromptState.odataService.connectedSystem
- * @param promptNamespace The namespace for the prompt, used to identify the prompt instance and namespaced answers.
- *     This prevents conflicts with other prompts of the same types where the same prompt is used by multiple other prompts but cannot share the name.
- * @returns the new system name prompt
- */
-function getUserSystemNameQuestion(connectValidator, promptNamespace) {
-    let defaultSystemName;
-    let userModifiedSystemName = false;
-    const promptNamespacePart = `${promptNamespace ? promptNamespace + ':' : ''}`;
-    const promptName = `${promptNamespacePart}${types_1.promptNames.userSystemName}`;
-    const newSystemNamePrompt = {
-        type: 'input',
-        guiOptions: {
-            hint: (0, i18n_1.t)('prompts.systemName.hint'),
-            applyDefaultWhenDirty: true,
-            breadcrumb: true,
-            mandatory: true
-        },
-        name: promptName,
-        message: (0, i18n_1.t)('prompts.systemName.message'),
-        default: async () => {
-            const systemName = connectValidator.connectedSystemName;
-            if (systemName && !userModifiedSystemName) {
-                defaultSystemName = await (0, prompt_helpers_1.suggestSystemName)(systemName, connectValidator.validatedClient);
-                return defaultSystemName;
-            }
-            return defaultSystemName;
-        },
-        validate: async (systemName) => {
-            if (!systemName) {
-                return false;
-            }
-            let isValid = false;
-            // Dont validate the suggested default system name
-            if (systemName === defaultSystemName) {
-                isValid = true;
-            }
-            else {
-                userModifiedSystemName = true;
-                defaultSystemName = systemName;
-                isValid = await (0, validators_1.validateSystemName)(systemName);
-            }
-            if (isValid === true) {
-                // Update or create the BackendSystem with the new system details for persistent storage
-                if (connectValidator.validatedUrl && utils_1.PromptState.odataService.connectedSystem) {
-                    const backendSystem = new store_1.BackendSystem({
-                        authenticationType: systemAuthTypeToAuthenticationType(connectValidator.systemAuthType),
-                        name: systemName,
-                        url: connectValidator.validatedUrl,
-                        client: connectValidator.validatedClient,
-                        username: connectValidator.axiosConfig?.auth?.username,
-                        password: connectValidator.axiosConfig?.auth?.password,
-                        serviceKeys: connectValidator.serviceInfo,
-                        userDisplayName: connectValidator.connectedUserName,
-                        refreshToken: connectValidator.refreshToken
-                    });
-                    utils_1.PromptState.odataService.connectedSystem.backendSystem = backendSystem;
-                    utils_1.PromptState.odataService.connectedSystem.backendSystem.newOrUpdated = true;
-                }
-            }
-            return isValid;
-        }
-    };
-    return newSystemNamePrompt;
-}
 //# sourceMappingURL=questions.js.map

package/dist/prompts/datasources/sap-system/shared-prompts/shared-prompts.d.ts

@@ -0,0 +1,28 @@
+/**
+ * New system prompting questions for re-use in multiple sap-system datasource prompt sets.
+ */
+import { type InputQuestion } from '@sap-ux/inquirer-common';
+import type { OdataVersion } from '@sap-ux/odata-service-writer';
+import type { Answers } from 'inquirer';
+import type { ConnectionValidator } from '../../../connectionValidator';
+import type { NewSystemAnswers } from '../new-system/questions';
+/**
+ * Get the system url prompt. The system url prompt is used to connect to a new system using the user input system url.
+ *
+ * @param connectValidator a connection validator instance used to validate the system url
+ * @param promptNamespace The namespace for the prompt, used to identify the prompt instance and namespaced answers.
+ * @param requiredOdataVersion The required OData version for the system connection, only catalogs supporting the specifc odata version will be used.
+ * @returns the system url prompt
+ */
+export declare function getSystemUrlQuestion<T extends Answers>(connectValidator: ConnectionValidator, promptNamespace?: string, requiredOdataVersion?: OdataVersion): InputQuestion<T>;
+/**
+ * Get a prompt for new system name.
+ *
+ * @param connectValidator A reference to the active connection validator,
+ *     at prompt execution time the connection properties will be used to create a new BackendSystem, set into the PromptState.odataService.connectedSystem
+ * @param promptNamespace The namespace for the prompt, used to identify the prompt instance and namespaced answers.
+ *     This prevents conflicts with other prompts of the same types where the same prompt is used by multiple other prompts but cannot share the name.
+ * @returns the new system name prompt
+ */
+export declare function getUserSystemNameQuestion(connectValidator: ConnectionValidator, promptNamespace?: string): InputQuestion<Partial<NewSystemAnswers>>;
+//# sourceMappingURL=shared-prompts.d.ts.map

package/dist/prompts/datasources/sap-system/shared-prompts/shared-prompts.js

@@ -0,0 +1,141 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getSystemUrlQuestion = getSystemUrlQuestion;
+exports.getUserSystemNameQuestion = getUserSystemNameQuestion;
+const store_1 = require("@sap-ux/store");
+const i18n_1 = require("../../../../i18n");
+const types_1 = require("../../../../types");
+const utils_1 = require("../../../../utils");
+const types_2 = require("../new-system/types");
+const prompt_helpers_1 = require("../prompt-helpers");
+const validators_1 = require("../validators");
+/**
+ * Convert the system connection scheme (Service Key, Rentrance Ticket, etc) to the store specific authentication type.
+ * Note the absence of CF Discovery, in this case the service key file (UAA) is also used for the Abap connectivity.
+ *
+ * @param systemAuthType The system authentication type
+ * @returns The store specific authentication type
+ */
+function systemAuthTypeToAuthenticationType(systemAuthType) {
+    switch (systemAuthType) {
+        case 'serviceKey':
+            return store_1.AuthenticationType.OAuth2RefreshToken;
+        case 'reentranceTicket':
+            return store_1.AuthenticationType.ReentranceTicket;
+        case 'basic':
+            return store_1.AuthenticationType.Basic;
+        default:
+            return undefined;
+    }
+}
+/**
+ * Get the system url prompt. The system url prompt is used to connect to a new system using the user input system url.
+ *
+ * @param connectValidator a connection validator instance used to validate the system url
+ * @param promptNamespace The namespace for the prompt, used to identify the prompt instance and namespaced answers.
+ * @param requiredOdataVersion The required OData version for the system connection, only catalogs supporting the specifc odata version will be used.
+ * @returns the system url prompt
+ */
+function getSystemUrlQuestion(connectValidator, promptNamespace, requiredOdataVersion) {
+    const promptName = `${promptNamespace ? promptNamespace + ':' : ''}${types_2.newSystemPromptNames.newSystemUrl}`;
+    const newSystemUrlQuestion = {
+        type: 'input',
+        name: promptName,
+        message: (0, i18n_1.t)('prompts.systemUrl.message'),
+        guiOptions: {
+            hint: (0, i18n_1.t)('prompts.systemUrl.description'),
+            mandatory: true,
+            breadcrumb: true
+        },
+        validate: async (url) => {
+            utils_1.PromptState.resetConnectedSystem();
+            const valResult = await connectValidator.validateUrl(url, {
+                isSystem: true,
+                odataVersion: (0, utils_1.convertODataVersionType)(requiredOdataVersion)
+            });
+            // If basic auth not required we should have an active connection (could be a re-entrance ticket supported system url)
+            if (valResult === true) {
+                if (!connectValidator.validity.authRequired && connectValidator.serviceProvider) {
+                    utils_1.PromptState.odataService.connectedSystem = {
+                        serviceProvider: (0, utils_1.removeCircularFromServiceProvider)(connectValidator.serviceProvider)
+                    };
+                }
+                else {
+                    connectValidator.systemAuthType = 'basic';
+                }
+            }
+            return valResult;
+        }
+    };
+    return newSystemUrlQuestion;
+}
+/**
+ * Get a prompt for new system name.
+ *
+ * @param connectValidator A reference to the active connection validator,
+ *     at prompt execution time the connection properties will be used to create a new BackendSystem, set into the PromptState.odataService.connectedSystem
+ * @param promptNamespace The namespace for the prompt, used to identify the prompt instance and namespaced answers.
+ *     This prevents conflicts with other prompts of the same types where the same prompt is used by multiple other prompts but cannot share the name.
+ * @returns the new system name prompt
+ */
+function getUserSystemNameQuestion(connectValidator, promptNamespace) {
+    let defaultSystemName;
+    let userModifiedSystemName = false;
+    const promptNamespacePart = `${promptNamespace ? promptNamespace + ':' : ''}`;
+    const promptName = `${promptNamespacePart}${types_1.promptNames.userSystemName}`;
+    const newSystemNamePrompt = {
+        type: 'input',
+        guiOptions: {
+            hint: (0, i18n_1.t)('prompts.systemName.hint'),
+            applyDefaultWhenDirty: true,
+            breadcrumb: true,
+            mandatory: true
+        },
+        name: promptName,
+        message: (0, i18n_1.t)('prompts.systemName.message'),
+        default: async () => {
+            const systemName = connectValidator.connectedSystemName;
+            if (systemName && !userModifiedSystemName) {
+                defaultSystemName = await (0, prompt_helpers_1.suggestSystemName)(systemName, connectValidator.validatedClient);
+                return defaultSystemName;
+            }
+            return defaultSystemName;
+        },
+        validate: async (systemName) => {
+            if (!systemName) {
+                return false;
+            }
+            let isValid = false;
+            // Dont validate the suggested default system name
+            if (systemName === defaultSystemName) {
+                isValid = true;
+            }
+            else {
+                userModifiedSystemName = true;
+                defaultSystemName = systemName;
+                isValid = await (0, validators_1.validateSystemName)(systemName);
+            }
+            if (isValid === true) {
+                // Update or create the BackendSystem with the new system details for persistent storage
+                if (connectValidator.validatedUrl && utils_1.PromptState.odataService.connectedSystem) {
+                    const backendSystem = new store_1.BackendSystem({
+                        authenticationType: systemAuthTypeToAuthenticationType(connectValidator.systemAuthType),
+                        name: systemName,
+                        url: connectValidator.validatedUrl,
+                        client: connectValidator.validatedClient,
+                        username: connectValidator.axiosConfig?.auth?.username,
+                        password: connectValidator.axiosConfig?.auth?.password,
+                        serviceKeys: connectValidator.serviceInfo,
+                        userDisplayName: connectValidator.connectedUserName,
+                        refreshToken: connectValidator.refreshToken
+                    });
+                    utils_1.PromptState.odataService.connectedSystem.backendSystem = backendSystem;
+                    utils_1.PromptState.odataService.connectedSystem.backendSystem.newOrUpdated = true;
+                }
+            }
+            return isValid;
+        }
+    };
+    return newSystemNamePrompt;
+}
+//# sourceMappingURL=shared-prompts.js.map

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

@@ -4,12 +4,15 @@ import type { BackendSystem } from '@sap-ux/store';
 import type { ListChoiceOptions } from 'inquirer';
 import { type DestinationFilters } from '../../../../types';
 import type { ConnectionValidator } from '../../../connectionValidator';
-import { type SystemSelectionAnswerType } from './questions';
 import type { ValidationResult } from '../../../types';
 export declare const NewSystemChoice = "!@\u00A3*&937newSystem*X~qy^";
 export type NewSystemChoice = typeof NewSystemChoice;
 export declare const CfAbapEnvServiceChoice = "cfAbapEnvService";
 export type CfAbapEnvServiceChoice = typeof CfAbapEnvServiceChoice;
+export type SystemSelectionAnswerType = {
+    type: 'destination' | 'backendSystem' | 'newSystemChoice' | CfAbapEnvServiceChoice;
+    system: Destination | BackendSystem | NewSystemChoice | CfAbapEnvServiceChoice;
+};
 /**
  * Connects to the specified backend system and validates the connection.
  * Note this will return true in the case of basic auth validation failure to defer validation to the credentials prompt.

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

@@ -63,7 +63,7 @@ async function connectWithBackendSystem(backendSystem, connectionValidator, requ
         // If the connection is successful, we will return the connected system from the inquirer
         if (connectValResult === true && connectionValidator.serviceProvider) {
             utils_1.PromptState.odataService.connectedSystem = {
-                serviceProvider: connectionValidator.serviceProvider,
+                serviceProvider: (0, utils_1.removeCircularFromServiceProvider)(connectionValidator.serviceProvider),
                 backendSystem
             };
         }
@@ -91,7 +91,7 @@ async function connectWithDestination(destination, connectionValidator, required
     // If the connection is successful, we will return the connected system from the inquirer
     if (connectValResult === true && connectionValidator.serviceProvider) {
         utils_1.PromptState.odataService.connectedSystem = {
-            serviceProvider: connectionValidator.serviceProvider,
+            serviceProvider: (0, utils_1.removeCircularFromServiceProvider)(connectionValidator.serviceProvider),
             destination
         };
     }

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

@@ -1,16 +1,10 @@
-import type { Destination } from '@sap-ux/btp-utils';
-import type { BackendSystem } from '@sap-ux/store';
 import type { Question } from 'inquirer';
 import { type OdataServicePromptOptions, promptNames } from '../../../../types';
 import { ConnectionValidator } from '../../../connectionValidator';
 import type { ServiceAnswer } from '../service-selection';
-import { type CfAbapEnvServiceChoice, type NewSystemChoice } from './prompt-helpers';
+import { type SystemSelectionAnswerType } from './prompt-helpers';
 declare const usernamePromptName: "systemSelection:systemUsername";
 declare const passwordPromptName: "systemSelection:systemPassword";
-export type SystemSelectionAnswerType = {
-    type: 'destination' | 'backendSystem' | 'newSystemChoice' | CfAbapEnvServiceChoice;
-    system: Destination | BackendSystem | NewSystemChoice | CfAbapEnvServiceChoice;
-};
 interface SystemSelectionCredentialsAnswers {
     [usernamePromptName]?: string;
     [passwordPromptName]?: string;

package/dist/prompts/logger-helper.js

@@ -64,6 +64,10 @@ class LoggerHelper {
      * @param interceptors.response the axios response interceptor
      */
     static attachAxiosLogger(interceptors) {
+        // Dont log response data, which can be huge (edmx) unless log level is explictly set to `trace` (@vscode-logging/logger)
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        const logResponseData = typeof LoggerHelper.logger.getLogLevel === 'function' &&
+            LoggerHelper.logger.getLogLevel() === 'trace';
         const debugLogger = LoggerHelper.logger.debug.bind(LoggerHelper.logger);
         interceptors.request.use((request) => {
             return AxiosLogger.requestLogger(request, {
@@ -80,7 +84,7 @@ class LoggerHelper {
         });
         interceptors.response.use((response) => {
             return AxiosLogger.responseLogger(response, {
-                data: true,
+                data: logResponseData,
                 prefixText: '@sap-ux/odata-service-inquirer',
                 status: true,
                 headers: true,

package/dist/utils/index.d.ts

@@ -1,3 +1,4 @@
+import type { ServiceProvider } from '@sap-ux/axios-extension';
 import { ODataVersion } from '@sap-ux/axios-extension';
 import { type HostEnvironmentId } from '@sap-ux/fiori-generator-shared';
 import { OdataVersion } from '@sap-ux/odata-service-writer';
@@ -55,5 +56,13 @@ export declare function convertODataVersionType(odataVersion?: OdataVersion): OD
  * @returns the default index if only one item is available, otherwise undefined
  */
 export declare function getDefaultChoiceIndex(list: ListChoiceOptions[]): number | undefined;
+/**
+ * Temp fix for circular dependency issue within the service provider winston logger, causing issues with serialization in Yeoman generators.
+ * More investigation is needed to determine what properties are required from the service provider for subsequent flows.
+ *
+ * @param serviceProvider - instance of the service provider
+ * @returns the service provider with the circular dependencies removed
+ */
+export declare function removeCircularFromServiceProvider(serviceProvider: ServiceProvider): ServiceProvider;
 export { PromptState };
 //# sourceMappingURL=index.d.ts.map

package/dist/utils/index.js

@@ -10,6 +10,7 @@ exports.xmlToJson = xmlToJson;
 exports.originToRelative = originToRelative;
 exports.convertODataVersionType = convertODataVersionType;
 exports.getDefaultChoiceIndex = getDefaultChoiceIndex;
+exports.removeCircularFromServiceProvider = removeCircularFromServiceProvider;
 const axios_extension_1 = require("@sap-ux/axios-extension");
 const btp_utils_1 = require("@sap-ux/btp-utils");
 const fiori_generator_shared_1 = require("@sap-ux/fiori-generator-shared");
@@ -127,4 +128,18 @@ function getDefaultChoiceIndex(list) {
     }
     return undefined;
 }
+/**
+ * Temp fix for circular dependency issue within the service provider winston logger, causing issues with serialization in Yeoman generators.
+ * More investigation is needed to determine what properties are required from the service provider for subsequent flows.
+ *
+ * @param serviceProvider - instance of the service provider
+ * @returns the service provider with the circular dependencies removed
+ */
+function removeCircularFromServiceProvider(serviceProvider) {
+    for (const service in serviceProvider.services) {
+        delete serviceProvider[service].log;
+    }
+    delete serviceProvider.log;
+    return serviceProvider;
+}
 //# sourceMappingURL=index.js.map

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@sap-ux/odata-service-inquirer",
   "description": "Prompts module that can prompt users for inputs required for odata service writing",
-  "version": "2.2.27",
+  "version": "2.2.28",
   "repository": {
     "type": "git",
     "url": "https://github.com/SAP/open-ux-tools.git",
@@ -28,12 +28,12 @@
     "i18next": "23.5.1",
     "inquirer-autocomplete-prompt": "2.0.1",
     "os-name": "4.0.1",
-    "@sap-ux/btp-utils": "1.0.2",
-    "@sap-ux/fiori-generator-shared": "0.9.11",
     "@sap-ux/axios-extension": "1.19.2",
+    "@sap-ux/btp-utils": "1.0.2",
+    "@sap-ux/fiori-generator-shared": "0.10.0",
     "@sap-ux/guided-answers-helper": "0.2.1",
     "@sap-ux/telemetry": "0.5.72",
-    "@sap-ux/inquirer-common": "0.6.32",
+    "@sap-ux/inquirer-common": "0.6.33",
     "@sap-ux/logger": "0.6.0",
     "@sap-ux/project-access": "1.29.18",
     "@sap-ux/project-input-validator": "0.5.0",
@@ -46,12 +46,12 @@
     "@types/inquirer": "8.2.6",
     "@types/lodash": "4.14.202",
     "jest-extended": "3.2.4",
-    "@sap-ux/fiori-generator-shared": "0.9.11",
-    "@sap-ux/fiori-elements-writer": "2.1.35",
-    "@sap-ux/fiori-freestyle-writer": "2.2.5",
+    "@sap-ux/fiori-generator-shared": "0.10.0",
+    "@sap-ux/fiori-elements-writer": "2.1.36",
+    "@sap-ux/fiori-freestyle-writer": "2.2.6",
     "@sap-ux/feature-toggle": "0.2.3",
     "@sap-ux/odata-service-writer": "0.26.13",
-    "@sap-ux/cap-config-writer": "0.9.22"
+    "@sap-ux/cap-config-writer": "0.9.23"
   },
   "engines": {
     "node": ">=18.x"