@sap-ux/generator-adp 0.8.18 → 0.9.1

package/generators/app/index.d.ts

@@ -64,6 +64,10 @@ export default class extends Generator {
      * Application manifest.
      */
     private manifest;
+    /**
+     * The Adaptation project type.
+     */
+    private projectType?;
     /**
      * Publicly available UI5 versions.
      */
@@ -165,6 +169,13 @@ export default class extends Generator {
      * @returns {string} The project path from the answers.
      */
     private _getProjectPath;
+    /**
+     * Use this method to get the correct Adaptation project type, no matter how we start
+     * the generator - from Yeoman UI or the CLI.
+     *
+     * @returns {AdaptationProjectType | undefined} The Adaptation project type.
+     */
+    private _getProjectType;
     /**
      * Configures logging for the generator.
      */

package/generators/app/index.js

@@ -11,15 +11,15 @@ const yeoman_ui_types_1 = require("@sap-devx/yeoman-ui-types");
 const adp_tooling_1 = require("@sap-ux/adp-tooling");
 const fiori_generator_shared_1 = require("@sap-ux/fiori-generator-shared");
 const logger_1 = require("@sap-ux/logger");
+const axios_extension_1 = require("@sap-ux/axios-extension");
 const feature_toggle_1 = require("@sap-ux/feature-toggle");
-const telemetry_1 = require("@sap-ux/telemetry");
 const appWizardCache_1 = require("../utils/appWizardCache");
 const deps_1 = require("../utils/deps");
 const i18n_1 = require("../utils/i18n");
 const logger_2 = __importDefault(require("../utils/logger"));
 const opts_1 = require("../utils/opts");
 const parse_json_input_1 = require("../utils/parse-json-input");
-const telemetry_2 = require("../telemetry");
+const telemetry_1 = require("../telemetry");
 const steps_1 = require("../utils/steps");
 const subgenHelpers_1 = require("../utils/subgenHelpers");
 const templates_1 = require("../utils/templates");
@@ -33,6 +33,7 @@ const validators_1 = require("./questions/helper/validators");
 const types_1 = require("./types");
 const target_env_1 = require("./questions/target-env");
 const key_user_1 = require("./questions/key-user");
+const telemetry_2 = require("@sap-ux/telemetry");
 const generatorTitle = 'Adaptation Project';
 /**
  * Generator for creating an Adaptation Project.
@@ -98,6 +99,10 @@ class default_1 extends yeoman_generator_1.default {
      * Application manifest.
      */
     manifest;
+    /**
+     * The Adaptation project type.
+     */
+    projectType;
     /**
      * Publicly available UI5 versions.
      */
@@ -196,7 +201,7 @@ class default_1 extends yeoman_generator_1.default {
         this.isCfLoggedIn = await (0, adp_tooling_1.isLoggedInCf)(this.cfConfig, this.logger);
         this.logger.info(`isCfInstalled: ${this.cfInstalled}`);
         const isInternalUsage = (0, feature_toggle_1.isInternalFeaturesSettingEnabled)();
-        await (0, telemetry_1.initTelemetrySettings)({
+        await (0, telemetry_2.initTelemetrySettings)({
             consumerModule: {
                 name: '@sap/generator-fiori:generator-adp',
                 version: this.rootGeneratorVersion()
@@ -204,7 +209,7 @@ class default_1 extends yeoman_generator_1.default {
             internalFeature: isInternalUsage,
             watchTelemetrySettingStore: false
         });
-        this.telemetryCollector = new telemetry_2.TelemetryCollector();
+        this.telemetryCollector = new telemetry_1.TelemetryCollector();
         if (!this.jsonInput) {
             const shouldShowTargetEnv = this.cfInstalled && this.isCfFeatureEnabled;
             this.prompts.splice(0, 0, (0, steps_1.getWizardPages)(shouldShowTargetEnv));
@@ -222,7 +227,11 @@ class default_1 extends yeoman_generator_1.default {
         }
         else {
             const isExtensibilityExtInstalled = (0, fiori_generator_shared_1.isExtensionInstalled)(this.vscode, 'SAP.vscode-bas-extensibility');
+            const isInternalUsage = (0, feature_toggle_1.isInternalFeaturesSettingEnabled)();
             const configQuestions = this.prompter.getPrompts({
+                projectType: {
+                    default: isInternalUsage ? axios_extension_1.AdaptationProjectType.ON_PREMISE : axios_extension_1.AdaptationProjectType.CLOUD_READY
+                },
                 appValidationCli: { hide: !this.isCli },
                 systemValidationCli: { hide: !this.isCli },
                 shouldCreateExtProject: { isExtensibilityExtInstalled }
@@ -232,10 +241,11 @@ class default_1 extends yeoman_generator_1.default {
             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 = {
+            const optionalPromptsConfig = {
                 ui5Versions,
                 isVersionDetected: !!systemVersion,
-                isCloudProject: this.prompter.isCloud,
+                projectType: this.prompter.projectType,
+                systemType: this.prompter.systemType,
                 layer: this.layer,
                 prompts: this.prompts
             };
@@ -251,7 +261,7 @@ class default_1 extends yeoman_generator_1.default {
                 addDeployConfig: { hide: this.shouldCreateExtProject || !this.isCustomerBase },
                 importKeyUserChanges: { hide: this.shouldCreateExtProject }
             };
-            const attributesQuestions = (0, attributes_1.getPrompts)(this.destinationPath(), promptConfig, options);
+            const attributesQuestions = (0, attributes_1.getPrompts)(this.destinationPath(), optionalPromptsConfig, options);
             this.attributeAnswers = await this.prompt(attributesQuestions);
             // Steps need to be updated here to be available after back navigation in Yeoman UI.
             this._updateWizardStepsAfterNavigation();
@@ -269,6 +279,7 @@ class default_1 extends yeoman_generator_1.default {
                     projectName: this.attributeAnswers.projectName,
                     projectPath: this.attributeAnswers.targetFolder,
                     connectedSystem: this.configAnswers.system,
+                    projectType: this.prompter.projectType,
                     system
                 }, this.composeWith.bind(this), this.logger, this.appWizard);
             }
@@ -308,6 +319,7 @@ class default_1 extends yeoman_generator_1.default {
             const provider = this.jsonInput ? this.abapProvider : this.prompter.provider;
             const publicVersions = this.jsonInput ? this.publicVersions : this.prompter.ui5.publicVersions;
             const manifest = this.jsonInput ? this.manifest : this.prompter.manifest;
+            const projectType = this._getProjectType();
             const packageJson = (0, deps_1.getPackageInfo)();
             const config = await (0, adp_tooling_1.getConfig)({
                 provider,
@@ -319,6 +331,7 @@ class default_1 extends yeoman_generator_1.default {
                 layer: this.layer,
                 packageJson,
                 logger: this.toolsLogger,
+                projectType,
                 toolsId: this.toolsId,
                 keyUserChanges: this.keyUserPrompter?.changes
             });
@@ -354,9 +367,9 @@ class default_1 extends yeoman_generator_1.default {
             ...this.telemetryCollector.telemetryData
         });
         if (data) {
-            (0, fiori_generator_shared_1.sendTelemetry)(telemetry_2.EventName.ADAPTATION_PROJECT_CREATED, data, projectPath)
+            (0, fiori_generator_shared_1.sendTelemetry)(telemetry_1.EventName.ADAPTATION_PROJECT_CREATED, data, projectPath)
                 .then(() => {
-                this.logger.log(`Event ${telemetry_2.EventName.ADAPTATION_PROJECT_CREATED} successfully sent`);
+                this.logger.log(`Event ${telemetry_1.EventName.ADAPTATION_PROJECT_CREATED} successfully sent`);
             })
                 .catch((error) => {
                 this.logger.error(`Failed to send telemetry: ${error}`);
@@ -410,8 +423,8 @@ class default_1 extends yeoman_generator_1.default {
             telemetryData.projectType = 'cf';
         }
         else {
-            const isCloud = this.prompter?.isCloud ?? false;
-            telemetryData.projectType = isCloud ? 'cloudReady' : 'onPremise';
+            telemetryData.projectType =
+                this._getProjectType() === axios_extension_1.AdaptationProjectType.CLOUD_READY ? 'cloudReady' : 'onPremise';
             telemetryData.baseAppTechnicalName = this.configAnswers?.application?.id ?? '';
         }
         if (this.jsonInput) {
@@ -470,7 +483,6 @@ class default_1 extends yeoman_generator_1.default {
         const attributesQuestions = (0, attributes_1.getPrompts)(projectPath, {
             ui5Versions: [],
             isVersionDetected: false,
-            isCloudProject: false,
             layer: this.layer,
             prompts: this.prompts,
             isCfEnv: true
@@ -548,6 +560,15 @@ class default_1 extends yeoman_generator_1.default {
         }
         return (0, node_path_1.join)(this.attributeAnswers.targetFolder, this.attributeAnswers.projectName);
     }
+    /**
+     * Use this method to get the correct Adaptation project type, no matter how we start
+     * the generator - from Yeoman UI or the CLI.
+     *
+     * @returns {AdaptationProjectType | undefined} The Adaptation project type.
+     */
+    _getProjectType() {
+        return this.jsonInput ? this.projectType : this.prompter.projectType;
+    }
     /**
      * Configures logging for the generator.
      */
@@ -562,7 +583,7 @@ class default_1 extends yeoman_generator_1.default {
         if (!this.jsonInput) {
             return;
         }
-        const { system, client, username = '', password = '', application: baseApplicationName, applicationTitle, targetFolder = '/home/user/projects', projectName = (0, default_values_1.getDefaultProjectName)(targetFolder, `${baseApplicationName}.variant`), namespace = (0, default_values_1.getDefaultNamespace)(projectName, this.isCustomerBase) } = this.jsonInput;
+        const { system, client, username = '', password = '', projectType, application: baseApplicationName, applicationTitle, targetFolder = '/home/user/projects', projectName = (0, default_values_1.getDefaultProjectName)(targetFolder, `${baseApplicationName}.variant`), namespace = (0, default_values_1.getDefaultNamespace)(projectName, this.isCustomerBase) } = this.jsonInput;
         await (0, validators_1.validateJsonInput)(this.systemLookup, this.isCustomerBase, {
             projectName,
             targetFolder,
@@ -577,7 +598,16 @@ class default_1 extends yeoman_generator_1.default {
             password
         };
         this.abapProvider = await (0, adp_tooling_1.getConfiguredProvider)(providerOptions, this.logger);
-        const applications = await (0, adp_tooling_1.loadApps)(this.abapProvider, this.isCustomerBase);
+        const supportedProject = await (0, adp_tooling_1.getSupportedProject)(this.abapProvider);
+        let selectedProjectType = axios_extension_1.AdaptationProjectType.ON_PREMISE;
+        if (supportedProject === adp_tooling_1.SupportedProject.CLOUD_READY_AND_ON_PREM) {
+            selectedProjectType = projectType ?? axios_extension_1.AdaptationProjectType.CLOUD_READY;
+        }
+        else if (supportedProject === adp_tooling_1.SupportedProject.CLOUD_READY) {
+            selectedProjectType = axios_extension_1.AdaptationProjectType.CLOUD_READY;
+        }
+        this.projectType = selectedProjectType;
+        const applications = await (0, adp_tooling_1.loadApps)(this.abapProvider, this.isCustomerBase, selectedProjectType);
         this.telemetryCollector.setBatch({ numberOfApplications: applications.length });
         const application = applications.find((application) => application.id === baseApplicationName);
         if (!application) {

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

@@ -1,23 +1,15 @@
 import { type Prompts as YeomanUiSteps } from '@sap-devx/yeoman-ui-types';
-import { FlexLayer } from '@sap-ux/adp-tooling';
-import type { AttributesQuestion, AttributePromptOptions, AddDeployConfigPromptOptions, AddFlpConfigPromptOptions } from '../types';
-interface Config {
-    isCloudProject: boolean;
-    layer: FlexLayer;
-    ui5Versions: string[];
-    isVersionDetected: boolean;
-    prompts: YeomanUiSteps;
-    isCfEnv?: boolean;
-}
+import type { AttributesQuestion, AttributePromptOptions, AddDeployConfigPromptOptions, AddFlpConfigPromptOptions, OptionalPromptsConfig } from '../types';
+import { AdaptationProjectType } from '@sap-ux/axios-extension';
 /**
  * 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 {OptionalPromptsConfig} 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 declare function getPrompts(path: string, config: OptionalPromptsConfig, promptOptions?: AttributePromptOptions): AttributesQuestion[];
 /**
  * Creates the Add Deployment Config confirm prompt.
  *
@@ -30,10 +22,9 @@ export declare function getAddDeployConfigPrompt(prompts: YeomanUiSteps, _?: Add
  * Creates the Add FLP Config confirm prompt.
  *
  * @param {YeomanUiSteps} prompts - The Yeoman UI pages.
- * @param {boolean} isCloudProject - Whether the project is for a cloud-based system.
+ * @param {boolean} projectType - The project type.
  * @param {AddFlpConfigPromptOptions} options - Optional prompt options to control visibility.
  * @returns {AttributesQuestion} The prompt configuration for Add FLP config confirmation.
  */
-export declare function getFlpConfigPrompt(prompts: YeomanUiSteps, isCloudProject: boolean, options?: AddFlpConfigPromptOptions): AttributesQuestion;
-export {};
+export declare function getFlpConfigPrompt(prompts: YeomanUiSteps, projectType?: AdaptationProjectType, options?: AddFlpConfigPromptOptions): AttributesQuestion;
 //# sourceMappingURL=attributes.d.ts.map

package/generators/app/questions/attributes.js

@@ -11,27 +11,28 @@ const tooltip_1 = require("./helper/tooltip");
 const additional_messages_1 = require("./helper/additional-messages");
 const steps_1 = require("../../utils/steps");
 const default_values_1 = require("./helper/default-values");
+const axios_extension_1 = require("@sap-ux/axios-extension");
 /**
  * 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 {OptionalPromptsConfig} 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, prompts, isCfEnv = false } = config;
+    const { isVersionDetected, ui5Versions, systemType, projectType, layer, prompts, isCfEnv = false } = config;
     const isCustomerBase = layer === "CUSTOMER_BASE" /* FlexLayer.CUSTOMER_BASE */;
     const keyedPrompts = {
         [types_1.attributePromptNames.projectName]: getProjectNamePrompt(path, isCustomerBase, isCfEnv, 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.ui5Version]: getUi5VersionPrompt(ui5Versions, isVersionDetected, systemType),
         [types_1.attributePromptNames.ui5ValidationCli]: getUi5VersionValidationPromptForCli(),
         [types_1.attributePromptNames.enableTypeScript]: getEnableTypeScriptPrompt(promptOptions?.[types_1.attributePromptNames.enableTypeScript]),
         [types_1.attributePromptNames.addDeployConfig]: getAddDeployConfigPrompt(prompts, promptOptions?.[types_1.attributePromptNames.addDeployConfig]),
-        [types_1.attributePromptNames.addFlpConfig]: getFlpConfigPrompt(prompts, isCloudProject, promptOptions?.[types_1.attributePromptNames.addFlpConfig]),
+        [types_1.attributePromptNames.addFlpConfig]: getFlpConfigPrompt(prompts, projectType, promptOptions?.[types_1.attributePromptNames.addFlpConfig]),
         [types_1.attributePromptNames.importKeyUserChanges]: getImportKeyUserChangesPrompt(prompts, promptOptions?.[types_1.attributePromptNames.importKeyUserChanges])
     };
     const questions = Object.entries(keyedPrompts)
@@ -143,15 +144,15 @@ function getTargetFolderPrompt(options) {
  *
  * @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.
+ * @param {boolean} systemType - The system type.
  * @returns {AttributesQuestion} The prompt configuration for UI5 version.
  */
-function getUi5VersionPrompt(ui5Versions, isVersionDetected, isCloudProject) {
+function getUi5VersionPrompt(ui5Versions, isVersionDetected, systemType) {
     return {
         type: 'list',
         name: types_1.attributePromptNames.ui5Version,
         message: (0, i18n_1.t)('prompts.ui5VersionLabel'),
-        when: !isCloudProject,
+        when: systemType !== types_1.SystemType.CLOUD_READY,
         choices: ui5Versions,
         guiOptions: {
             applyDefaultWhenDirty: true,
@@ -227,11 +228,11 @@ function getAddDeployConfigPrompt(prompts, _) {
  * Creates the Add FLP Config confirm prompt.
  *
  * @param {YeomanUiSteps} prompts - The Yeoman UI pages.
- * @param {boolean} isCloudProject - Whether the project is for a cloud-based system.
+ * @param {boolean} projectType - The project type.
  * @param {AddFlpConfigPromptOptions} options - Optional prompt options to control visibility.
  * @returns {AttributesQuestion} The prompt configuration for Add FLP config confirmation.
  */
-function getFlpConfigPrompt(prompts, isCloudProject, options) {
+function getFlpConfigPrompt(prompts, projectType, options) {
     return {
         type: 'confirm',
         name: types_1.attributePromptNames.addFlpConfig,
@@ -240,7 +241,7 @@ function getFlpConfigPrompt(prompts, isCloudProject, options) {
         guiOptions: {
             breadcrumb: true
         },
-        when: () => isCloudProject,
+        when: () => projectType === axios_extension_1.AdaptationProjectType.CLOUD_READY,
         validate: (value, answers) => {
             (0, steps_1.updateFlpWizardSteps)(!!options?.hasBaseAppInbounds, prompts, answers.projectName, value);
             return true;

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

@@ -1,10 +1,11 @@
 import type { SystemLookup, UI5Version } from '@sap-ux/adp-tooling';
 import { FlexLayer } from '@sap-ux/adp-tooling';
-import { type AbapServiceProvider } from '@sap-ux/axios-extension';
+import { AdaptationProjectType, type AbapServiceProvider } from '@sap-ux/axios-extension';
 import type { ToolsLogger } from '@sap-ux/logger';
 import type { Manifest, ManifestNamespace } from '@sap-ux/project-access';
 import type { TelemetryCollector } from '../../telemetry';
 import type { ConfigPromptOptions, ConfigQuestion } from '../types';
+import { SystemType } from '../types';
 /**
  * A stateful prompter class that creates configuration questions.
  * It exposes a single public method {@link getPrompts} to retrieve the configuration questions.
@@ -40,11 +41,20 @@ export declare class ConfigPrompter {
     /**
      * Cached UI flexibility information from the system.
      */
-    private flexUISystem;
+    private flexUICapability?;
     /**
-     * Flag indicating if the project is a cloud project.
+     * The supported project type for the system.
      */
-    private isCloudProject;
+    private supportedProject?;
+    /**
+     * The selected project type by the user. For a mixed system only
+     * the user may select from a cloudReady or an OnPremise project types.
+     */
+    private selectedProjectType?;
+    /**
+     * The system type for the selected system.
+     */
+    private selectedSystemType?;
     /**
      * Flag indicating whether the selected application is supported.
      */
@@ -56,7 +66,7 @@ export declare class ConfigPrompter {
     /**
      * System additional message.
      */
-    private systemAdditionalMessage;
+    private systemAdditionalMessage?;
     /**
      * Indicates whether views are loaded synchronously.
      */
@@ -100,11 +110,13 @@ export declare class ConfigPrompter {
         publicVersions: UI5Version;
     };
     /**
-     * Returns flag indicating if the project is a cloud project.
-     *
-     * @returns Whether system is cloud-ready.
+     * @returns {AdaptationProjectType | undefined} The project type.
      */
-    get isCloud(): boolean;
+    get projectType(): AdaptationProjectType | undefined;
+    /**
+     * @returns {SystemType | undefined} The system type.
+     */
+    get systemType(): SystemType | undefined;
     /**
      * Returns the configured abap provider instance.
      *
@@ -186,6 +198,13 @@ export declare class ConfigPrompter {
      * @returns The store credentials prompt as a {@link ConfigQuestion}.
      */
     private getStoreCredentialsPrompt;
+    /**
+     * Creates the project type prompt configuration.
+     *
+     * @param {ApplicationPromptOptions | undefined} options - The prompt options.
+     * @returns {ListQuestion<ConfigAnswers>} The project type prompt configuration.
+     */
+    private getProjectTypeListPrompt;
     /**
      * Creates the application list prompt configuration.
      *
@@ -262,7 +281,7 @@ export declare class ConfigPrompter {
      */
     private evaluateAppSupport;
     /**
-     * Fetches system data including cloud project and UI flexibility information.
+     * Fetches the system type, supported project type and the UI flexibility information.
      *
      * @returns A promise that resolves when system data is fetched.
      */

package/generators/app/questions/configuration.js

@@ -12,6 +12,7 @@ const choices_1 = require("./helper/choices");
 const conditions_1 = require("./helper/conditions");
 const message_1 = require("./helper/message");
 const validators_1 = require("./helper/validators");
+const feature_toggle_1 = require("@sap-ux/feature-toggle");
 const yeoman_ui_types_1 = require("@sap-devx/yeoman-ui-types");
 /**
  * A stateful prompter class that creates configuration questions.
@@ -48,11 +49,20 @@ class ConfigPrompter {
     /**
      * Cached UI flexibility information from the system.
      */
-    flexUISystem;
+    flexUICapability;
     /**
-     * Flag indicating if the project is a cloud project.
+     * The supported project type for the system.
      */
-    isCloudProject;
+    supportedProject;
+    /**
+     * The selected project type by the user. For a mixed system only
+     * the user may select from a cloudReady or an OnPremise project types.
+     */
+    selectedProjectType;
+    /**
+     * The system type for the selected system.
+     */
+    selectedSystemType;
     /**
      * Flag indicating whether the selected application is supported.
      */
@@ -110,12 +120,16 @@ class ConfigPrompter {
         };
     }
     /**
-     * Returns flag indicating if the project is a cloud project.
-     *
-     * @returns Whether system is cloud-ready.
+     * @returns {AdaptationProjectType | undefined} The project type.
      */
-    get isCloud() {
-        return !!this.isCloudProject;
+    get projectType() {
+        return this.selectedProjectType;
+    }
+    /**
+     * @returns {SystemType | undefined} The system type.
+     */
+    get systemType() {
+        return this.selectedSystemType;
     }
     /**
      * Returns the configured abap provider instance.
@@ -185,6 +199,7 @@ class ConfigPrompter {
             [types_1.configPromptNames.username]: this.getUsernamePrompt(promptOptions?.[types_1.configPromptNames.username]),
             [types_1.configPromptNames.password]: this.getPasswordPrompt(promptOptions?.[types_1.configPromptNames.password]),
             [types_1.configPromptNames.storeCredentials]: this.getStoreCredentialsPrompt(promptOptions?.[types_1.configPromptNames.storeCredentials]),
+            [types_1.configPromptNames.projectType]: this.getProjectTypeListPrompt(promptOptions?.[types_1.configPromptNames.projectType]),
             [types_1.configPromptNames.application]: this.getApplicationListPrompt(promptOptions?.[types_1.configPromptNames.application]),
             [types_1.configPromptNames.appValidationCli]: this.getApplicationValidationPromptForCli(),
             [types_1.configPromptNames.fioriId]: this.getFioriIdPrompt(),
@@ -222,7 +237,7 @@ class ConfigPrompter {
             default: '',
             validate: async (value, answers) => await this.validateSystem(value, answers),
             additionalMessages: () => {
-                this.systemAdditionalMessage = (0, additional_messages_1.getSystemAdditionalMessages)(this.flexUISystem, this.isCloud);
+                this.systemAdditionalMessage = (0, additional_messages_1.getSystemAdditionalMessages)(this.flexUICapability, this.selectedProjectType);
                 return this.systemAdditionalMessage;
             }
         };
@@ -289,7 +304,7 @@ class ConfigPrompter {
             when: (answers) => (0, conditions_1.showCredentialQuestion)(answers, this.isAuthRequired),
             additionalMessages: () => {
                 if (!this.systemAdditionalMessage) {
-                    this.systemAdditionalMessage = (0, additional_messages_1.getSystemAdditionalMessages)(this.flexUISystem, this.isCloud);
+                    this.systemAdditionalMessage = (0, additional_messages_1.getSystemAdditionalMessages)(this.flexUICapability, this.selectedProjectType);
                     return this.systemAdditionalMessage;
                 }
                 return undefined;
@@ -323,6 +338,45 @@ class ConfigPrompter {
             }
         };
     }
+    /**
+     * Creates the project type prompt configuration.
+     *
+     * @param {ApplicationPromptOptions | undefined} options - The prompt options.
+     * @returns {ListQuestion<ConfigAnswers>} The project type prompt configuration.
+     */
+    getProjectTypeListPrompt(options) {
+        return {
+            type: 'list',
+            name: types_1.configPromptNames.projectType,
+            message: (0, i18n_1.t)('prompts.projectTypeListLabel'),
+            guiOptions: {
+                mandatory: true,
+                breadcrumb: true,
+                applyDefaultWhenDirty: true
+            },
+            choices: choices_1.getProjectTypeChoices,
+            default: options?.default,
+            // We include the system in the validation to avoid prompt appearance
+            // after pressing start over from the template wizard. This is needed
+            // because the prompter is cached adn we do not want to reset cached data, because
+            // back/forward navigation will be affected if we do so.
+            when: ({ system }) => !!system && this.supportedProject === adp_tooling_1.SupportedProject.CLOUD_READY_AND_ON_PREM,
+            validate: async (projectType) => {
+                this.selectedProjectType = projectType;
+                const isInternalUsage = (0, feature_toggle_1.isInternalFeaturesSettingEnabled)();
+                if (this.selectedProjectType === axios_extension_1.AdaptationProjectType.CLOUD_READY && isInternalUsage) {
+                    return (0, i18n_1.t)('error.cloudSystemsForInternalUsers');
+                }
+                try {
+                    this.targetApps = await (0, adp_tooling_1.loadApps)(this.abapProvider, this.isCustomerBase, this.selectedProjectType);
+                }
+                catch (error) {
+                    return error.message;
+                }
+                return true;
+            }
+        };
+    }
     /**
      * Creates the application list prompt configuration.
      *
@@ -430,7 +484,13 @@ class ConfigPrompter {
             guiOptions: {
                 applyDefaultWhenDirty: true
             },
-            when: (answers) => (0, conditions_1.showExtensionProjectQuestion)(answers, this.flexUISystem, this.isCloudProject, this.isApplicationSupported, this.containsSyncViews),
+            when: (answers) => (0, conditions_1.showExtensionProjectQuestion)({
+                projectType: this.selectedProjectType,
+                isApplicationSelected: !!answers.application,
+                isApplicationSupported: this.isApplicationSupported,
+                hasSyncViews: this.containsSyncViews,
+                flexUICapability: this.flexUICapability
+            }),
             validate: (value) => (0, validators_1.validateExtensibilityExtension)({
                 value,
                 isApplicationSupported: this.isApplicationSupported,
@@ -454,7 +514,7 @@ class ConfigPrompter {
         const validationResult = await this.validateAppData(app);
         const isKnownUnsupported = validationResult === (0, i18n_1.t)('error.appDoesNotSupportManifest') ||
             validationResult === (0, i18n_1.t)('error.appDoesNotSupportFlexibility');
-        if ((0, btp_utils_1.isAppStudio)() && isKnownUnsupported && !this.isCloud) {
+        if ((0, btp_utils_1.isAppStudio)() && isKnownUnsupported && this.selectedProjectType !== axios_extension_1.AdaptationProjectType.CLOUD_READY) {
             this.logger.error(validationResult);
             this.appValidationErrorMessage = validationResult;
             this.isApplicationSupported = false;
@@ -464,7 +524,7 @@ class ConfigPrompter {
         if (typeof validationResult === 'string') {
             return validationResult;
         }
-        if (this.isCloud) {
+        if (this.selectedProjectType === axios_extension_1.AdaptationProjectType.CLOUD_READY) {
             try {
                 this.baseApplicationInbounds = await (0, adp_tooling_1.getBaseAppInbounds)(app.id, this.provider);
             }
@@ -506,7 +566,7 @@ class ConfigPrompter {
                 return validationResult;
             }
             this.telemetryCollector.startTiming('applicationListLoadingTime');
-            this.targetApps = await (0, adp_tooling_1.loadApps)(this.abapProvider, this.isCustomerBase);
+            this.targetApps = await (0, adp_tooling_1.loadApps)(this.abapProvider, this.isCustomerBase, this.selectedProjectType);
             this.telemetryCollector.setBatch({ numberOfApplications: this.targetApps.length });
             this.telemetryCollector.endTiming('applicationListLoadingTime');
             this.isLoginSuccessful = true;
@@ -538,20 +598,23 @@ class ConfigPrompter {
         };
         try {
             this.targetApps = [];
-            this.flexUISystem = undefined;
-            this.isCloudProject = undefined;
+            this.flexUICapability = undefined;
+            this.selectedProjectType = undefined;
+            this.selectedSystemType = undefined;
+            this.supportedProject = undefined;
             this.abapProvider = await (0, adp_tooling_1.getConfiguredProvider)(options, this.logger);
             this.isAuthRequired = await this.systemLookup.getSystemRequiresAuth(system);
-            if (!this.isAuthRequired) {
-                const validationResult = await this.handleSystemDataValidation();
-                if (typeof validationResult === 'string') {
-                    return validationResult;
-                }
-                this.telemetryCollector.startTiming('applicationListLoadingTime');
-                this.targetApps = await (0, adp_tooling_1.loadApps)(this.abapProvider, this.isCustomerBase);
-                this.telemetryCollector.setBatch({ numberOfApplications: this.targetApps.length });
-                this.telemetryCollector.endTiming('applicationListLoadingTime');
+            if (this.isAuthRequired) {
+                return true;
             }
+            const validationResult = await this.handleSystemDataValidation();
+            if (typeof validationResult === 'string') {
+                return validationResult;
+            }
+            this.telemetryCollector.startTiming('applicationListLoadingTime');
+            this.targetApps = await (0, adp_tooling_1.loadApps)(this.abapProvider, this.isCustomerBase, this.selectedProjectType);
+            this.telemetryCollector.setBatch({ numberOfApplications: this.targetApps.length });
+            this.telemetryCollector.endTiming('applicationListLoadingTime');
             return true;
         }
         catch (e) {
@@ -592,17 +655,31 @@ class ConfigPrompter {
         this.setSupportFlags(application, isFullSupport, isPartialSupport);
     }
     /**
-     * Fetches system data including cloud project and UI flexibility information.
+     * Fetches the system type, supported project type and the UI flexibility information.
      *
      * @returns A promise that resolves when system data is fetched.
      */
     async loadSystemData() {
         try {
-            this.isCloudProject = await this.abapProvider.isAbapCloud();
-            this.flexUISystem = await (0, adp_tooling_1.getFlexUISupportedSystem)(this.abapProvider, this.isCustomerBase);
+            // Do not include the ato settings retreival in the parallel calls because we need to first login
+            // before executing any other call. A provider works like this - with the first api call it authenticates the user.
+            this.selectedSystemType = (await this.provider.isAbapCloud()) ? types_1.SystemType.CLOUD_READY : types_1.SystemType.ON_PREM;
+            const [supportedProject, flexUICapability] = await Promise.all([
+                (0, adp_tooling_1.getSupportedProject)(this.abapProvider),
+                (0, adp_tooling_1.getFlexUICapability)(this.abapProvider, this.isCustomerBase)
+            ]);
+            this.supportedProject = supportedProject;
+            this.flexUICapability = flexUICapability;
+            // Set selected project type based on the supported project.
+            if (this.supportedProject === adp_tooling_1.SupportedProject.CLOUD_READY) {
+                this.selectedProjectType = axios_extension_1.AdaptationProjectType.CLOUD_READY;
+            }
+            else if (this.supportedProject === adp_tooling_1.SupportedProject.ON_PREM) {
+                this.selectedProjectType = axios_extension_1.AdaptationProjectType.ON_PREMISE;
+            }
         }
-        catch (e) {
-            this.handleSystemError(e);
+        catch (error) {
+            this.handleSystemError(error);
         }
     }
     /**
@@ -631,7 +708,7 @@ class ConfigPrompter {
         try {
             await this.loadSystemData();
             await this.loadUI5Versions();
-            if (!this.isCustomerBase && this.isCloudProject) {
+            if (!this.isCustomerBase && this.selectedProjectType === axios_extension_1.AdaptationProjectType.CLOUD_READY) {
                 return (0, i18n_1.t)('error.cloudSystemsForInternalUsers');
             }
             return true;
@@ -654,9 +731,10 @@ class ConfigPrompter {
             }
             if (error.response?.status === 405 || error.response?.status === 404) {
                 // Handle the case where the API is not available and continue to standard onPremise flow
-                this.isCloudProject = false;
+                this.selectedProjectType = axios_extension_1.AdaptationProjectType.ON_PREMISE;
                 return;
             }
+            throw error;
         }
     }
     /**

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

@@ -1,5 +1,6 @@
 import type { IMessageSeverity } from '@sap-devx/yeoman-ui-types';
-import type { FlexUISupportedSystem, SourceApplication } from '@sap-ux/adp-tooling';
+import { AdaptationProjectType } from '@sap-ux/axios-extension';
+import type { FlexUICapability, SourceApplication } from '@sap-ux/adp-tooling';
 interface SupportFlags {
     hasSyncViews: boolean;
     isV4AppInternalMode: boolean;
@@ -9,12 +10,12 @@ interface SupportFlags {
 /**
  * Evaluates a system's deployment and flexibility capabilities to generate relevant messages based on the system's characteristics.
  *
- * @param {FlexUISupportedSystem | undefined} flexUISystem - An optional object containing flags indicating if the system
+ * @param {FlexUICapability | undefined} flexUICapability - An optional object containing flags indicating if the system
  *                                                           is on-premise and whether UI Flex is enabled.
- * @param {boolean} isCloudProject - Whether the project is for a cloud-based system.
+ * @param {AdaptationProjectType|undefined} projectType - The project type.
  * @returns {IMessageSeverity | undefined} An object containing a message and its severity level.
  */
-export declare const getSystemAdditionalMessages: (flexUISystem: FlexUISupportedSystem | undefined, isCloudProject: boolean) => IMessageSeverity | undefined;
+export declare const getSystemAdditionalMessages: (flexUICapability?: FlexUICapability, projectType?: AdaptationProjectType) => IMessageSeverity | undefined;
 /**
  * Provides an additional contextual message for the selected application, based on its compatibility,
  * feature support, or sync-loading behavior.

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

@@ -7,47 +7,42 @@ const i18n_1 = require("../../../utils/i18n");
 /**
  * Evaluates a system's deployment and flexibility capabilities to generate relevant messages based on the system's characteristics.
  *
- * @param {FlexUISupportedSystem | undefined} flexUISystem - An optional object containing flags indicating if the system
+ * @param {FlexUICapability | undefined} flexUICapability - An optional object containing flags indicating if the system
  *                                                           is on-premise and whether UI Flex is enabled.
- * @param {boolean} isCloudProject - Whether the project is for a cloud-based system.
+ * @param {AdaptationProjectType|undefined} projectType - The project type.
  * @returns {IMessageSeverity | undefined} An object containing a message and its severity level.
  */
-const getSystemAdditionalMessages = (flexUISystem, isCloudProject) => {
-    const isOnPremise = flexUISystem?.isOnPremise;
-    const isUIFlex = flexUISystem?.isUIFlex;
-    if (isCloudProject) {
+const getSystemAdditionalMessages = (flexUICapability, projectType) => {
+    if (!flexUICapability || !projectType) {
+        return undefined;
+    }
+    if (projectType === axios_extension_1.AdaptationProjectType.CLOUD_READY) {
         return {
             message: `${(0, i18n_1.t)('prompts.projectTypeLabel')}: ${axios_extension_1.AdaptationProjectType.CLOUD_READY}`,
             severity: yeoman_ui_types_1.Severity.information
         };
     }
-    if (!flexUISystem) {
-        return undefined;
-    }
-    if (!isOnPremise) {
-        if (!isUIFlex) {
-            return {
-                message: (0, i18n_1.t)('error.notDeployableNotFlexEnabledSystemError'),
-                severity: yeoman_ui_types_1.Severity.warning
-            };
-        }
-        else {
-            return {
+    const { isDtaFolderDeploymentSupported, isUIFlexSupported } = flexUICapability;
+    if (isUIFlexSupported) {
+        return isDtaFolderDeploymentSupported
+            ? {
+                message: `${(0, i18n_1.t)('prompts.projectTypeLabel')}: ${axios_extension_1.AdaptationProjectType.ON_PREMISE}`,
+                severity: yeoman_ui_types_1.Severity.information
+            }
+            : {
                 message: (0, i18n_1.t)('error.notDeployableSystemError'),
                 severity: yeoman_ui_types_1.Severity.error
             };
-        }
     }
-    if (isOnPremise && !isUIFlex) {
-        return {
+    return isDtaFolderDeploymentSupported
+        ? {
             message: (0, i18n_1.t)('error.notFlexEnabledError'),
             severity: yeoman_ui_types_1.Severity.warning
+        }
+        : {
+            message: (0, i18n_1.t)('error.notDeployableNotFlexEnabledSystemError'),
+            severity: yeoman_ui_types_1.Severity.warning
         };
-    }
-    return {
-        message: `${(0, i18n_1.t)('prompts.projectTypeLabel')}: ${axios_extension_1.AdaptationProjectType.ON_PREMISE}`,
-        severity: yeoman_ui_types_1.Severity.information
-    };
 };
 exports.getSystemAdditionalMessages = getSystemAdditionalMessages;
 /**

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

@@ -1,5 +1,6 @@
 import { AppRouterType } from '@sap-ux/adp-tooling';
 import type { CFApp, Endpoint, SourceApplication } from '@sap-ux/adp-tooling';
+import { AdaptationProjectType } from '@sap-ux/axios-extension';
 import type { AdaptationDescriptor } from '@sap-ux/axios-extension';
 interface Choice {
     name: string;
@@ -33,6 +34,15 @@ export declare const getAppRouterChoices: (isInternalUsage: boolean) => {
     name: AppRouterType;
     value: AppRouterType;
 }[];
+/**
+ * Creates the list of choices for the project type prompt.
+ *
+ * @returns {{ name: string; value: AdaptationProjectType }[]} The localized project type choices.
+ */
+export declare const getProjectTypeChoices: () => {
+    name: string;
+    value: AdaptationProjectType;
+}[];
 /**
  * Returns the choices for the adaptation prompt.
  *

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

@@ -1,7 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getKeyUserSystemChoices = exports.getAdaptationChoices = exports.getAppRouterChoices = exports.getCFAppChoices = exports.getApplicationChoices = void 0;
+exports.getKeyUserSystemChoices = exports.getAdaptationChoices = exports.getProjectTypeChoices = exports.getAppRouterChoices = exports.getCFAppChoices = exports.getApplicationChoices = void 0;
 const adp_tooling_1 = require("@sap-ux/adp-tooling");
+const axios_extension_1 = require("@sap-ux/axios-extension");
+const i18n_1 = require("../../../utils/i18n");
 /**
  * Creates a list of choices from a list of applications, formatted for display or selection in a UI.
  * Each choice consists of an application's title (or ID if no title), followed by its registration IDs and ACH, formatted for easy reading.
@@ -58,6 +60,16 @@ const getAppRouterChoices = (isInternalUsage) => {
     return options;
 };
 exports.getAppRouterChoices = getAppRouterChoices;
+/**
+ * Creates the list of choices for the project type prompt.
+ *
+ * @returns {{ name: string; value: AdaptationProjectType }[]} The localized project type choices.
+ */
+const getProjectTypeChoices = () => [
+    { name: (0, i18n_1.t)('prompts.projectTypeCloudReadyName'), value: axios_extension_1.AdaptationProjectType.CLOUD_READY },
+    { name: (0, i18n_1.t)('prompts.projectTypeOnPremName'), value: axios_extension_1.AdaptationProjectType.ON_PREMISE }
+];
+exports.getProjectTypeChoices = getProjectTypeChoices;
 /**
  * Returns the choices for the adaptation prompt.
  *

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

@@ -1,4 +1,5 @@
-import type { ConfigAnswers, FlexUISupportedSystem, CfServicesAnswers, CFApp } from '@sap-ux/adp-tooling';
+import type { ConfigAnswers, FlexUICapability, CfServicesAnswers, CFApp } from '@sap-ux/adp-tooling';
+import { AdaptationProjectType } from '@sap-ux/axios-extension';
 /**
  * Determines if a credential question should be shown.
  * In this simplified approach, we show credentials if a system is provided and the login was not successful.
@@ -21,14 +22,21 @@ export declare function showApplicationQuestion(answers: ConfigAnswers, appsLoad
 /**
  * Determines if an extension project is allowed based on the system and application conditions.
  *
- * @param {ConfigAnswers} answers - The user-provided answers containing application details.
- * @param {FlexUISupportedSystem} flexUISystem - The system type info (e.g., onPremise/UIFlex).
- * @param {boolean} isCloudProject - Whether the system is a cloud-based system.
- * @param {boolean} isApplicationSupported - Whether the selected application is supported.
- * @param {boolean} hasSyncViews - Whether synchronized views exist for the app.
- * @returns {boolean | undefined} True if an extension project is allowed, otherwise false or undefined.
+ * @param params - Function parameters as an object literal.
+ * @param {boolean} params.isApplicationSelected - True if the user has selected an application.
+ * @param {boolean} params.isApplicationSupported - Whether the selected application is supported.
+ * @param {boolean} params.hasSyncViews - Whether synchronized views exist for the app.
+ * @param {AdaptationProjectType|undefined} params.projectType - The project type.
+ * @param {FlexUICapability | undefined} params.flexUICapability - The system type info (e.g., onPremise/UIFlex).
+ * @returns {boolean} True if an extension project is allowed, otherwise false or undefined.
  */
-export declare function showExtensionProjectQuestion(answers: ConfigAnswers, flexUISystem: FlexUISupportedSystem | undefined, isCloudProject: boolean | undefined, isApplicationSupported: boolean, hasSyncViews: boolean): boolean;
+export declare function showExtensionProjectQuestion({ isApplicationSelected, isApplicationSupported, hasSyncViews, projectType, flexUICapability }: {
+    isApplicationSelected: boolean;
+    isApplicationSupported: boolean;
+    hasSyncViews: boolean;
+    projectType?: AdaptationProjectType;
+    flexUICapability?: FlexUICapability;
+}): boolean;
 /**
  * Determines if an internal question for ACH and FioriId will be shown based on the answers and specific conditions.
  *

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

@@ -9,6 +9,7 @@ exports.shouldShowBaseAppPrompt = shouldShowBaseAppPrompt;
 exports.showStoreCredentialsQuestion = showStoreCredentialsQuestion;
 const btp_utils_1 = require("@sap-ux/btp-utils");
 const adp_tooling_1 = require("@sap-ux/adp-tooling");
+const axios_extension_1 = require("@sap-ux/axios-extension");
 /**
  * Determines if a credential question should be shown.
  * In this simplified approach, we show credentials if a system is provided and the login was not successful.
@@ -35,23 +36,21 @@ function showApplicationQuestion(answers, appsLoaded, isAuthRequired, isLoginSuc
 /**
  * Determines if an extension project is allowed based on the system and application conditions.
  *
- * @param {ConfigAnswers} answers - The user-provided answers containing application details.
- * @param {FlexUISupportedSystem} flexUISystem - The system type info (e.g., onPremise/UIFlex).
- * @param {boolean} isCloudProject - Whether the system is a cloud-based system.
- * @param {boolean} isApplicationSupported - Whether the selected application is supported.
- * @param {boolean} hasSyncViews - Whether synchronized views exist for the app.
- * @returns {boolean | undefined} True if an extension project is allowed, otherwise false or undefined.
+ * @param params - Function parameters as an object literal.
+ * @param {boolean} params.isApplicationSelected - True if the user has selected an application.
+ * @param {boolean} params.isApplicationSupported - Whether the selected application is supported.
+ * @param {boolean} params.hasSyncViews - Whether synchronized views exist for the app.
+ * @param {AdaptationProjectType|undefined} params.projectType - The project type.
+ * @param {FlexUICapability | undefined} params.flexUICapability - The system type info (e.g., onPremise/UIFlex).
+ * @returns {boolean} True if an extension project is allowed, otherwise false or undefined.
  */
-function showExtensionProjectQuestion(answers, flexUISystem, isCloudProject, isApplicationSupported, hasSyncViews) {
-    if (!answers.application) {
-        return false;
-    }
-    if (isCloudProject) {
+function showExtensionProjectQuestion({ isApplicationSelected, isApplicationSupported, hasSyncViews, projectType, flexUICapability }) {
+    if (!isApplicationSelected || projectType === axios_extension_1.AdaptationProjectType.CLOUD_READY) {
         return false;
     }
-    const isOnPremiseAppStudio = !!flexUISystem?.isOnPremise && (0, btp_utils_1.isAppStudio)();
-    const nonFlexOrNonOnPremise = flexUISystem && (!flexUISystem?.isOnPremise || !flexUISystem?.isUIFlex);
-    return (isOnPremiseAppStudio &&
+    const isDtaDeploymentSupportedAppStudio = !!flexUICapability?.isDtaFolderDeploymentSupported && (0, btp_utils_1.isAppStudio)();
+    const nonFlexOrNonOnPremise = flexUICapability && (!flexUICapability?.isDtaFolderDeploymentSupported || !flexUICapability?.isUIFlexSupported);
+    return (isDtaDeploymentSupportedAppStudio &&
         (!isApplicationSupported || (isApplicationSupported && (nonFlexOrNonOnPremise || hasSyncViews))));
 }
 /**

package/generators/app/types.d.ts

@@ -1,9 +1,9 @@
 import type Generator from 'yeoman-generator';
-import type { AppWizard } from '@sap-devx/yeoman-ui-types';
+import type { AppWizard, Prompts as YeomanUiSteps } from '@sap-devx/yeoman-ui-types';
 import type { YUIQuestion } from '@sap-ux/inquirer-common';
 import type { TelemetryData } from '@sap-ux/fiori-generator-shared';
-import type { AdaptationDescriptor } from '@sap-ux/axios-extension';
-import type { AttributesAnswers, ConfigAnswers } from '@sap-ux/adp-tooling';
+import type { AdaptationDescriptor, AdaptationProjectType } from '@sap-ux/axios-extension';
+import type { AttributesAnswers, ConfigAnswers, FlexLayer } from '@sap-ux/adp-tooling';
 export interface AdpGeneratorOptions extends Generator.GeneratorOptions {
     /**
      * VSCode instance
@@ -35,6 +35,7 @@ export declare enum configPromptNames {
     username = "username",
     password = "password",
     storeCredentials = "storeCredentials",
+    projectType = "projectType",
     application = "application",
     appValidationCli = "appValidationCli",
     fioriId = "fioriId",
@@ -64,6 +65,10 @@ export interface PasswordPromptOptions {
 export interface StoreCredentialsPromptOptions {
     hide?: boolean;
 }
+export interface ProjectTypePromptOptions {
+    default?: string;
+    hide?: boolean;
+}
 export interface ApplicationPromptOptions {
     default?: string;
     hide?: boolean;
@@ -87,6 +92,7 @@ export type ConfigPromptOptions = Partial<{
     [configPromptNames.username]: UsernamePromptOptions;
     [configPromptNames.password]: PasswordPromptOptions;
     [configPromptNames.storeCredentials]: StoreCredentialsPromptOptions;
+    [configPromptNames.projectType]: ProjectTypePromptOptions;
     [configPromptNames.application]: ApplicationPromptOptions;
     [configPromptNames.appValidationCli]: CliValidationPromptOptions;
     [configPromptNames.fioriId]: FioriIdPromptOptions;
@@ -249,5 +255,19 @@ export interface JsonInput {
     targetFolder?: string;
     projectName?: string;
     namespace?: string;
+    projectType?: AdaptationProjectType;
+}
+export declare enum SystemType {
+    CLOUD_READY = "cloudReady",
+    ON_PREM = "onPremise"
+}
+export interface OptionalPromptsConfig {
+    projectType?: AdaptationProjectType;
+    systemType?: SystemType;
+    layer: FlexLayer;
+    ui5Versions: string[];
+    isVersionDetected: boolean;
+    prompts: YeomanUiSteps;
+    isCfEnv?: boolean;
 }
 //# sourceMappingURL=types.d.ts.map

package/generators/app/types.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.cfLoginPromptNames = exports.TargetEnv = exports.targetEnvPromptNames = exports.keyUserPromptNames = exports.attributePromptNames = exports.configPromptNames = void 0;
+exports.SystemType = exports.cfLoginPromptNames = exports.TargetEnv = exports.targetEnvPromptNames = exports.keyUserPromptNames = exports.attributePromptNames = exports.configPromptNames = void 0;
 /**
  * Enumeration of prompt names used in the configuration.
  */
@@ -11,6 +11,7 @@ var configPromptNames;
     configPromptNames["username"] = "username";
     configPromptNames["password"] = "password";
     configPromptNames["storeCredentials"] = "storeCredentials";
+    configPromptNames["projectType"] = "projectType";
     configPromptNames["application"] = "application";
     configPromptNames["appValidationCli"] = "appValidationCli";
     configPromptNames["fioriId"] = "fioriId";
@@ -55,4 +56,9 @@ var cfLoginPromptNames;
     cfLoginPromptNames["cfExternalLogin"] = "cfExternalLogin";
     cfLoginPromptNames["cfExternalLoginSuccessMessage"] = "cfExternalLoginSuccessMessage";
 })(cfLoginPromptNames || (exports.cfLoginPromptNames = cfLoginPromptNames = {}));
+var SystemType;
+(function (SystemType) {
+    SystemType["CLOUD_READY"] = "cloudReady";
+    SystemType["ON_PREM"] = "onPremise";
+})(SystemType || (exports.SystemType = SystemType = {}));
 //# sourceMappingURL=types.js.map

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

@@ -42,6 +42,9 @@
         "projectTypeLabel": "Project Type",
         "projectNameLabel": "Project Name",
         "projectNameTooltip": "Enter the project name for your application variant.",
+        "projectTypeListLabel": "Select Project Type",
+        "projectTypeCloudReadyName": "Cloud Ready",
+        "projectTypeOnPremName": "onPremise",
         "appTitleLabel": "Application Title",
         "appTitleTooltip": "Enter the application title for your application variant.",
         "appTitleDefault": "App Variant Title",

package/generators/utils/subgenHelpers.d.ts

@@ -3,6 +3,7 @@ import type { AppWizard, Prompts } from '@sap-devx/yeoman-ui-types';
 import type { ToolsLogger } from '@sap-ux/logger';
 import type { ManifestNamespace } from '@sap-ux/project-access';
 import type { ConfigAnswers, AttributesAnswers, SystemLookup, FlexLayer, Endpoint } from '@sap-ux/adp-tooling';
+import { AdaptationProjectType } from '@sap-ux/axios-extension';
 /**
  * Parameters required for composing the extension project generator.
  */
@@ -29,6 +30,7 @@ interface DeployGenOptions {
     projectPath: string;
     connectedSystem: string;
     system?: Endpoint;
+    projectType?: AdaptationProjectType;
 }
 /**
  * Composes the FLP config sub-generator using `composeWith`. This generator is used to scaffold
@@ -55,7 +57,7 @@ export declare function addFlpGen({ projectRootPath, vscode, inbounds, layer, pr
  * @param {ToolsLogger} logger - Logger for info and error output
  * @param {AppWizard} appWizard - Optional AppWizard instance for displaying UI messages
  */
-export declare function addDeployGen({ projectName, projectPath, connectedSystem, system }: DeployGenOptions, composeWith: Generator['composeWith'], logger: ToolsLogger, appWizard: AppWizard): Promise<void>;
+export declare function addDeployGen({ projectName, projectPath, connectedSystem, system, projectType }: DeployGenOptions, composeWith: Generator['composeWith'], logger: ToolsLogger, appWizard: AppWizard): Promise<void>;
 /**
  * Composes the extension project sub-generator if the base app is unsupported.
  *

package/generators/utils/subgenHelpers.js

@@ -5,6 +5,7 @@ exports.addDeployGen = addDeployGen;
 exports.addExtProjectGen = addExtProjectGen;
 const i18n_1 = require("./i18n");
 const extension_project_1 = require("../app/extension-project");
+const axios_extension_1 = require("@sap-ux/axios-extension");
 /**
  * Static validation configuration for package prompts in ADP deployment.
  */
@@ -58,11 +59,12 @@ async function addFlpGen({ projectRootPath, vscode, inbounds, layer, prompts },
  * @param {ToolsLogger} logger - Logger for info and error output
  * @param {AppWizard} appWizard - Optional AppWizard instance for displaying UI messages
  */
-async function addDeployGen({ projectName, projectPath, connectedSystem, system }, composeWith, logger, appWizard) {
+async function addDeployGen({ projectName, projectPath, connectedSystem, system, projectType }, composeWith, logger, appWizard) {
     try {
+        const hideIfOnPremise = projectType === axios_extension_1.AdaptationProjectType.ON_PREMISE;
         const subGenPromptOptions = {
-            ui5AbapRepo: { hideIfOnPremise: true },
-            transportInputChoice: { hideIfOnPremise: true },
+            ui5AbapRepo: { hideIfOnPremise },
+            transportInputChoice: { hideIfOnPremise },
             overwriteAbapConfig: { hide: true },
             packageAutocomplete: {
                 additionalValidation: PACKAGE_ADDITIONAL_VALIDATION
@@ -70,12 +72,13 @@ async function addDeployGen({ projectName, projectPath, connectedSystem, system
             packageManual: {
                 additionalValidation: PACKAGE_ADDITIONAL_VALIDATION
             },
-            targetSystem: { additionalValidation: { shouldRestrictDifferentSystemType: true } }
+            adpProjectType: projectType
         };
         const generatorOptions = {
             launchDeployConfigAsSubGenerator: true,
             projectName,
             projectPath,
+            adpProjectType: projectType,
             telemetryData: { appType: 'Fiori Adaptation' },
             appWizard,
             logWrapper: logger,

package/package.json

@@ -3,7 +3,7 @@
   "displayName": "SAPUI5 Adaptation Project",
   "homepage": "https://help.sap.com/viewer/584e0bcbfd4a4aff91c815cefa0bce2d/Cloud/en-US/ada9567b767941aba8d49fdb4fdedea7.html",
   "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.8.18",
+  "version": "0.9.1",
   "repository": {
     "type": "git",
     "url": "https://github.com/SAP/open-ux-tools.git",
@@ -30,19 +30,19 @@
     "i18next": "25.8.0",
     "yeoman-generator": "5.10.0",
     "uuid": "10.0.0",
-    "@sap-ux/adp-tooling": "0.18.63",
-    "@sap-ux/axios-extension": "1.25.11",
-    "@sap-ux/btp-utils": "1.1.8",
+    "@sap-ux/adp-tooling": "0.18.65",
+    "@sap-ux/axios-extension": "1.25.13",
+    "@sap-ux/btp-utils": "1.1.9",
     "@sap-ux/feature-toggle": "0.3.6",
-    "@sap-ux/inquirer-common": "0.11.5",
+    "@sap-ux/inquirer-common": "0.11.7",
     "@sap-ux/logger": "0.8.1",
-    "@sap-ux/project-access": "1.35.3",
+    "@sap-ux/project-access": "1.35.4",
     "@sap-ux/store": "1.5.6",
-    "@sap-ux/system-access": "0.6.51",
-    "@sap-ux/project-input-validator": "0.6.55",
-    "@sap-ux/fiori-generator-shared": "0.13.71",
-    "@sap-ux/odata-service-writer": "0.29.18",
-    "@sap-ux/telemetry": "0.6.72"
+    "@sap-ux/system-access": "0.6.53",
+    "@sap-ux/project-input-validator": "0.6.56",
+    "@sap-ux/fiori-generator-shared": "0.13.73",
+    "@sap-ux/odata-service-writer": "0.29.19",
+    "@sap-ux/telemetry": "0.6.74"
   },
   "devDependencies": {
     "@jest/types": "30.0.1",
@@ -57,7 +57,7 @@
     "fs-extra": "10.0.0",
     "rimraf": "6.1.2",
     "yeoman-test": "6.3.0",
-    "@sap-ux/deploy-config-sub-generator": "0.5.78"
+    "@sap-ux/deploy-config-sub-generator": "0.5.80"
   },
   "engines": {
     "node": ">=20.x"