@sap-ux/generator-adp 0.1.7 → 0.1.9

package/generators/app/index.d.ts

@@ -31,9 +31,9 @@ export default class extends Generator {
      */
     private configAnswers;
     /**
-     * Target folder for the generated project.
+     * Project attribute answers.
      */
-    private targetFolder;
+    private attributeAnswers;
     /**
      * SystemLookup instance for managing system endpoints.
      */
@@ -54,6 +54,12 @@ export default class extends Generator {
     writing(): Promise<void>;
     install(): Promise<void>;
     end(): void;
+    /**
+     * Combines the target folder and project name.
+     *
+     * @returns {string} The project path from the answers.
+     */
+    private _getProjectPath;
     /**
      * Sets up the prompts for the generator.
      */

package/generators/app/index.js

@@ -3,19 +3,20 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+const path_1 = require("path");
 const yeoman_generator_1 = __importDefault(require("yeoman-generator"));
 const yeoman_ui_types_1 = require("@sap-devx/yeoman-ui-types");
+const fiori_generator_shared_1 = require("@sap-ux/fiori-generator-shared");
 const logger_1 = require("@sap-ux/logger");
-const feature_toggle_1 = require("@sap-ux/feature-toggle");
 const adp_tooling_1 = require("@sap-ux/adp-tooling");
-const fiori_generator_shared_1 = require("@sap-ux/fiori-generator-shared");
+const feature_toggle_1 = require("@sap-ux/feature-toggle");
 const layer_1 = require("./layer");
 const i18n_1 = require("../utils/i18n");
 const telemetryEvents_1 = require("../telemetryEvents");
 const logger_2 = __importDefault(require("../utils/logger"));
+const attributes_1 = require("./questions/attributes");
 const configuration_1 = require("./questions/configuration");
 const deps_1 = require("../utils/deps");
-const default_values_1 = require("./questions/helper/default-values");
 /**
  * Generator for creating an Adaptation Project.
  *
@@ -47,9 +48,9 @@ class default_1 extends yeoman_generator_1.default {
      */
     configAnswers;
     /**
-     * Target folder for the generated project.
+     * Project attribute answers.
      */
-    targetFolder;
+    attributeAnswers;
     /**
      * SystemLookup instance for managing system endpoints.
      */
@@ -76,10 +77,14 @@ class default_1 extends yeoman_generator_1.default {
     }
     async initializing() {
         await (0, i18n_1.initI18n)();
-        const pages = [{ name: (0, i18n_1.t)('yuiNavSteps.configurationName'), description: (0, i18n_1.t)('yuiNavSteps.configurationDescr') }];
+        const pages = [
+            { name: (0, i18n_1.t)('yuiNavSteps.configurationName'), description: (0, i18n_1.t)('yuiNavSteps.configurationDescr') },
+            { name: (0, i18n_1.t)('yuiNavSteps.projectAttributesName'), description: (0, i18n_1.t)('yuiNavSteps.projectAttributesDescr') }
+        ];
         this.prompts.splice(0, 0, pages);
         this.layer = await (0, layer_1.getFlexLayer)();
         this.systemLookup = new adp_tooling_1.SystemLookup(this.toolsLogger);
+        this.prompter = new configuration_1.ConfigPrompter(this.systemLookup, this.layer, this.toolsLogger);
         await fiori_generator_shared_1.TelemetryHelper.initTelemetrySettings({
             consumerModule: {
                 name: '@sap/generator-fiori:generator-adp',
@@ -90,7 +95,6 @@ class default_1 extends yeoman_generator_1.default {
         });
     }
     async prompting() {
-        this.prompter = new configuration_1.ConfigPrompter(this.systemLookup, this.layer, this.toolsLogger);
         const isCLI = (0, fiori_generator_shared_1.getHostEnvironment)() === fiori_generator_shared_1.hostEnvironment.cli;
         const configQuestions = this.prompter.getPrompts({
             appValidationCli: { hide: !isCLI },
@@ -99,22 +103,35 @@ class default_1 extends yeoman_generator_1.default {
         this.configAnswers = await this.prompt(configQuestions);
         this.logger.info(`System: ${this.configAnswers.system}`);
         this.logger.info(`Application: ${JSON.stringify(this.configAnswers.application, null, 2)}`);
+        const { ui5Versions, systemVersion } = this.prompter.ui5;
+        const promptConfig = {
+            ui5Versions,
+            isVersionDetected: !!systemVersion,
+            isCloudProject: this.prompter.isCloud,
+            layer: this.layer
+        };
+        const defaultFolder = (0, fiori_generator_shared_1.getDefaultTargetFolder)(this.options.vscode) ?? process.cwd();
+        const options = {
+            targetFolder: { default: defaultFolder },
+            ui5ValidationCli: { hide: !isCLI }
+        };
+        const attributesQuestions = (0, attributes_1.getPrompts)(this.destinationPath(), promptConfig, options);
+        this.attributeAnswers = await this.prompt(attributesQuestions);
+        this.logger.info(`Project Attributes: ${JSON.stringify(this.attributeAnswers, null, 2)}`);
     }
     async writing() {
         try {
-            const projectName = (0, default_values_1.getDefaultProjectName)(this.destinationPath());
-            const namespace = (0, default_values_1.generateValidNamespace)(projectName, this.layer);
-            this.targetFolder = this.destinationPath(projectName);
             const packageJson = (0, deps_1.getPackageInfo)();
             const config = await (0, adp_tooling_1.getConfig)({
                 provider: this.prompter.provider,
                 configAnswers: this.configAnswers,
+                attributeAnswers: this.attributeAnswers,
+                publicVersions: this.prompter?.ui5?.publicVersions,
                 layer: this.layer,
-                defaults: { namespace },
                 packageJson,
                 logger: this.toolsLogger
             });
-            await (0, adp_tooling_1.generate)(this.targetFolder, config, this.fs);
+            await (0, adp_tooling_1.generate)(this._getProjectPath(), config, this.fs);
         }
         catch (e) {
             this.logger.error(`Writing phase failed: ${e}`);
@@ -124,7 +141,7 @@ class default_1 extends yeoman_generator_1.default {
     async install() {
         try {
             if (this.shouldInstallDeps) {
-                await (0, deps_1.installDependencies)(this.targetFolder);
+                await (0, deps_1.installDependencies)(this._getProjectPath());
             }
         }
         catch (e) {
@@ -137,11 +154,19 @@ class default_1 extends yeoman_generator_1.default {
             ...this.options.telemetryData
         }) ?? {};
         if (telemetryData) {
-            (0, fiori_generator_shared_1.sendTelemetry)(telemetryEvents_1.EventName.ADAPTATION_PROJECT_CREATED, telemetryData, this.targetFolder).catch((error) => {
+            (0, fiori_generator_shared_1.sendTelemetry)(telemetryEvents_1.EventName.ADAPTATION_PROJECT_CREATED, telemetryData, this._getProjectPath()).catch((error) => {
                 this.logger.error((0, i18n_1.t)('error.telemetry', { error }));
             });
         }
     }
+    /**
+     * Combines the target folder and project name.
+     *
+     * @returns {string} The project path from the answers.
+     */
+    _getProjectPath() {
+        return (0, path_1.join)(this.attributeAnswers.targetFolder, this.attributeAnswers.projectName);
+    }
     /**
      * Sets up the prompts for the generator.
      */

package/generators/app/questions/attributes.d.ts

@@ -0,0 +1,19 @@
+import { FlexLayer } from '@sap-ux/adp-tooling';
+import type { AttributesQuestion, AttributePromptOptions } from '../types';
+interface Config {
+    isCloudProject: boolean;
+    layer: FlexLayer;
+    ui5Versions: string[];
+    isVersionDetected: boolean;
+}
+/**
+ * Returns all project attribute prompts, filtering based on promptOptions.
+ *
+ * @param {string} path - The project base path.
+ * @param {Config} config - Configuration values needed for conditional prompt logic.
+ * @param {AttributePromptOptions} [promptOptions] - Optional settings to control visibility and defaults.
+ * @returns {AttributesQuestion[]} An array of prompt objects for basic info input.
+ */
+export declare function getPrompts(path: string, config: Config, promptOptions?: AttributePromptOptions): AttributesQuestion[];
+export {};
+//# sourceMappingURL=attributes.d.ts.map

package/generators/app/questions/attributes.js

@@ -0,0 +1,199 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getPrompts = void 0;
+const adp_tooling_1 = require("@sap-ux/adp-tooling");
+const project_input_validator_1 = require("@sap-ux/project-input-validator");
+const i18n_1 = require("../../utils/i18n");
+const types_1 = require("../types");
+const tooltip_1 = require("./helper/tooltip");
+const default_values_1 = require("./helper/default-values");
+const additional_messages_1 = require("./helper/additional-messages");
+/**
+ * Returns all project attribute prompts, filtering based on promptOptions.
+ *
+ * @param {string} path - The project base path.
+ * @param {Config} config - Configuration values needed for conditional prompt logic.
+ * @param {AttributePromptOptions} [promptOptions] - Optional settings to control visibility and defaults.
+ * @returns {AttributesQuestion[]} An array of prompt objects for basic info input.
+ */
+function getPrompts(path, config, promptOptions) {
+    const { isVersionDetected, ui5Versions, isCloudProject, layer } = config;
+    const isCustomerBase = layer === "CUSTOMER_BASE" /* FlexLayer.CUSTOMER_BASE */;
+    const keyedPrompts = {
+        [types_1.attributePromptNames.projectName]: getProjectNamePrompt(path, isCustomerBase, promptOptions?.[types_1.attributePromptNames.projectName]),
+        [types_1.attributePromptNames.title]: getApplicationTitlePrompt(promptOptions?.[types_1.attributePromptNames.title]),
+        [types_1.attributePromptNames.namespace]: getNamespacePrompt(isCustomerBase, promptOptions?.[types_1.attributePromptNames.namespace]),
+        [types_1.attributePromptNames.targetFolder]: getTargetFolderPrompt(promptOptions?.[types_1.attributePromptNames.targetFolder]),
+        [types_1.attributePromptNames.ui5Version]: getUi5VersionPrompt(ui5Versions, isVersionDetected, isCloudProject),
+        [types_1.attributePromptNames.ui5ValidationCli]: getUi5VersionValidationPromptForCli(),
+        [types_1.attributePromptNames.enableTypeScript]: getEnableTypeScriptPrompt(promptOptions?.[types_1.attributePromptNames.enableTypeScript])
+    };
+    const questions = Object.entries(keyedPrompts)
+        .filter(([promptName]) => {
+        const options = promptOptions?.[promptName];
+        return !(options && 'hide' in options && options.hide);
+    })
+        .map(([_, question]) => question);
+    return questions;
+}
+exports.getPrompts = getPrompts;
+/**
+ * Creates the project name input prompt.
+ *
+ * @param {string} path - The base project path.
+ * @param {boolean} isCustomerBase - Whether the layer is CUSTOMER_BASE.
+ * @param {ProjectNamePromptOptions} [_] - Optional prompt options.
+ * @returns {AttributesQuestion} The prompt configuration for project name.
+ */
+function getProjectNamePrompt(path, isCustomerBase, _) {
+    return {
+        type: 'input',
+        name: types_1.attributePromptNames.projectName,
+        message: (0, i18n_1.t)('prompts.projectNameLabel'),
+        default: (answers) => (0, default_values_1.getDefaultProjectName)(answers.targetFolder || path),
+        guiOptions: {
+            mandatory: true,
+            breadcrumb: true,
+            hint: (0, tooltip_1.getProjectNameTooltip)(isCustomerBase)
+        },
+        validate: (value, answers) => (0, project_input_validator_1.validateProjectName)(value, answers.targetFolder || path, isCustomerBase),
+        store: false
+    };
+}
+/**
+ * Creates the application title input prompt.
+ *
+ * @param {ApplicationTitlePromptOptions} [options] - Optional prompt options.
+ * @returns {AttributesQuestion} The prompt configuration for application title.
+ */
+function getApplicationTitlePrompt(options) {
+    return {
+        type: 'input',
+        name: types_1.attributePromptNames.title,
+        message: (0, i18n_1.t)('prompts.appTitleLabel'),
+        default: options?.default ?? (0, i18n_1.t)('prompts.appTitleDefault'),
+        guiOptions: {
+            mandatory: true,
+            breadcrumb: true,
+            hint: (0, i18n_1.t)('prompts.appTitleTooltip')
+        },
+        validate: project_input_validator_1.validateEmptyString,
+        store: false
+    };
+}
+/**
+ * Creates the namespace input prompt.
+ *
+ * @param {boolean} isCustomerBase - Whether the layer is CUSTOMER_BASE.
+ * @param {NamespacePromptOptions} [options] - Optional prompt options.
+ * @returns {AttributesQuestion} The prompt configuration for namespace.
+ */
+function getNamespacePrompt(isCustomerBase, options) {
+    const prompt = {
+        type: 'input',
+        name: types_1.attributePromptNames.namespace,
+        message: (0, i18n_1.t)('prompts.namespaceLabel'),
+        default: (answers) => options?.default ?? (0, default_values_1.getDefaultNamespace)(answers.projectName, isCustomerBase),
+        guiOptions: {
+            applyDefaultWhenDirty: true
+        },
+        store: false
+    };
+    if (!isCustomerBase) {
+        prompt.guiOptions.type = 'label';
+        prompt.when = (answers) => !!answers.projectName;
+    }
+    else {
+        prompt.guiOptions.mandatory = true;
+        prompt.guiOptions.breadcrumb = true;
+        prompt.validate = (value, answers) => (0, project_input_validator_1.validateNamespaceAdp)(value, answers.projectName, isCustomerBase);
+    }
+    return prompt;
+}
+/**
+ * Creates the target folder prompt.
+ *
+ * @param {TargetFolderPromptOptions} [options] - Optional prompt options.
+ * @returns {AttributesQuestion} The prompt configuration for target folder.
+ */
+function getTargetFolderPrompt(options) {
+    return {
+        type: 'input',
+        name: 'targetFolder',
+        message: (0, i18n_1.t)('prompts.projectFolderLabel'),
+        guiOptions: {
+            type: 'folder-browser',
+            applyDefaultWhenDirty: true,
+            mandatory: true,
+            breadcrumb: (0, i18n_1.t)('prompts.projectFolderPath')
+        },
+        validate: (value, answers) => (0, project_input_validator_1.validateProjectFolder)(value, answers.projectName),
+        default: (answers) => answers.targetFolder || options?.default,
+        store: false
+    };
+}
+/**
+ * Creates the UI5 version selection prompt.
+ *
+ * @param {string[]} ui5Versions - Array of available UI5 versions.
+ * @param {boolean} isVersionDetected - Whether a UI5 version was detected from the system.
+ * @param {boolean} isCloudProject - Whether the project is for a cloud-based system.
+ * @returns {AttributesQuestion} The prompt configuration for UI5 version.
+ */
+function getUi5VersionPrompt(ui5Versions, isVersionDetected, isCloudProject) {
+    return {
+        type: 'list',
+        name: types_1.attributePromptNames.ui5Version,
+        message: (0, i18n_1.t)('prompts.ui5VersionLabel'),
+        when: !isCloudProject,
+        choices: ui5Versions,
+        guiOptions: {
+            applyDefaultWhenDirty: true,
+            hint: (0, i18n_1.t)('prompts.ui5VersionTooltip'),
+            breadcrumb: true,
+            mandatory: true
+        },
+        validate: async (version) => await (0, adp_tooling_1.validateUI5VersionExists)(version),
+        default: async () => await (0, default_values_1.getDefaultVersion)(ui5Versions),
+        additionalMessages: () => (0, additional_messages_1.getVersionAdditionalMessages)(isVersionDetected)
+    };
+}
+/**
+ * Only used in the CLI context when prompt is of type `list` because the validation does not run on CLI for the UI5 Version list prompt.
+ *
+ * @returns {YUIQuestion<AttributesAnswers>} Dummy prompt that runs in the CLI only.
+ */
+function getUi5VersionValidationPromptForCli() {
+    return {
+        name: types_1.attributePromptNames.ui5ValidationCli,
+        when: async (answers) => {
+            if (!answers.ui5Version) {
+                return false;
+            }
+            const result = await (0, adp_tooling_1.validateUI5VersionExists)(answers.ui5Version);
+            if (typeof result === 'string') {
+                throw new Error(result);
+            }
+            return false;
+        }
+    };
+}
+/**
+ * Creates the TypeScript enablement confirm prompt.
+ *
+ * @param {EnableTypeScriptPromptOptions} [options] - Optional prompt options to control visibility.
+ * @returns {AttributesQuestion} The prompt configuration for TypeScript confirmation.
+ */
+function getEnableTypeScriptPrompt(options) {
+    return {
+        type: 'confirm',
+        name: types_1.attributePromptNames.enableTypeScript,
+        message: 'Enable TypeScript',
+        default: false,
+        when: options?.hide ?? true,
+        guiOptions: {
+            breadcrumb: true
+        }
+    };
+}
+//# sourceMappingURL=attributes.js.map

package/generators/app/questions/configuration.d.ts

@@ -2,11 +2,10 @@ import { FlexLayer } from '@sap-ux/adp-tooling';
 import type { ToolsLogger } from '@sap-ux/logger';
 import type { Manifest } from '@sap-ux/project-access';
 import { type AbapServiceProvider } from '@sap-ux/axios-extension';
-import type { SystemLookup } from '@sap-ux/adp-tooling';
+import type { SystemLookup, UI5Version } from '@sap-ux/adp-tooling';
 import type { ConfigPromptOptions, ConfigQuestion } from '../types';
 /**
  * A stateful prompter class that creates configuration questions.
- * This class accepts the needed dependencies and keeps track of state (e.g. the ApplicationManager instance).
  * It exposes a single public method {@link getPrompts} to retrieve the configuration questions.
  */
 export declare class ConfigPrompter {
@@ -65,9 +64,33 @@ export declare class ConfigPrompter {
      */
     private isPartiallySupported;
     /**
-     * UI5 version manager for handling version-related validations.
+     * UI5 versions in string format.
      */
-    private readonly ui5Info;
+    private ui5Versions;
+    /**
+     * Publicly available UI5 versions.
+     */
+    private publicVersions;
+    /**
+     * System UI5 version.
+     */
+    private systemVersion;
+    /**
+     * Returns the needed ui5 properties from calling the CDN.
+     *
+     * @returns Object with properties related to ui5.
+     */
+    get ui5(): {
+        ui5Versions: string[];
+        systemVersion: string | undefined;
+        publicVersions: UI5Version;
+    };
+    /**
+     * Returns flag indicating if the project is a cloud project.
+     *
+     * @returns Whether system is cloud-ready.
+     */
+    get isCloud(): boolean;
     /**
      * Returns the configured abap provider instance.
      *
@@ -79,7 +102,7 @@ export declare class ConfigPrompter {
      *
      * @returns Application manifest.
      */
-    get manifest(): Manifest;
+    get manifest(): Manifest | undefined;
     /**
      * Indicates whether the application loads views synchronously.
      *
@@ -172,14 +195,14 @@ export declare class ConfigPrompter {
     /**
      * Validates the selected application to ensure it is supported.
      *
-     * @param {Application} app - The application to validate.
+     * @param {SourceApplication} app - The application to validate.
      * @returns {Promise<boolean | string>} True if the application is valid, otherwise an error message.
      */
     private validateAppData;
     /**
      * Evaluate if the application version supports certain features.
      *
-     * @param {Application} application - The application data.
+     * @param {SourceApplication} application - The application data.
      */
     private evaluateAppSupport;
     /**
@@ -187,20 +210,19 @@ export declare class ConfigPrompter {
      *
      * @returns A promise that resolves when system data is fetched.
      */
-    private getSystemData;
+    private loadSystemData;
     /**
-     * Handles the fetching and validation of system data.
+     * Fetches and processes SAPUI5 version data from the system and public sources.
      *
-     * @returns {Promise<boolean | string>} True if successful, or an error message if an error occurs.
+     * @returns {Promise<void>} A promise that resolves once all version data is loaded and assigned.
      */
-    private handleSystemDataValidation;
+    private loadUI5Versions;
     /**
-     * Validates the UI5 system version based on the provided value or fetches all relevant versions if no value is provided.
-     * Updates the internal state with the fetched versions and the detection status.
+     * Handles the fetching and validation of system data.
      *
-     * @returns {Promise<void>} Resolves after checking system ui5 version.
+     * @returns {Promise<boolean | string>} True if successful, or an error message if an error occurs.
      */
-    private validateSystemVersion;
+    private handleSystemDataValidation;
     /**
      * Handles errors that occur while fetching system information, setting default values and rethrowing if necessary.
      *

package/generators/app/questions/configuration.js

@@ -11,7 +11,6 @@ const conditions_1 = require("./helper/conditions");
 const additional_messages_1 = require("./helper/additional-messages");
 /**
  * A stateful prompter class that creates configuration questions.
- * This class accepts the needed dependencies and keeps track of state (e.g. the ApplicationManager instance).
  * It exposes a single public method {@link getPrompts} to retrieve the configuration questions.
  */
 class ConfigPrompter {
@@ -70,9 +69,37 @@ class ConfigPrompter {
      */
     isPartiallySupported = false;
     /**
-     * UI5 version manager for handling version-related validations.
+     * UI5 versions in string format.
      */
-    ui5Info;
+    ui5Versions;
+    /**
+     * Publicly available UI5 versions.
+     */
+    publicVersions;
+    /**
+     * System UI5 version.
+     */
+    systemVersion;
+    /**
+     * Returns the needed ui5 properties from calling the CDN.
+     *
+     * @returns Object with properties related to ui5.
+     */
+    get ui5() {
+        return {
+            ui5Versions: this.ui5Versions,
+            systemVersion: this.systemVersion,
+            publicVersions: this.publicVersions
+        };
+    }
+    /**
+     * Returns flag indicating if the project is a cloud project.
+     *
+     * @returns Whether system is cloud-ready.
+     */
+    get isCloud() {
+        return !!this.isCloudProject;
+    }
     /**
      * Returns the configured abap provider instance.
      *
@@ -87,7 +114,7 @@ class ConfigPrompter {
      * @returns Application manifest.
      */
     get manifest() {
-        return this.manifest;
+        return this.appManifest;
     }
     /**
      * Indicates whether the application loads views synchronously.
@@ -108,7 +135,6 @@ class ConfigPrompter {
         this.systemLookup = systemLookup;
         this.logger = logger;
         this.isCustomerBase = layer === "CUSTOMER_BASE" /* FlexLayer.CUSTOMER_BASE */;
-        this.ui5Info = adp_tooling_1.UI5VersionInfo.getInstance(layer);
     }
     /**
      * Retrieves an array of configuration questions based on provided options.
@@ -305,7 +331,10 @@ class ConfigPrompter {
         };
         try {
             this.abapProvider = await (0, adp_tooling_1.getConfiguredProvider)(options, this.logger);
-            await this.getSystemData();
+            const validationResult = await this.handleSystemDataValidation();
+            if (typeof validationResult === 'string') {
+                return validationResult;
+            }
             this.targetApps = await (0, adp_tooling_1.loadApps)(this.abapProvider, this.isCustomerBase);
             this.isLoginSuccessful = true;
             return true;
@@ -354,7 +383,7 @@ class ConfigPrompter {
     /**
      * Validates the selected application to ensure it is supported.
      *
-     * @param {Application} app - The application to validate.
+     * @param {SourceApplication} app - The application to validate.
      * @returns {Promise<boolean | string>} True if the application is valid, otherwise an error message.
      */
     async validateAppData(app) {
@@ -378,12 +407,11 @@ class ConfigPrompter {
     /**
      * Evaluate if the application version supports certain features.
      *
-     * @param {Application} application - The application data.
+     * @param {SourceApplication} application - The application data.
      */
     evaluateAppSupport(application) {
-        const systemVersion = this.ui5Info.systemVersion;
-        const isFullSupport = this.ui5Info.isVersionDetected && !(0, adp_tooling_1.isFeatureSupportedVersion)('1.96.0', systemVersion);
-        const isPartialSupport = this.ui5Info.isVersionDetected && isFullSupport && (0, adp_tooling_1.isFeatureSupportedVersion)('1.90.0', systemVersion);
+        const isFullSupport = !!this.systemVersion && !(0, adp_tooling_1.isFeatureSupportedVersion)('1.96.0', this.systemVersion);
+        const isPartialSupport = !!this.systemVersion && isFullSupport && (0, adp_tooling_1.isFeatureSupportedVersion)('1.90.0', this.systemVersion);
         this.setSupportFlags(application, isFullSupport, isPartialSupport);
     }
     /**
@@ -391,7 +419,7 @@ class ConfigPrompter {
      *
      * @returns A promise that resolves when system data is fetched.
      */
-    async getSystemData() {
+    async loadSystemData() {
         try {
             this.isCloudProject = await this.abapProvider.isAbapCloud();
             this.flexUISystem = await (0, adp_tooling_1.getFlexUISupportedSystem)(this.abapProvider, this.isCustomerBase);
@@ -400,6 +428,17 @@ class ConfigPrompter {
             this.handleSystemError(e);
         }
     }
+    /**
+     * Fetches and processes SAPUI5 version data from the system and public sources.
+     *
+     * @returns {Promise<void>} A promise that resolves once all version data is loaded and assigned.
+     */
+    async loadUI5Versions() {
+        const version = await (0, adp_tooling_1.getSystemUI5Version)(this.abapProvider);
+        this.systemVersion = (0, adp_tooling_1.checkSystemVersionPattern)(version);
+        this.publicVersions = await (0, adp_tooling_1.fetchPublicVersions)();
+        this.ui5Versions = await (0, adp_tooling_1.getRelevantVersions)(this.systemVersion, this.isCustomerBase, this.publicVersions);
+    }
     /**
      * Handles the fetching and validation of system data.
      *
@@ -407,8 +446,8 @@ class ConfigPrompter {
      */
     async handleSystemDataValidation() {
         try {
-            await this.getSystemData();
-            await this.validateSystemVersion();
+            await this.loadSystemData();
+            await this.loadUI5Versions();
             if (!this.isCustomerBase && this.isCloudProject) {
                 return (0, i18n_1.t)('error.cloudSystemsForInternalUsers');
             }
@@ -419,22 +458,6 @@ class ConfigPrompter {
             return e.message;
         }
     }
-    /**
-     * Validates the UI5 system version based on the provided value or fetches all relevant versions if no value is provided.
-     * Updates the internal state with the fetched versions and the detection status.
-     *
-     * @returns {Promise<void>} Resolves after checking system ui5 version.
-     */
-    async validateSystemVersion() {
-        try {
-            const version = await (0, adp_tooling_1.getSystemUI5Version)(this.abapProvider);
-            await this.ui5Info.getRelevantVersions(version);
-        }
-        catch (e) {
-            this.logger.debug(`Could not fetch system version: ${e.message}`);
-            await this.ui5Info.getRelevantVersions();
-        }
-    }
     /**
      * Handles errors that occur while fetching system information, setting default values and rethrowing if necessary.
      *

package/generators/app/questions/helper/additional-messages.d.ts

@@ -1,4 +1,4 @@
-import { Severity } from '@sap-devx/yeoman-ui-types';
+import type { IMessageSeverity } from '@sap-devx/yeoman-ui-types';
 import type { FlexUISupportedSystem, SourceApplication } from '@sap-ux/adp-tooling';
 interface SupportFlags {
     hasSyncViews: boolean;
@@ -11,13 +11,10 @@ interface SupportFlags {
  *
  * @param {FlexUISupportedSystem | undefined} flexUISystem - An optional object containing flags indicating if the system
  *                                                           is on-premise and whether UI Flex is enabled.
- * @param isCloudProject
- * @returns {{message: string, severity: Severity} | undefined} An object containing a message and its severity level.
+ * @param {boolean} isCloudProject - Whether the project is for a cloud-based system.
+ * @returns {IMessageSeverity | undefined} An object containing a message and its severity level.
  */
-export declare const getSystemAdditionalMessages: (flexUISystem: FlexUISupportedSystem | undefined, isCloudProject: boolean) => {
-    message: string;
-    severity: Severity;
-} | undefined;
+export declare const getSystemAdditionalMessages: (flexUISystem: FlexUISupportedSystem | undefined, isCloudProject: boolean) => IMessageSeverity | undefined;
 /**
  * Provides an additional contextual message for the selected application, based on its compatibility,
  * feature support, or sync-loading behavior.
@@ -25,11 +22,15 @@ export declare const getSystemAdditionalMessages: (flexUISystem: FlexUISupported
  * @param {SourceApplication} app - The selected application object.
  * @param {SupportFlags} flags - Flags indicating support for sync views, Adp-over-Adp, and V4 internal apps.
  * @param {boolean} isApplicationSupported - Indicates whether the application is supported at all.
- * @returns {{ message: string; severity: Severity } | undefined} Message object or undefined if no message is applicable.
+ * @returns {IMessageSeverity | undefined} Message object or undefined if no message is applicable.
  */
-export declare const getAppAdditionalMessages: (app: SourceApplication, { hasSyncViews, isSupported, isPartiallySupported, isV4AppInternalMode }: SupportFlags, isApplicationSupported: boolean) => {
-    message: string;
-    severity: Severity;
-} | undefined;
+export declare const getAppAdditionalMessages: (app: SourceApplication, { hasSyncViews, isSupported, isPartiallySupported, isV4AppInternalMode }: SupportFlags, isApplicationSupported: boolean) => IMessageSeverity | undefined;
+/**
+ * Provides additional messages related to UI5 version detection based on system and authentication conditions.
+ *
+ * @param {boolean} isVersionDetected - Flag indicating that the system ui5 version was detected.
+ * @returns {object | undefined} An object containing a message and its severity level if conditions are met; otherwise, undefined.
+ */
+export declare const getVersionAdditionalMessages: (isVersionDetected: boolean) => IMessageSeverity | undefined;
 export {};
 //# sourceMappingURL=additional-messages.d.ts.map

package/generators/app/questions/helper/additional-messages.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getAppAdditionalMessages = exports.getSystemAdditionalMessages = void 0;
+exports.getVersionAdditionalMessages = exports.getAppAdditionalMessages = exports.getSystemAdditionalMessages = void 0;
 const yeoman_ui_types_1 = require("@sap-devx/yeoman-ui-types");
 const axios_extension_1 = require("@sap-ux/axios-extension");
 const i18n_1 = require("../../../utils/i18n");
@@ -9,8 +9,8 @@ const i18n_1 = require("../../../utils/i18n");
  *
  * @param {FlexUISupportedSystem | undefined} flexUISystem - An optional object containing flags indicating if the system
  *                                                           is on-premise and whether UI Flex is enabled.
- * @param isCloudProject
- * @returns {{message: string, severity: Severity} | undefined} An object containing a message and its severity level.
+ * @param {boolean} isCloudProject - Whether the project is for a cloud-based system.
+ * @returns {IMessageSeverity | undefined} An object containing a message and its severity level.
  */
 const getSystemAdditionalMessages = (flexUISystem, isCloudProject) => {
     const isOnPremise = flexUISystem?.isOnPremise;
@@ -54,7 +54,7 @@ exports.getSystemAdditionalMessages = getSystemAdditionalMessages;
  * @param {SourceApplication} app - The selected application object.
  * @param {SupportFlags} flags - Flags indicating support for sync views, Adp-over-Adp, and V4 internal apps.
  * @param {boolean} isApplicationSupported - Indicates whether the application is supported at all.
- * @returns {{ message: string; severity: Severity } | undefined} Message object or undefined if no message is applicable.
+ * @returns {IMessageSeverity | undefined} Message object or undefined if no message is applicable.
  */
 const getAppAdditionalMessages = (app, { hasSyncViews, isSupported, isPartiallySupported, isV4AppInternalMode }, isApplicationSupported) => {
     if (!app) {
@@ -84,6 +84,23 @@ const getAppAdditionalMessages = (app, { hasSyncViews, isSupported, isPartiallyS
             severity: yeoman_ui_types_1.Severity.warning
         };
     }
+    return undefined;
 };
 exports.getAppAdditionalMessages = getAppAdditionalMessages;
+/**
+ * Provides additional messages related to UI5 version detection based on system and authentication conditions.
+ *
+ * @param {boolean} isVersionDetected - Flag indicating that the system ui5 version was detected.
+ * @returns {object | undefined} An object containing a message and its severity level if conditions are met; otherwise, undefined.
+ */
+const getVersionAdditionalMessages = (isVersionDetected) => {
+    if (!isVersionDetected) {
+        return {
+            message: (0, i18n_1.t)('validators.ui5VersionNotDetectedError'),
+            severity: yeoman_ui_types_1.Severity.warning
+        };
+    }
+    return undefined;
+};
+exports.getVersionAdditionalMessages = getVersionAdditionalMessages;
 //# sourceMappingURL=additional-messages.js.map

package/generators/app/questions/helper/default-values.d.ts

@@ -1,25 +1,25 @@
-import { FlexLayer } from '@sap-ux/adp-tooling';
 /**
  * Generates a namespace for a project based on its layer.
  *
  * @param {string} projectName - The name of the project.
- * @param {FlexLayer} layer -  The UI5 Flex layer, indicating the deployment layer (e.g., CUSTOMER_BASE).
+ * @param {FlexLayer} isCustomerBase - Indicates the deployment layer (e.g., CUSTOMER_BASE).
  * @returns {string} The namespace string, prefixed appropriately if it's a customer base project.
  */
-export declare function generateValidNamespace(projectName: string, layer: FlexLayer): string;
+export declare function getDefaultNamespace(projectName: string, isCustomerBase: boolean): string;
 /**
- * Retrieves a list of project directory names that match a specific naming pattern from the given directory path.
+ * Generates a default project name based on the existing projects in the specified directory.
  *
- * @param {string} path - The directory path from which to list project names.
- * @param {RegExp} regex - The specific naming pattern to filter by.
- * @returns {string[]} An array of project names that match the pattern /^app\.variant[0-9]{1,3}$/, sorted in reverse order.
+ * @param {string} basePath - Base path of the project.
+ * @param {string} dirName - Directory name to search for.
+ * @returns {string} A default project name with an incremented index if similar projects exist.
  */
-export declare function getProjectNames(path: string, regex?: RegExp): string[];
+export declare function getDefaultProjectName(basePath: string, dirName?: string): string;
 /**
- * Generates a default project name based on the existing projects in the specified directory.
+ * Gets the default UI5 version from the system versions list by validating the first available version.
+ * If the first version is valid according to the UI5 service, it returns that version; otherwise, returns an empty string.
  *
- * @param {string} path - The directory path where projects are located.
- * @returns {string} A default project name with an incremented index if similar projects exist.
+ * @param {string[]} ui5Versions Array of available versions.
+ * @returns {Promise<string>} The valid UI5 version or an empty string if the first version is not valid or if there are no versions.
  */
-export declare function getDefaultProjectName(path: string): string;
+export declare function getDefaultVersion(ui5Versions: string[]): Promise<string>;
 //# sourceMappingURL=default-values.d.ts.map

package/generators/app/questions/helper/default-values.js

@@ -1,54 +1,51 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getDefaultProjectName = exports.getProjectNames = exports.generateValidNamespace = void 0;
+exports.getDefaultVersion = exports.getDefaultProjectName = exports.getDefaultNamespace = void 0;
+const path_1 = require("path");
 const fs_1 = require("fs");
-const APP_VARIANT_REGEX = /^app[.]variant\d{1,3}$/;
+const adp_tooling_1 = require("@sap-ux/adp-tooling");
+const DEFAULT_PREFIX = 'app.variant';
 /**
  * Generates a namespace for a project based on its layer.
  *
  * @param {string} projectName - The name of the project.
- * @param {FlexLayer} layer -  The UI5 Flex layer, indicating the deployment layer (e.g., CUSTOMER_BASE).
+ * @param {FlexLayer} isCustomerBase - Indicates the deployment layer (e.g., CUSTOMER_BASE).
  * @returns {string} The namespace string, prefixed appropriately if it's a customer base project.
  */
-function generateValidNamespace(projectName, layer) {
-    return layer === "CUSTOMER_BASE" /* FlexLayer.CUSTOMER_BASE */ ? `customer.${projectName}` : projectName;
+function getDefaultNamespace(projectName, isCustomerBase) {
+    return isCustomerBase ? `customer.${projectName}` : projectName;
 }
-exports.generateValidNamespace = generateValidNamespace;
+exports.getDefaultNamespace = getDefaultNamespace;
 /**
- * Retrieves a list of project directory names that match a specific naming pattern from the given directory path.
+ * Generates a default project name based on the existing projects in the specified directory.
  *
- * @param {string} path - The directory path from which to list project names.
- * @param {RegExp} regex - The specific naming pattern to filter by.
- * @returns {string[]} An array of project names that match the pattern /^app\.variant[0-9]{1,3}$/, sorted in reverse order.
+ * @param {string} basePath - Base path of the project.
+ * @param {string} dirName - Directory name to search for.
+ * @returns {string} A default project name with an incremented index if similar projects exist.
  */
-function getProjectNames(path, regex = APP_VARIANT_REGEX) {
-    return (0, fs_1.readdirSync)(path, { withFileTypes: true })
-        .filter((dirent) => !dirent.isFile() && regex.test(dirent.name))
-        .map((dirent) => dirent.name)
-        .sort((a, b) => {
-        const numA = parseInt(a.replace('app.variant', ''), 10);
-        const numB = parseInt(b.replace('app.variant', ''), 10);
-        return numA - numB;
-    })
-        .reverse();
+function getDefaultProjectName(basePath, dirName = DEFAULT_PREFIX) {
+    let newDir = dirName;
+    let index = 1;
+    while ((0, fs_1.existsSync)((0, path_1.join)(basePath, newDir))) {
+        index++;
+        newDir = `${dirName}${index}`;
+    }
+    return newDir;
 }
-exports.getProjectNames = getProjectNames;
+exports.getDefaultProjectName = getDefaultProjectName;
 /**
- * Generates a default project name based on the existing projects in the specified directory.
+ * Gets the default UI5 version from the system versions list by validating the first available version.
+ * If the first version is valid according to the UI5 service, it returns that version; otherwise, returns an empty string.
  *
- * @param {string} path - The directory path where projects are located.
- * @returns {string} A default project name with an incremented index if similar projects exist.
+ * @param {string[]} ui5Versions Array of available versions.
+ * @returns {Promise<string>} The valid UI5 version or an empty string if the first version is not valid or if there are no versions.
  */
-function getDefaultProjectName(path) {
-    const projectNames = getProjectNames(path);
-    const defaultPrefix = 'app.variant';
-    if (projectNames.length === 0) {
-        return `${defaultPrefix}1`;
+async function getDefaultVersion(ui5Versions) {
+    if (ui5Versions?.length === 0) {
+        return '';
     }
-    const lastProject = projectNames[0];
-    const lastProjectIdx = lastProject.replace(defaultPrefix, '');
-    const newProjectIndex = parseInt(lastProjectIdx, 10) + 1;
-    return `${defaultPrefix}${newProjectIndex}`;
+    const isValid = await (0, adp_tooling_1.validateUI5VersionExists)(ui5Versions[0]);
+    return isValid === true ? ui5Versions[0] : '';
 }
-exports.getDefaultProjectName = getDefaultProjectName;
+exports.getDefaultVersion = getDefaultVersion;
 //# sourceMappingURL=default-values.js.map

package/generators/app/questions/helper/tooltip.d.ts

@@ -0,0 +1,8 @@
+/**
+ * Returns a tooltip message for project name input fields, customized based on the project's user layer.
+ *
+ * @param {boolean} isCustomerBase - Determines if the tooltip is for a customer base project.
+ * @returns {string} A tooltip message with specific validation rules.
+ */
+export declare function getProjectNameTooltip(isCustomerBase: boolean): string;
+//# sourceMappingURL=tooltip.d.ts.map

package/generators/app/questions/helper/tooltip.js

@@ -0,0 +1,18 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getProjectNameTooltip = void 0;
+const i18n_1 = require("../../../utils/i18n");
+/**
+ * Returns a tooltip message for project name input fields, customized based on the project's user layer.
+ *
+ * @param {boolean} isCustomerBase - Determines if the tooltip is for a customer base project.
+ * @returns {string} A tooltip message with specific validation rules.
+ */
+function getProjectNameTooltip(isCustomerBase) {
+    const baseType = isCustomerBase ? 'Ext' : 'Int';
+    const lengthErrorMsg = (0, i18n_1.t)(`prompts.projectNameLengthError${baseType}`);
+    const validationErrorMsg = (0, i18n_1.t)(`prompts.projectNameValidationError${baseType}`);
+    return `${lengthErrorMsg} ${validationErrorMsg}`;
+}
+exports.getProjectNameTooltip = getProjectNameTooltip;
+//# sourceMappingURL=tooltip.js.map

package/generators/app/types.d.ts

@@ -1,6 +1,6 @@
 import type Generator from 'yeoman-generator';
 import type { AppWizard } from '@sap-devx/yeoman-ui-types';
-import type { ConfigAnswers } from '@sap-ux/adp-tooling';
+import type { AttributesAnswers, ConfigAnswers } from '@sap-ux/adp-tooling';
 import type { YUIQuestion } from '@sap-ux/inquirer-common';
 import type { TelemetryData } from '@sap-ux/fiori-generator-shared';
 export interface AdpGeneratorOptions extends Generator.GeneratorOptions {
@@ -71,4 +71,43 @@ export type ConfigPromptOptions = Partial<{
     [configPromptNames.application]: ApplicationPromptOptions;
     [configPromptNames.appValidationCli]: CliValidationPromptOptions;
 }>;
+export declare enum attributePromptNames {
+    projectName = "projectName",
+    title = "title",
+    namespace = "namespace",
+    targetFolder = "targetFolder",
+    ui5Version = "ui5Version",
+    ui5ValidationCli = "ui5ValidationCli",
+    enableTypeScript = "enableTypeScript"
+}
+export type AttributesQuestion = YUIQuestion<AttributesAnswers>;
+export interface ProjectNamePromptOptions {
+    hide?: boolean;
+}
+export interface ApplicationTitlePromptOptions {
+    default?: string;
+    hide?: boolean;
+}
+export interface NamespacePromptOptions {
+    default?: string;
+    hide?: boolean;
+}
+export interface TargetFolderPromptOptions {
+    default?: string;
+}
+export interface UI5VersionPromptOptions {
+    default?: string;
+}
+export interface EnableTypeScriptPromptOptions {
+    hide?: boolean;
+}
+export type AttributePromptOptions = Partial<{
+    [attributePromptNames.projectName]: ProjectNamePromptOptions;
+    [attributePromptNames.title]: ApplicationTitlePromptOptions;
+    [attributePromptNames.namespace]: NamespacePromptOptions;
+    [attributePromptNames.targetFolder]: TargetFolderPromptOptions;
+    [attributePromptNames.ui5Version]: UI5VersionPromptOptions;
+    [attributePromptNames.ui5ValidationCli]: CliValidationPromptOptions;
+    [attributePromptNames.enableTypeScript]: EnableTypeScriptPromptOptions;
+}>;
 //# sourceMappingURL=types.d.ts.map

package/generators/app/types.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.configPromptNames = void 0;
+exports.attributePromptNames = exports.configPromptNames = void 0;
 /**
  * Enumeration of prompt names used in the configuration.
  */
@@ -13,4 +13,14 @@ var configPromptNames;
     configPromptNames["application"] = "application";
     configPromptNames["appValidationCli"] = "appValidationCli";
 })(configPromptNames || (exports.configPromptNames = configPromptNames = {}));
+var attributePromptNames;
+(function (attributePromptNames) {
+    attributePromptNames["projectName"] = "projectName";
+    attributePromptNames["title"] = "title";
+    attributePromptNames["namespace"] = "namespace";
+    attributePromptNames["targetFolder"] = "targetFolder";
+    attributePromptNames["ui5Version"] = "ui5Version";
+    attributePromptNames["ui5ValidationCli"] = "ui5ValidationCli";
+    attributePromptNames["enableTypeScript"] = "enableTypeScript";
+})(attributePromptNames || (exports.attributePromptNames = attributePromptNames = {}));
 //# sourceMappingURL=types.js.map

package/generators/translations/generator-adp.i18n.json

@@ -1,7 +1,9 @@
 {
     "yuiNavSteps": {
         "configurationName": "System and Application Selection",
-        "configurationDescr": "Configure the system and select an application."
+        "configurationDescr": "Configure the system and select an application.",
+        "projectAttributesName": "Project Attributes",
+        "projectAttributesDescr": "Configure the main project attributes."
     },
     "prompts": {
         "systemLabel": "System",
@@ -13,10 +15,24 @@
         "applicationListLabel": "Application",
         "applicationListTooltip": "Select the application for which you want to create an app variant.",
         "projectTypeLabel": "Project Type",
+        "projectNameLabel": "Project Name",
+        "projectNameTooltip": "Enter the project name for your app variant.",
+        "appTitleLabel": "Application Title",
+        "appTitleTooltip": "Enter the application title for your app variant.",
+        "appTitleDefault": "App Variant Title",
+        "namespaceLabel": "Namespace",
+        "projectFolderLabel": "Project Folder Path",
+        "projectFolderPath": "Project Path",
+        "ui5VersionLabel": "SAPUI5 Version",
+        "ui5VersionTooltip": "Select the SAPUI5 version you want to use to preview your app variant.",
         "appInfoLabel": "Synchronous views are detected for this application. Therefore, the controller extensions are not supported. Controller extension functionality on these views will be disabled.",
         "notSupportedAdpOverAdpLabel": "You have selected 'Adaptation Project' as the base. The selected system has a SAPUI5 version lower than 1.90. Therefore, it does not support 'Adaptation Project' as а base for a new adaptation project. You will be able to create such а project, but after deployment it will not work until the SAPUI5 version of the system is updated.",
         "isPartiallySupportedAdpOverAdpLabel": "You have selected 'Adaptation Project' as the base. The selected system has a SAPUI5 version lower than 1.96 and in order for your adaptation project based on adaptation project to work after deployment, you will need to apply SAP Note 756 SP0 on your system.",
-        "v4AppNotOfficialLabel": "You have selected an app based on SAP Fiori elements for OData V4. Note the following important information when you create adaptation changes: https://wiki.wdf.sap.corp/wiki/display/fioritech/Adaptation+Project+Support"
+        "v4AppNotOfficialLabel": "You have selected an app based on SAP Fiori elements for OData V4. Note the following important information when you create adaptation changes: https://wiki.wdf.sap.corp/wiki/display/fioritech/Adaptation+Project+Support",
+        "projectNameLengthErrorExt": "The name cannot contain more than 61 characters or end with the word 'component'.",
+        "projectNameValidationErrorExt": "The name must contain only latin alphanumeric characters. Different parts can be separated by a period and every part must start with a letter.",
+        "projectNameLengthErrorInt": "The name cannot start with the word 'customer', or contain more than 61 characters, or end with the word 'component'.",
+        "projectNameValidationErrorInt": "The name must contain only latin alphanumeric characters and it must have at least two parts. The different parts must be separated by a period and every part must start with a letter."
     },
     "error": {
         "selectCannotBeEmptyError": "{{value}} has to be selected.",

package/package.json

@@ -2,7 +2,7 @@
   "name": "@sap-ux/generator-adp",
   "displayName": "SAPUI5 Adaptation Project",
   "description": "Adaptation project allows you to create an app variant for an existing SAP Fiori elements-based or SAPUI5 freestyle application, without changing the original application.",
-  "version": "0.1.7",
+  "version": "0.1.9",
   "repository": {
     "type": "git",
     "url": "https://github.com/SAP/open-ux-tools.git",
@@ -29,16 +29,16 @@
     "i18next": "23.5.1",
     "yeoman-generator": "5.10.0",
     "uuid": "10.0.0",
-    "@sap-ux/adp-tooling": "0.13.28",
-    "@sap-ux/axios-extension": "1.19.3",
+    "@sap-ux/adp-tooling": "0.13.30",
+    "@sap-ux/axios-extension": "1.20.0",
     "@sap-ux/btp-utils": "1.0.3",
     "@sap-ux/feature-toggle": "0.2.3",
     "@sap-ux/inquirer-common": "0.6.35",
     "@sap-ux/logger": "0.6.0",
     "@sap-ux/project-access": "1.29.18",
     "@sap-ux/store": "1.0.0",
-    "@sap-ux/system-access": "0.5.35",
-    "@sap-ux/project-input-validator": "0.5.0",
+    "@sap-ux/system-access": "0.5.36",
+    "@sap-ux/project-input-validator": "0.5.1",
     "@sap-ux/fiori-generator-shared": "0.10.2"
   },
   "devDependencies": {