@sap-ux/abap-deploy-config-sub-generator 0.1.148 → 0.2.2

package/generators/app/index.d.ts

@@ -15,6 +15,7 @@ export default class extends DeploymentGenerator {
     private configExists;
     private answers;
     private projectType;
+    private adpProjectType?;
     private isAdp;
     /**
      * Constructor for the ABAP deploy config generator.

package/generators/app/index.js

@@ -18,6 +18,8 @@ const feature_toggle_1 = require("@sap-ux/feature-toggle");
 const btp_utils_1 = require("@sap-ux/btp-utils");
 const constants_1 = require("@sap-ux/abap-deploy-config-inquirer/dist/constants");
 const project_1 = require("../utils/project");
+const adp_tooling_1 = require("@sap-ux/adp-tooling");
+const axios_extension_1 = require("@sap-ux/axios-extension");
 /**
  * ABAP deploy config generator.
  */
@@ -32,6 +34,7 @@ class default_1 extends deploy_config_generator_shared_1.DeploymentGenerator {
     configExists;
     answers;
     projectType;
+    adpProjectType;
     isAdp;
     /**
      * Constructor for the ABAP deploy config generator.
@@ -43,6 +46,7 @@ class default_1 extends deploy_config_generator_shared_1.DeploymentGenerator {
         super(args, opts);
         this.launchDeployConfigAsSubGenerator = opts.launchDeployConfigAsSubGenerator ?? false;
         this.launchStandaloneFromYui = opts.launchStandaloneFromYui;
+        this.adpProjectType = opts.adpProjectType;
         this.appWizard = opts.appWizard || yeoman_ui_types_1.AppWizard.create(opts);
         this.vscode = opts.vscode;
         this.options = opts;
@@ -62,6 +66,11 @@ class default_1 extends deploy_config_generator_shared_1.DeploymentGenerator {
         (0, fiori_generator_shared_1.setYeomanEnvConflicterForce)(this.env, this.options.force);
         if (!this.launchDeployConfigAsSubGenerator) {
             await this._initializing();
+            // NOTE: This _initializing() method is called here when the generator is started as standalone generator.
+            // In the writing phase the same method is called when the generator is started as a sub-generator.
+            // This casues the adpProjectType field to be overriden with undefined in case the generator is started as
+            // sub-generator, that's why we leave the initialization out of the _initializing() method.
+            this.adpProjectType = await (0, adp_tooling_1.getExistingAdpProjectType)(this.destinationRoot());
         }
     }
     _initDestinationRoot() {
@@ -138,16 +147,17 @@ class default_1 extends deploy_config_generator_shared_1.DeploymentGenerator {
                 shouldValidatePackageType: this.isAdp,
                 shouldValidateFormatAndSpecialCharacters: this.isAdp
             };
+            const hideIfOnPremise = this.adpProjectType === axios_extension_1.AdaptationProjectType.ON_PREMISE;
             const promptOptions = {
-                ui5AbapRepo: { hideIfOnPremise: this.isAdp },
-                transportInputChoice: { hideIfOnPremise: this.isAdp },
+                ui5AbapRepo: { hideIfOnPremise },
+                transportInputChoice: { hideIfOnPremise },
                 packageAutocomplete: {
                     additionalValidation: packageAdditionalValidation
                 },
                 packageManual: {
                     additionalValidation: packageAdditionalValidation
                 },
-                targetSystem: { additionalValidation: { shouldRestrictDifferentSystemType: this.isAdp } }
+                adpProjectType: this.adpProjectType
             };
             const indexGenerationAllowed = this.indexGenerationAllowed && !this.isAdp;
             const { prompts: abapDeployConfigPrompts, answers: abapAnswers = {} } = await (0, questions_1.getAbapQuestions)({
@@ -235,7 +245,8 @@ class default_1 extends deploy_config_generator_shared_1.DeploymentGenerator {
         if (this.abort || this.answers.overwrite === false) {
             return;
         }
-        const namespace = await (0, project_1.getVariantNamespace)(this.destinationPath(), !!this.answers.isAbapCloud, this.fs);
+        const isCloudAdpProject = this.adpProjectType === axios_extension_1.AdaptationProjectType.CLOUD_READY;
+        const namespace = await (0, project_1.getVariantNamespace)(this.destinationPath(), isCloudAdpProject, this.fs);
         await (0, abap_deploy_config_writer_1.generate)(this.destinationPath(), {
             target: {
                 url: this.answers.url,

package/generators/app/questions.js

@@ -90,6 +90,7 @@ async function getAbapQuestions({ appRootPath, connectedSystem, backendConfig, c
             serviceProvider,
             type: projectType
         },
+        adpProjectType: promptOptions.adpProjectType,
         ui5AbapRepo: {
             default: deployAppConfig?.name,
             ...promptOptions?.ui5AbapRepo
@@ -106,8 +107,7 @@ async function getAbapQuestions({ appRootPath, connectedSystem, backendConfig, c
             ...promptOptions?.packageAutocomplete
         },
         overwriteAbapConfig: { hide: !showOverwriteQuestion },
-        transportInputChoice: { hideIfOnPremise: promptOptions?.transportInputChoice?.hideIfOnPremise ?? false },
-        targetSystem: promptOptions?.targetSystem
+        transportInputChoice: { hideIfOnPremise: promptOptions?.transportInputChoice?.hideIfOnPremise ?? false }
     }, logger, (0, fiori_generator_shared_1.getHostEnvironment)() !== fiori_generator_shared_1.hostEnvironment.cli);
 }
 //# sourceMappingURL=questions.js.map

package/generators/app/types.d.ts

@@ -2,6 +2,7 @@ import type { AbapDeployConfigAnswersInternal, AbapDeployConfigPromptOptions } f
 import type { AppWizard } from '@sap-devx/yeoman-ui-types';
 import type { ConnectedSystem } from '@sap-ux/deploy-config-generator-shared';
 import type { TelemetryData } from '@sap-ux/fiori-generator-shared';
+import type { AdaptationProjectType } from '@sap-ux/axios-extension';
 export interface AbapDeployConfigOptions extends AbapDeployConfigAnswersInternal {
     /**
      * VSCode instance
@@ -51,6 +52,10 @@ export interface AbapDeployConfigOptions extends AbapDeployConfigAnswersInternal
      * Prompts options for the ABAP deploy config inquirer
      */
     promptOptions?: AbapDeployConfigPromptOptions;
+    /**
+     * The type of the adaptation project.
+     */
+    adpProjectType?: AdaptationProjectType;
 }
 export declare enum DeployProjectType {
     Application = "application",

package/package.json

@@ -6,7 +6,7 @@
     "url": "https://github.com/SAP/open-ux-tools.git",
     "directory": "packages/abap-deploy-config-sub-generator"
   },
-  "version": "0.1.148",
+  "version": "0.2.2",
   "license": "Apache-2.0",
   "main": "generators/app/index.js",
   "files": [
@@ -21,15 +21,17 @@
   "dependencies": {
     "i18next": "25.8.0",
     "@sap-devx/yeoman-ui-types": "1.14.4",
-    "@sap-ux/abap-deploy-config-inquirer": "1.6.99",
-    "@sap-ux/abap-deploy-config-writer": "0.2.72",
-    "@sap-ux/btp-utils": "1.1.8",
-    "@sap-ux/deploy-config-generator-shared": "0.1.90",
+    "@sap-ux/abap-deploy-config-inquirer": "1.7.2",
+    "@sap-ux/abap-deploy-config-writer": "0.2.75",
+    "@sap-ux/btp-utils": "1.1.9",
+    "@sap-ux/deploy-config-generator-shared": "0.1.93",
     "@sap-ux/feature-toggle": "0.3.6",
-    "@sap-ux/fiori-generator-shared": "0.13.71",
+    "@sap-ux/fiori-generator-shared": "0.13.74",
     "@sap-ux/logger": "0.8.1",
-    "@sap-ux/project-access": "1.35.3",
-    "@sap-ux/ui5-config": "0.29.16"
+    "@sap-ux/project-access": "1.35.5",
+    "@sap-ux/ui5-config": "0.29.17",
+    "@sap-ux/adp-tooling": "0.18.66",
+    "@sap-ux/axios-extension": "1.25.14"
   },
   "devDependencies": {
     "@types/mem-fs": "1.1.2",
@@ -40,8 +42,8 @@
     "unionfs": "4.4.0",
     "yeoman-test": "6.3.0",
     "@sap-ux/store": "1.5.6",
-    "@sap-ux/system-access": "0.6.51",
-    "@sap-ux/telemetry": "0.6.72"
+    "@sap-ux/system-access": "0.6.54",
+    "@sap-ux/telemetry": "0.6.75"
   },
   "scripts": {
     "build": "tsc --build",