@sap-ux/generator-adp 1.0.8 → 1.0.9

package/generators/app/questions/key-user.js

@@ -1,10 +1,14 @@
-import { isAxiosError } from '@sap-ux/axios-extension';
-import { validateEmptyString } from '@sap-ux/project-input-validator';
-import { getConfiguredProvider } from '@sap-ux/adp-tooling';
-import { t } from '../../utils/i18n.js';
-import { keyUserPromptNames } from '../types.js';
-import { getAdaptationChoices, getKeyUserSystemChoices } from './helper/choices.js';
-export const DEFAULT_ADAPTATION_ID = 'DEFAULT';
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.KeyUserImportPrompter = exports.DEFAULT_ADAPTATION_ID = void 0;
+exports.determineFlexVersion = determineFlexVersion;
+const axios_extension_1 = require("@sap-ux/axios-extension");
+const project_input_validator_1 = require("@sap-ux/project-input-validator");
+const adp_tooling_1 = require("@sap-ux/adp-tooling");
+const i18n_js_1 = require("../../utils/i18n.js");
+const types_js_1 = require("../types.js");
+const choices_js_1 = require("./helper/choices.js");
+exports.DEFAULT_ADAPTATION_ID = 'DEFAULT';
 const UNSUPPORTED_STATUS_CODES = new Set([400, 404, 405]);
 /**
  * Returns a user-friendly error message if the error is an axios error with a status code
@@ -15,7 +19,7 @@ const UNSUPPORTED_STATUS_CODES = new Set([400, 404, 405]);
  * @returns The user-friendly message or the original error message.
  */
 function getUnsupportedApiMessage(e, userMessage) {
-    if (isAxiosError(e)) {
+    if ((0, axios_extension_1.isAxiosError)(e)) {
         const status = e.response?.status;
         if (status !== undefined && UNSUPPORTED_STATUS_CODES.has(status)) {
             return userMessage;
@@ -29,7 +33,7 @@ function getUnsupportedApiMessage(e, userMessage) {
  * @param {FlexVersion[]} flexVersions - The list of flex versions.
  * @returns {string} The flex version to be used.
  */
-export function determineFlexVersion(flexVersions) {
+function determineFlexVersion(flexVersions) {
     if (!flexVersions?.length) {
         return '';
     }
@@ -41,7 +45,7 @@ export function determineFlexVersion(flexVersions) {
 /**
  * Prompter class that guides the user through importing key-user changes.
  */
-export class KeyUserImportPrompter {
+class KeyUserImportPrompter {
     systemLookup;
     componentId;
     defaultProvider;
@@ -100,10 +104,10 @@ export class KeyUserImportPrompter {
      */
     getPrompts(promptOptions) {
         const keyedPrompts = {
-            [keyUserPromptNames.keyUserSystem]: this.getSystemPrompt(promptOptions?.[keyUserPromptNames.keyUserSystem]),
-            [keyUserPromptNames.keyUserUsername]: this.getUsernamePrompt(promptOptions?.[keyUserPromptNames.keyUserUsername]),
-            [keyUserPromptNames.keyUserPassword]: this.getPasswordPrompt(promptOptions?.[keyUserPromptNames.keyUserPassword]),
-            [keyUserPromptNames.keyUserAdaptation]: this.getAdaptationPrompt(promptOptions?.[keyUserPromptNames.keyUserAdaptation])
+            [types_js_1.keyUserPromptNames.keyUserSystem]: this.getSystemPrompt(promptOptions?.[types_js_1.keyUserPromptNames.keyUserSystem]),
+            [types_js_1.keyUserPromptNames.keyUserUsername]: this.getUsernamePrompt(promptOptions?.[types_js_1.keyUserPromptNames.keyUserUsername]),
+            [types_js_1.keyUserPromptNames.keyUserPassword]: this.getPasswordPrompt(promptOptions?.[types_js_1.keyUserPromptNames.keyUserPassword]),
+            [types_js_1.keyUserPromptNames.keyUserAdaptation]: this.getAdaptationPrompt(promptOptions?.[types_js_1.keyUserPromptNames.keyUserAdaptation])
         };
         const questions = Object.entries(keyedPrompts)
             .filter(([promptName, _]) => {
@@ -122,11 +126,11 @@ export class KeyUserImportPrompter {
     getSystemPrompt(options) {
         return {
             type: 'list',
-            name: keyUserPromptNames.keyUserSystem,
-            message: t('prompts.systemLabel'),
+            name: types_js_1.keyUserPromptNames.keyUserSystem,
+            message: (0, i18n_js_1.t)('prompts.systemLabel'),
             choices: async () => {
                 const systems = await this.systemLookup.getSystems();
-                return getKeyUserSystemChoices(systems, this.defaultSystem);
+                return (0, choices_js_1.getKeyUserSystemChoices)(systems, this.defaultSystem);
             },
             guiOptions: {
                 mandatory: true,
@@ -145,15 +149,15 @@ export class KeyUserImportPrompter {
     getUsernamePrompt(options) {
         return {
             type: 'input',
-            name: keyUserPromptNames.keyUserUsername,
-            message: t('prompts.usernameLabel'),
+            name: types_js_1.keyUserPromptNames.keyUserUsername,
+            message: (0, i18n_js_1.t)('prompts.usernameLabel'),
             default: options?.default ?? '',
             filter: (val) => val.trim(),
             guiOptions: {
                 mandatory: true
             },
             when: (answers) => !!answers.keyUserSystem && this.isAuthRequired,
-            validate: (value) => validateEmptyString(value)
+            validate: (value) => (0, project_input_validator_1.validateEmptyString)(value)
         };
     }
     /**
@@ -165,8 +169,8 @@ export class KeyUserImportPrompter {
     getPasswordPrompt(options) {
         return {
             type: 'password',
-            name: keyUserPromptNames.keyUserPassword,
-            message: t('prompts.passwordLabel'),
+            name: types_js_1.keyUserPromptNames.keyUserPassword,
+            message: (0, i18n_js_1.t)('prompts.passwordLabel'),
             mask: '*',
             default: options?.default ?? '',
             guiOptions: {
@@ -186,14 +190,14 @@ export class KeyUserImportPrompter {
     getAdaptationPrompt(_) {
         return {
             type: 'list',
-            name: keyUserPromptNames.keyUserAdaptation,
-            message: t('prompts.keyUserAdaptationLabel'),
+            name: types_js_1.keyUserPromptNames.keyUserAdaptation,
+            message: (0, i18n_js_1.t)('prompts.keyUserAdaptationLabel'),
             guiOptions: {
                 mandatory: true,
-                breadcrumb: t('prompts.keyUserAdaptationBreadcrumb')
+                breadcrumb: (0, i18n_js_1.t)('prompts.keyUserAdaptationBreadcrumb')
             },
-            choices: () => getAdaptationChoices(this.adaptations),
-            default: () => getAdaptationChoices(this.adaptations)[0]?.name,
+            choices: () => (0, choices_js_1.getAdaptationChoices)(this.adaptations),
+            default: () => (0, choices_js_1.getAdaptationChoices)(this.adaptations)[0]?.name,
             validate: async (adaptation) => await this.validateKeyUserChanges(adaptation?.id),
             when: () => this.adaptations.length > 1
         };
@@ -212,7 +216,7 @@ export class KeyUserImportPrompter {
         catch (e) {
             this.logger.error(`Error loading adaptations for component ${this.componentId}: ${e.message}`);
             this.logger.debug(e);
-            throw new Error(getUnsupportedApiMessage(e, t('error.keyUserAdaptationsNotSupported')));
+            throw new Error(getUnsupportedApiMessage(e, (0, i18n_js_1.t)('error.keyUserAdaptationsNotSupported')));
         }
     }
     /**
@@ -228,7 +232,7 @@ export class KeyUserImportPrompter {
         catch (e) {
             this.logger.error(`Error loading flex versions for component ${this.componentId}: ${e.message}`);
             this.logger.debug(e);
-            throw new Error(getUnsupportedApiMessage(e, t('error.keyUserFlexVersionsNotSupported')));
+            throw new Error(getUnsupportedApiMessage(e, (0, i18n_js_1.t)('error.keyUserFlexVersionsNotSupported')));
         }
     }
     /**
@@ -252,10 +256,10 @@ export class KeyUserImportPrompter {
         await this.loadFlexVersions();
         await this.loadAdaptations();
         if (!this.adaptations.length) {
-            throw new Error(t('error.keyUserNoAdaptations'));
+            throw new Error((0, i18n_js_1.t)('error.keyUserNoAdaptations'));
         }
-        if (this.adaptations.length === 1 && this.adaptations[0]?.id === DEFAULT_ADAPTATION_ID) {
-            return await this.validateKeyUserChanges(DEFAULT_ADAPTATION_ID);
+        if (this.adaptations.length === 1 && this.adaptations[0]?.id === exports.DEFAULT_ADAPTATION_ID) {
+            return await this.validateKeyUserChanges(exports.DEFAULT_ADAPTATION_ID);
         }
         return true;
     }
@@ -267,7 +271,7 @@ export class KeyUserImportPrompter {
      * @returns An error message if validation fails, or true if the system selection is valid.
      */
     async validateSystem(system, answers) {
-        const validationResult = validateEmptyString(system);
+        const validationResult = (0, project_input_validator_1.validateEmptyString)(system);
         if (typeof validationResult === 'string') {
             return validationResult;
         }
@@ -286,7 +290,7 @@ export class KeyUserImportPrompter {
                     username: answers.keyUserUsername,
                     password: answers.keyUserPassword
                 };
-                this.provider = await getConfiguredProvider(options, this.logger);
+                this.provider = await (0, adp_tooling_1.getConfiguredProvider)(options, this.logger);
                 return await this.loadDataAndValidateKeyUserChanges();
             }
         }
@@ -303,7 +307,7 @@ export class KeyUserImportPrompter {
      * @returns An error message if validation fails, or true if the password is valid.
      */
     async validatePassword(password, answers) {
-        const validationResult = validateEmptyString(password);
+        const validationResult = (0, project_input_validator_1.validateEmptyString)(password);
         if (typeof validationResult === 'string') {
             return validationResult;
         }
@@ -315,7 +319,7 @@ export class KeyUserImportPrompter {
                 username: answers.keyUserUsername,
                 password
             };
-            this.provider = await getConfiguredProvider(options, this.logger);
+            this.provider = await (0, adp_tooling_1.getConfiguredProvider)(options, this.logger);
             return await this.loadDataAndValidateKeyUserChanges();
         }
         catch (e) {
@@ -338,19 +342,20 @@ export class KeyUserImportPrompter {
             this.keyUserChanges = data?.contents ?? [];
             this.logger.debug(`Retrieved ${this.keyUserChanges.length} key-user change(s) for adaptation ${adaptationId}`);
             if (!this.keyUserChanges.length) {
-                if (adaptationId === DEFAULT_ADAPTATION_ID && this.adaptations.length === 1) {
-                    return t('error.keyUserNoChangesDefault');
+                if (adaptationId === exports.DEFAULT_ADAPTATION_ID && this.adaptations.length === 1) {
+                    return (0, i18n_js_1.t)('error.keyUserNoChangesDefault');
                 }
                 this.logger.warn(`No key-user changes found for adaptation: ${adaptationId}`);
-                return t('error.keyUserNoChangesAdaptation', { adaptationId });
+                return (0, i18n_js_1.t)('error.keyUserNoChangesAdaptation', { adaptationId });
             }
             return true;
         }
         catch (e) {
             this.logger.error(`Error validating key-user changes for adaptation ${adaptationId}: ${e.message}`);
             this.logger.debug(e);
-            return getUnsupportedApiMessage(e, t('error.keyUserNotSupported'));
+            return getUnsupportedApiMessage(e, (0, i18n_js_1.t)('error.keyUserNotSupported'));
         }
     }
 }
+exports.KeyUserImportPrompter = KeyUserImportPrompter;
 //# sourceMappingURL=key-user.js.map

package/generators/app/questions/target-env.js

@@ -1,9 +1,14 @@
-import { MessageType } from '@sap-devx/yeoman-ui-types';
-import { getDefaultTargetFolder } from '@sap-ux/fiori-generator-shared';
-import { t } from '../../utils/i18n.js';
-import { TargetEnv } from '../types.js';
-import { getTargetEnvAdditionalMessages } from './helper/additional-messages.js';
-import { validateEnvironment, validateProjectPath } from './helper/validators.js';
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getTargetEnvPrompt = getTargetEnvPrompt;
+exports.getEnvironments = getEnvironments;
+exports.getProjectPathPrompt = getProjectPathPrompt;
+const yeoman_ui_types_1 = require("@sap-devx/yeoman-ui-types");
+const fiori_generator_shared_1 = require("@sap-ux/fiori-generator-shared");
+const i18n_js_1 = require("../../utils/i18n.js");
+const types_js_1 = require("../types.js");
+const additional_messages_js_1 = require("./helper/additional-messages.js");
+const validators_js_1 = require("./helper/validators.js");
 /**
  * Returns the target environment prompt.
  *
@@ -13,20 +18,20 @@ import { validateEnvironment, validateProjectPath } from './helper/validators.js
  * @param {CfConfig} cfConfig - The CF config service instance.
  * @returns {object[]} The target environment prompt.
  */
-export function getTargetEnvPrompt(appWizard, isCfInstalled, isCFLoggedIn, cfConfig) {
+function getTargetEnvPrompt(appWizard, isCfInstalled, isCFLoggedIn, cfConfig) {
     return {
         type: 'list',
         name: 'targetEnv',
-        message: t('prompts.targetEnvLabel'),
+        message: (0, i18n_js_1.t)('prompts.targetEnvLabel'),
         choices: () => getEnvironments(appWizard, isCfInstalled),
         default: () => getEnvironments(appWizard, isCfInstalled)[0]?.name,
         guiOptions: {
             mandatory: true,
-            hint: t('prompts.targetEnvTooltip'),
-            breadcrumb: t('prompts.targetEnvBreadcrumb')
+            hint: (0, i18n_js_1.t)('prompts.targetEnvTooltip'),
+            breadcrumb: (0, i18n_js_1.t)('prompts.targetEnvBreadcrumb')
         },
-        validate: (value) => validateEnvironment(value, isCFLoggedIn, cfConfig),
-        additionalMessages: (value) => getTargetEnvAdditionalMessages(value, isCFLoggedIn, cfConfig)
+        validate: (value) => (0, validators_js_1.validateEnvironment)(value, isCFLoggedIn, cfConfig),
+        additionalMessages: (value) => (0, additional_messages_js_1.getTargetEnvAdditionalMessages)(value, isCFLoggedIn, cfConfig)
     };
 }
 /**
@@ -36,13 +41,13 @@ export function getTargetEnvPrompt(appWizard, isCfInstalled, isCFLoggedIn, cfCon
  * @param {boolean} isCfInstalled - Whether Cloud Foundry is installed.
  * @returns {object[]} The environments.
  */
-export function getEnvironments(appWizard, isCfInstalled) {
-    const choices = [{ name: 'ABAP', value: TargetEnv.ABAP }];
+function getEnvironments(appWizard, isCfInstalled) {
+    const choices = [{ name: 'ABAP', value: types_js_1.TargetEnv.ABAP }];
     if (isCfInstalled) {
-        choices.push({ name: 'SAP BTP, Cloud Foundry environment', value: TargetEnv.CF });
+        choices.push({ name: 'SAP BTP, Cloud Foundry environment', value: types_js_1.TargetEnv.CF });
     }
     else {
-        appWizard.showInformation(t('error.cfNotInstalled'), MessageType.prompt);
+        appWizard.showInformation((0, i18n_js_1.t)('error.cfNotInstalled'), yeoman_ui_types_1.MessageType.prompt);
     }
     return choices;
 }
@@ -53,19 +58,19 @@ export function getEnvironments(appWizard, isCfInstalled) {
  * @param {any} vscode - The VSCode instance.
  * @returns {YUIQuestion<ProjectLocationAnswers>[]} The project path prompt.
  */
-export function getProjectPathPrompt(logger, vscode) {
+function getProjectPathPrompt(logger, vscode) {
     return {
         type: 'input',
         name: 'projectLocation',
         guiOptions: {
             type: 'folder-browser',
             mandatory: true,
-            hint: t('prompts.projectLocationTooltip'),
-            breadcrumb: t('prompts.projectLocationBreadcrumb')
+            hint: (0, i18n_js_1.t)('prompts.projectLocationTooltip'),
+            breadcrumb: (0, i18n_js_1.t)('prompts.projectLocationBreadcrumb')
         },
-        message: t('prompts.projectLocationLabel'),
-        validate: (value) => validateProjectPath(value, logger),
-        default: () => getDefaultTargetFolder(vscode),
+        message: (0, i18n_js_1.t)('prompts.projectLocationLabel'),
+        validate: (value) => (0, validators_js_1.validateProjectPath)(value, logger),
+        default: () => (0, fiori_generator_shared_1.getDefaultTargetFolder)(vscode),
         store: false
     };
 }

package/generators/app/types.js

@@ -1,7 +1,10 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SystemType = exports.cfLoginPromptNames = exports.TargetEnv = exports.targetEnvPromptNames = exports.keyUserPromptNames = exports.attributePromptNames = exports.configPromptNames = void 0;
 /**
  * Enumeration of prompt names used in the configuration.
  */
-export var configPromptNames;
+var configPromptNames;
 (function (configPromptNames) {
     configPromptNames["system"] = "system";
     configPromptNames["systemValidationCli"] = "systemValidationCli";
@@ -16,8 +19,8 @@ export var configPromptNames;
     configPromptNames["fioriId"] = "fioriId";
     configPromptNames["ach"] = "ach";
     configPromptNames["shouldCreateExtProject"] = "shouldCreateExtProject";
-})(configPromptNames || (configPromptNames = {}));
-export var attributePromptNames;
+})(configPromptNames || (exports.configPromptNames = configPromptNames = {}));
+var attributePromptNames;
 (function (attributePromptNames) {
     attributePromptNames["projectName"] = "projectName";
     attributePromptNames["title"] = "title";
@@ -29,23 +32,23 @@ export var attributePromptNames;
     attributePromptNames["addDeployConfig"] = "addDeployConfig";
     attributePromptNames["addFlpConfig"] = "addFlpConfig";
     attributePromptNames["importKeyUserChanges"] = "importKeyUserChanges";
-})(attributePromptNames || (attributePromptNames = {}));
+})(attributePromptNames || (exports.attributePromptNames = attributePromptNames = {}));
 /**
  * Enumeration of prompt names used in the key-user import.
  */
-export var keyUserPromptNames;
+var keyUserPromptNames;
 (function (keyUserPromptNames) {
     keyUserPromptNames["keyUserSystem"] = "keyUserSystem";
     keyUserPromptNames["keyUserUsername"] = "keyUserUsername";
     keyUserPromptNames["keyUserPassword"] = "keyUserPassword";
     keyUserPromptNames["keyUserAdaptation"] = "keyUserAdaptation";
-})(keyUserPromptNames || (keyUserPromptNames = {}));
-export var targetEnvPromptNames;
+})(keyUserPromptNames || (exports.keyUserPromptNames = keyUserPromptNames = {}));
+var targetEnvPromptNames;
 (function (targetEnvPromptNames) {
     targetEnvPromptNames["targetEnv"] = "targetEnv";
-})(targetEnvPromptNames || (targetEnvPromptNames = {}));
-export const TargetEnv = { ABAP: 'ABAP', CF: 'CF' };
-export var cfLoginPromptNames;
+})(targetEnvPromptNames || (exports.targetEnvPromptNames = targetEnvPromptNames = {}));
+exports.TargetEnv = { ABAP: 'ABAP', CF: 'CF' };
+var cfLoginPromptNames;
 (function (cfLoginPromptNames) {
     cfLoginPromptNames["cfLoggedInMainMessage"] = "cfLoggedInMainMessage";
     cfLoginPromptNames["cfLoggedApiEndpointMessage"] = "cfLoggedApiEndpointMessage";
@@ -54,10 +57,10 @@ export var cfLoginPromptNames;
     cfLoginPromptNames["cfLoggedInEndingMessage"] = "cfLoggedInEndingMessage";
     cfLoginPromptNames["cfExternalLogin"] = "cfExternalLogin";
     cfLoginPromptNames["cfExternalLoginSuccessMessage"] = "cfExternalLoginSuccessMessage";
-})(cfLoginPromptNames || (cfLoginPromptNames = {}));
-export var SystemType;
+})(cfLoginPromptNames || (exports.cfLoginPromptNames = cfLoginPromptNames = {}));
+var SystemType;
 (function (SystemType) {
     SystemType["CLOUD_READY"] = "cloudReady";
     SystemType["ON_PREM"] = "onPremise";
-})(SystemType || (SystemType = {}));
+})(SystemType || (exports.SystemType = SystemType = {}));
 //# sourceMappingURL=types.js.map

package/generators/base/questions/credentials.js

@@ -1,8 +1,11 @@
-import { isAppStudio } from '@sap-ux/btp-utils';
-import { validateEmptyString } from '@sap-ux/project-input-validator';
-import { getConfiguredProvider } from '@sap-ux/adp-tooling';
-import { t } from '../../utils/i18n.js';
-import { configPromptNames } from '../../app/types.js';
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getCredentialsPrompts = getCredentialsPrompts;
+const btp_utils_1 = require("@sap-ux/btp-utils");
+const project_input_validator_1 = require("@sap-ux/project-input-validator");
+const adp_tooling_1 = require("@sap-ux/adp-tooling");
+const i18n_js_1 = require("../../utils/i18n.js");
+const types_js_1 = require("../../app/types.js");
 /**
  * Returns the username prompt.
  *
@@ -10,7 +13,7 @@ import { configPromptNames } from '../../app/types.js';
  * @param {ToolsLogger} logger - The logger.
  * @returns {YUIQuestion<Credentials>[]} The username prompt.
  */
-export function getCredentialsPrompts(abapTarget, logger) {
+function getCredentialsPrompts(abapTarget, logger) {
     return [getUsernamePrompt(), getPasswordPrompt(abapTarget, logger)];
 }
 /**
@@ -21,9 +24,9 @@ export function getCredentialsPrompts(abapTarget, logger) {
 function getUsernamePrompt() {
     return {
         type: 'input',
-        name: configPromptNames.username,
-        message: t('prompts.usernameLabel'),
-        validate: validateEmptyString,
+        name: types_js_1.configPromptNames.username,
+        message: (0, i18n_js_1.t)('prompts.usernameLabel'),
+        validate: project_input_validator_1.validateEmptyString,
         guiOptions: {
             mandatory: true
         }
@@ -37,23 +40,23 @@ function getUsernamePrompt() {
  * @returns {PasswordQuestion<Credentials>} The password prompt.
  */
 function getPasswordPrompt(abapTarget, logger) {
-    const system = (isAppStudio() ? abapTarget.destination : abapTarget.url) ?? '';
+    const system = ((0, btp_utils_1.isAppStudio)() ? abapTarget.destination : abapTarget.url) ?? '';
     return {
         type: 'password',
-        name: configPromptNames.password,
-        message: t('prompts.passwordLabel'),
+        name: types_js_1.configPromptNames.password,
+        message: (0, i18n_js_1.t)('prompts.passwordLabel'),
         mask: '*',
         guiOptions: {
             mandatory: true,
             type: 'login'
         },
         validate: async (value, answers) => {
-            const validationResult = validateEmptyString(value);
+            const validationResult = (0, project_input_validator_1.validateEmptyString)(value);
             if (typeof validationResult === 'string') {
                 return validationResult;
             }
             if (!answers.username) {
-                return t('error.pleaseProvideAllRequiredData');
+                return (0, i18n_js_1.t)('error.pleaseProvideAllRequiredData');
             }
             try {
                 const credentials = {
@@ -81,7 +84,7 @@ function getPasswordPrompt(abapTarget, logger) {
  * an error.
  */
 async function assertAuthenticated(credentials, logger) {
-    const abapProvider = await getConfiguredProvider(credentials, logger);
+    const abapProvider = await (0, adp_tooling_1.getConfiguredProvider)(credentials, logger);
     const layeredRepositoryService = abapProvider.getLayeredRepository();
     await layeredRepositoryService.getCsrfToken();
 }

package/generators/base/sub-gen-auth-base.js

@@ -1,17 +1,22 @@
-import path from 'node:path';
-import { Prompts } from '@sap-devx/yeoman-ui-types';
-import { isAppStudio } from '@sap-ux/btp-utils';
-import { createAbapServiceProvider } from '@sap-ux/system-access';
-import { getVariant, getAdpConfig, ManifestService, ManifestServiceCF, SystemLookup, isCFEnvironment } from '@sap-ux/adp-tooling';
-import { initI18n } from '../utils/i18n.js';
-import SubGeneratorBase from './sub-gen-base.js';
-import { getCredentialsPrompts } from './questions/credentials.js';
-import { getSubGenAuthPages } from '../utils/steps.js';
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const node_path_1 = __importDefault(require("node:path"));
+const yeoman_ui_types_1 = require("@sap-devx/yeoman-ui-types");
+const btp_utils_1 = require("@sap-ux/btp-utils");
+const system_access_1 = require("@sap-ux/system-access");
+const adp_tooling_1 = require("@sap-ux/adp-tooling");
+const i18n_js_1 = require("../utils/i18n.js");
+const sub_gen_base_js_1 = __importDefault(require("./sub-gen-base.js"));
+const credentials_js_1 = require("./questions/credentials.js");
+const steps_js_1 = require("../utils/steps.js");
 /**
  * Base class for *sub* generators that need authentication handling.
  * Adds functionality on top of {@link SubGeneratorBase}.
  */
-export default class SubGeneratorWithAuthBase extends SubGeneratorBase {
+class SubGeneratorWithAuthBase extends sub_gen_base_js_1.default {
     /**
      * The ABAP target.
      */
@@ -72,21 +77,21 @@ export default class SubGeneratorWithAuthBase extends SubGeneratorBase {
      * Subclasses must call this to benefit from the built-in auth handling.
      */
     async onInit() {
-        await initI18n();
-        this.systemLookup = new SystemLookup(this.logger);
-        this.isCFProject = await isCFEnvironment(this.projectPath);
+        await (0, i18n_js_1.initI18n)();
+        this.systemLookup = new adp_tooling_1.SystemLookup(this.logger);
+        this.isCFProject = await (0, adp_tooling_1.isCFEnvironment)(this.projectPath);
         if (this.isCFProject) {
             this.system = '';
             this.logger.log('CF project detected, will use build output for manifest');
-            this._registerPrompts(new Prompts(getSubGenAuthPages(this.generatorType, this.system)));
+            this._registerPrompts(new yeoman_ui_types_1.Prompts((0, steps_js_1.getSubGenAuthPages)(this.generatorType, this.system)));
             this.prompts.splice(0, 1, []);
             return;
         }
-        const adpConfig = await getAdpConfig(this.projectPath, path.join(this.projectPath, 'ui5.yaml'));
+        const adpConfig = await (0, adp_tooling_1.getAdpConfig)(this.projectPath, node_path_1.default.join(this.projectPath, 'ui5.yaml'));
         this.abapTarget = adpConfig.target;
-        this.system = (isAppStudio() ? this.abapTarget.destination : this.abapTarget.url) ?? '';
+        this.system = ((0, btp_utils_1.isAppStudio)() ? this.abapTarget.destination : this.abapTarget.url) ?? '';
         this.logger.log(`Successfully retrieved abap target\n${JSON.stringify(this.abapTarget, null, 2)}`);
-        this._registerPrompts(new Prompts(getSubGenAuthPages(this.generatorType, this.system)));
+        this._registerPrompts(new yeoman_ui_types_1.Prompts((0, steps_js_1.getSubGenAuthPages)(this.generatorType, this.system)));
         try {
             this.requiresAuth = await this.systemLookup.getSystemRequiresAuth(this.system);
             this.logger.log(`System ${this.system} requires authentication: ${this.requiresAuth}`);
@@ -107,20 +112,20 @@ export default class SubGeneratorWithAuthBase extends SubGeneratorBase {
      * @returns {Promise<Manifest>} The manifest.
      */
     async getManifest() {
-        this.variant = await getVariant(this.projectPath);
+        this.variant = await (0, adp_tooling_1.getVariant)(this.projectPath);
         if (this.isCFProject) {
-            this.manifestService = await ManifestServiceCF.init(this.projectPath, this.logger);
+            this.manifestService = await adp_tooling_1.ManifestServiceCF.init(this.projectPath, this.logger);
         }
         else {
             let requestOptions;
             if (this.requiresAuth) {
-                const credentials = (await this.prompt(getCredentialsPrompts(this.abapTarget, this.logger)));
+                const credentials = (await this.prompt((0, credentials_js_1.getCredentialsPrompts)(this.abapTarget, this.logger)));
                 requestOptions = { auth: { username: credentials.username, password: credentials.password } };
             }
-            const yamlPath = path.join(this.projectPath, 'ui5.yaml');
-            const { target, ignoreCertErrors = false } = await getAdpConfig(this.projectPath, yamlPath);
-            const provider = await createAbapServiceProvider(target, { ...requestOptions, ignoreCertErrors }, true, this.logger);
-            this.manifestService = await ManifestService.initMergedManifest(provider, this.projectPath, this.variant, this.logger);
+            const yamlPath = node_path_1.default.join(this.projectPath, 'ui5.yaml');
+            const { target, ignoreCertErrors = false } = await (0, adp_tooling_1.getAdpConfig)(this.projectPath, yamlPath);
+            const provider = await (0, system_access_1.createAbapServiceProvider)(target, { ...requestOptions, ignoreCertErrors }, true, this.logger);
+            this.manifestService = await adp_tooling_1.ManifestService.initMergedManifest(provider, this.projectPath, this.variant, this.logger);
         }
         const manifest = this.manifestService.getManifest();
         const oDataSources = this.manifestService.getManifestDataSources();
@@ -138,4 +143,5 @@ export default class SubGeneratorWithAuthBase extends SubGeneratorBase {
         return manifest;
     }
 }
+exports.default = SubGeneratorWithAuthBase;
 //# sourceMappingURL=sub-gen-auth-base.js.map

package/generators/base/sub-gen-base.js

@@ -1,12 +1,17 @@
-import Generator from 'yeoman-generator';
-import { AppWizard } from '@sap-devx/yeoman-ui-types';
-import { t } from '../utils/i18n.js';
-import { setHeaderTitle } from '../utils/opts.js';
-import AdpGeneratorLogger from '../utils/logger.js';
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const yeoman_generator_1 = __importDefault(require("yeoman-generator"));
+const yeoman_ui_types_1 = require("@sap-devx/yeoman-ui-types");
+const i18n_js_1 = require("../utils/i18n.js");
+const opts_js_1 = require("../utils/opts.js");
+const logger_js_1 = __importDefault(require("../utils/logger.js"));
 /**
  * Shared base class for all ADP generators.
  */
-export default class SubGeneratorBase extends Generator {
+class SubGeneratorBase extends yeoman_generator_1.default {
     setPromptsCallback;
     prompts;
     /**
@@ -41,10 +46,10 @@ export default class SubGeneratorBase extends Generator {
     constructor(args, opts, type) {
         super(args, opts);
         this.type = type;
-        this.appWizard = opts.appWizard ?? AppWizard.create(opts);
-        AdpGeneratorLogger.configureLogging(this.options.logger, this.rootGeneratorName(), this.log, this.options.vscode, this.options.logLevel, this.options.logWrapper);
-        this.logger = AdpGeneratorLogger.logger;
-        setHeaderTitle(opts, this.logger, this.type);
+        this.appWizard = opts.appWizard ?? yeoman_ui_types_1.AppWizard.create(opts);
+        logger_js_1.default.configureLogging(this.options.logger, this.rootGeneratorName(), this.log, this.options.vscode, this.options.logLevel, this.options.logWrapper);
+        this.logger = logger_js_1.default.logger;
+        (0, opts_js_1.setHeaderTitle)(opts, this.logger, this.type);
         this.setPromptsCallback = (fn) => {
             // Persist callback so we can attach it once prompts are created
             this.pendingPromptsCallback = fn;
@@ -86,7 +91,7 @@ export default class SubGeneratorBase extends Generator {
         return {
             type: 'input',
             name: 'errorMessagePrompt',
-            message: t('error.backendCommunicationError'),
+            message: (0, i18n_js_1.t)('error.backendCommunicationError'),
             guiOptions: {
                 type: 'label',
                 hint: errorMessage
@@ -95,4 +100,5 @@ export default class SubGeneratorBase extends Generator {
         };
     }
 }
+exports.default = SubGeneratorBase;
 //# sourceMappingURL=sub-gen-base.js.map