@sap-ux/deploy-config-sub-generator 0.3.6 → 0.3.8

package/generators/app/index.js

@@ -118,7 +118,7 @@ class default_1 extends deploy_config_generator_shared_1.DeploymentGenerator {
                 (0, deploy_config_generator_shared_1.bail)(deploy_config_generator_shared_1.ErrorHandler.unrecognizedTarget(this.target));
             }
         }
-        else {
+        if (!this.target || this.launchDeployConfigAsSubGenerator) {
             // if there is no specified target then prompting will occur
             const { target, answers } = await (0, prompting_1.promptDeployConfigQuestions)(this.fs, this.options, this.prompt.bind(this), {
                 launchDeployConfigAsSubGenerator: this.launchDeployConfigAsSubGenerator,
@@ -130,7 +130,7 @@ class default_1 extends deploy_config_generator_shared_1.DeploymentGenerator {
                 isCap: this.isCap,
                 apiHubConfig: this.apiHubConfig,
                 isLibrary: this.isLibrary
-            });
+            }, this.target);
             this.target = target;
             this.answers = answers;
         }

package/generators/app/prompting.d.ts

@@ -21,6 +21,7 @@ import type { GeneratorOptions } from 'yeoman-generator';
  * @param promptOpts.isCap - whether the project is a CAP project
  * @param promptOpts.apiHubConfig - API Hub configuration
  * @param promptOpts.isLibrary - whether the project is a library
+ * @param targetDeployment - target deployment
  * @returns - target deployment CF | ABAP and answers
  */
 export declare function promptDeployConfigQuestions(fs: Editor, options: DeployConfigOptions, prompt: GeneratorOptions['prompt'], { launchDeployConfigAsSubGenerator, launchStandaloneFromYui, extensionPromptOpts, supportedTargets, backendConfig, cfDestination, isCap, apiHubConfig, isLibrary }: {
@@ -33,7 +34,7 @@ export declare function promptDeployConfigQuestions(fs: Editor, options: DeployC
     isCap: boolean;
     apiHubConfig: ApiHubConfig;
     isLibrary: boolean;
-}): Promise<{
+}, targetDeployment?: string): Promise<{
     target?: string;
     answers?: AbapDeployConfigAnswersInternal | CfDeployConfigAnswers;
 }>;

package/generators/app/prompting.js

@@ -18,9 +18,10 @@ const prompts_1 = require("../prompts");
  * @param promptOpts.isCap - whether the project is a CAP project
  * @param promptOpts.apiHubConfig - API Hub configuration
  * @param promptOpts.isLibrary - whether the project is a library
+ * @param targetDeployment - target deployment
  * @returns - target deployment CF | ABAP and answers
  */
-async function promptDeployConfigQuestions(fs, options, prompt, { launchDeployConfigAsSubGenerator, launchStandaloneFromYui, extensionPromptOpts, supportedTargets, backendConfig, cfDestination, isCap, apiHubConfig, isLibrary }) {
+async function promptDeployConfigQuestions(fs, options, prompt, { launchDeployConfigAsSubGenerator, launchStandaloneFromYui, extensionPromptOpts, supportedTargets, backendConfig, cfDestination, isCap, apiHubConfig, isLibrary }, targetDeployment) {
     let answers = {};
     if (launchDeployConfigAsSubGenerator) {
         const { questions, abapAnswers } = await (0, prompts_1.getSubGenPrompts)(fs, options, {
@@ -33,14 +34,14 @@ async function promptDeployConfigQuestions(fs, options, prompt, { launchDeployCo
             isCap,
             apiHubConfig,
             isLibrary
-        });
+        }, targetDeployment);
         const subGenAnswers = await prompt(questions);
         Object.assign(answers, subGenAnswers, abapAnswers);
     }
     else {
         answers = await prompt((0, prompts_1.getDeployTargetQuestion)([...supportedTargets], options.projectRoot));
     }
-    const target = supportedTargets.find((t) => t.name === answers?.targetName)?.name;
+    const target = supportedTargets.find((t) => t.name === answers?.targetName || t.name === targetDeployment)?.name;
     return { target, answers };
 }
 //# sourceMappingURL=prompting.js.map

package/generators/prompts/sub-gen.d.ts

@@ -20,6 +20,7 @@ import type { DeployConfigOptions, Target } from '../types';
  * @param promptOpts.isCap - whether the project is a CAP project
  * @param promptOpts.apiHubConfig - API Hub configuration
  * @param promptOpts.isLibrary - whether the project is a library
+ * @param targetDeployment - target deployment
  * @returns - deployment configuration answers
  */
 export declare function getSubGenPrompts(fs: Editor, options: DeployConfigOptions, { launchDeployConfigAsSubGenerator, launchStandaloneFromYui, extensionPromptOpts, supportedTargets, backendConfig, cfDestination, isCap, apiHubConfig, isLibrary }: {
@@ -32,7 +33,7 @@ export declare function getSubGenPrompts(fs: Editor, options: DeployConfigOption
     isCap: boolean;
     apiHubConfig: ApiHubConfig;
     isLibrary: boolean;
-}): Promise<{
+}, targetDeployment?: string): Promise<{
     questions: Question[];
     abapAnswers: Partial<AbapDeployConfigAnswersInternal>;
 }>;

package/generators/prompts/sub-gen.js

@@ -24,42 +24,56 @@ const deploy_target_1 = require("./deploy-target");
  * @param promptOpts.isCap - whether the project is a CAP project
  * @param promptOpts.apiHubConfig - API Hub configuration
  * @param promptOpts.isLibrary - whether the project is a library
+ * @param targetDeployment - target deployment
  * @returns - deployment configuration answers
  */
-async function getSubGenPrompts(fs, options, { launchDeployConfigAsSubGenerator, launchStandaloneFromYui, extensionPromptOpts, supportedTargets, backendConfig, cfDestination, isCap, apiHubConfig, isLibrary }) {
+async function getSubGenPrompts(fs, options, { launchDeployConfigAsSubGenerator, launchStandaloneFromYui, extensionPromptOpts, supportedTargets, backendConfig, cfDestination, isCap, apiHubConfig, isLibrary }, targetDeployment) {
     deploy_config_generator_shared_1.DeploymentGenerator.logger?.debug((0, utils_1.t)('debug.loadingPrompts'));
     const configExists = fs.exists((0, path_1.join)(options.appRootPath, options.config || project_access_1.FileName.UI5DeployYaml));
     const showOverwrite = (0, deploy_config_generator_shared_1.showOverwriteQuestion)(configExists, launchDeployConfigAsSubGenerator, launchStandaloneFromYui, options.overwrite);
     const indexGenerationAllowed = !isLibrary && launchStandaloneFromYui && !(await (0, abap_deploy_config_sub_generator_1.indexHtmlExists)(fs, options.appRootPath));
+    let abapPrompts = [];
+    let abapAnswers = {};
     // ABAP prompts
-    const { prompts: abapPrompts, answers: abapAnswers } = await (0, abap_deploy_config_sub_generator_1.getAbapQuestions)({
-        appRootPath: options.appRootPath,
-        connectedSystem: options.connectedSystem,
-        backendConfig,
-        configFile: options.config,
-        indexGenerationAllowed,
-        showOverwriteQuestion: showOverwrite,
-        promptOptions: options?.subGenPromptOptions,
-        logger: deploy_config_generator_shared_1.DeploymentGenerator.logger
-    });
+    if (!targetDeployment || targetDeployment === deploy_config_generator_shared_1.TargetName.ABAP) {
+        ({ prompts: abapPrompts, answers: abapAnswers } = await (0, abap_deploy_config_sub_generator_1.getAbapQuestions)({
+            appRootPath: options.appRootPath,
+            connectedSystem: options.connectedSystem,
+            backendConfig,
+            configFile: options.config,
+            indexGenerationAllowed,
+            showOverwriteQuestion: showOverwrite,
+            promptOptions: options?.subGenPromptOptions,
+            logger: deploy_config_generator_shared_1.DeploymentGenerator.logger
+        }));
+    }
     // CF prompts
-    const cfPrompts = await (0, cf_deploy_config_sub_generator_1.getCFQuestions)({
-        projectRoot: options.projectRoot,
-        isAbapDirectServiceBinding: options.isAbapDirectServiceBinding,
-        cfDestination: cfDestination,
-        isCap: isCap,
-        addOverwrite: showOverwrite,
-        apiHubConfig: apiHubConfig,
-        promptOptions: options?.subGenPromptOptions
-    });
+    let cfPrompts = [];
+    if (!targetDeployment || targetDeployment === deploy_config_generator_shared_1.TargetName.CF) {
+        cfPrompts = await (0, cf_deploy_config_sub_generator_1.getCFQuestions)({
+            projectRoot: options.projectRoot,
+            isAbapDirectServiceBinding: options.isAbapDirectServiceBinding,
+            cfDestination: cfDestination,
+            isCap: isCap,
+            addOverwrite: showOverwrite,
+            apiHubConfig: apiHubConfig,
+            promptOptions: options?.subGenPromptOptions
+        });
+    }
     // Combine all prompts
-    const questions = combineAllPrompts(options.projectRoot, {
-        supportedTargets,
-        abapPrompts,
-        cfPrompts,
-        extensionPromptOpts,
-        launchStandaloneFromYui
-    });
+    let questions = [];
+    if (!targetDeployment) {
+        questions = combineAllPrompts(options.projectRoot, {
+            supportedTargets,
+            abapPrompts,
+            cfPrompts,
+            extensionPromptOpts,
+            launchStandaloneFromYui
+        });
+    }
+    else {
+        questions = targetDeployment === deploy_config_generator_shared_1.TargetName.ABAP ? abapPrompts : cfPrompts;
+    }
     return { questions, abapAnswers: abapAnswers };
 }
 /**

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@sap-ux/deploy-config-sub-generator",
   "description": "Main generator for configuring ABAP or Cloud Foundry deployment configuration",
-  "version": "0.3.6",
+  "version": "0.3.8",
   "repository": {
     "type": "git",
     "url": "https://github.com/SAP/open-ux-tools.git",
@@ -26,11 +26,11 @@
     "yeoman-generator": "5.10.0",
     "@sap-ux/btp-utils": "1.1.0",
     "@sap-ux/cf-deploy-config-sub-generator": "0.2.11",
-    "@sap-ux/abap-deploy-config-sub-generator": "0.1.15",
+    "@sap-ux/abap-deploy-config-sub-generator": "0.1.16",
     "@sap-ux/deploy-config-generator-shared": "0.1.8",
     "@sap-ux/fiori-generator-shared": "0.12.7",
     "@sap-ux/inquirer-common": "0.7.9",
-    "@sap-ux/odata-service-inquirer": "2.4.16",
+    "@sap-ux/odata-service-inquirer": "2.4.17",
     "@sap-ux/project-access": "1.30.2",
     "@sap-ux/store": "1.1.0",
     "@sap-ux/ui5-config": "0.28.2"
@@ -50,10 +50,10 @@
     "rimraf": "5.0.5",
     "unionfs": "4.4.0",
     "yeoman-test": "6.3.0",
-    "@sap-ux/abap-deploy-config-inquirer": "1.4.13",
+    "@sap-ux/abap-deploy-config-inquirer": "1.4.14",
     "@sap-ux/cf-deploy-config-inquirer": "0.3.9",
     "@sap-ux/cf-deploy-config-writer": "0.3.3",
-    "@sap-ux/fiori-app-sub-generator": "0.4.13",
+    "@sap-ux/fiori-app-sub-generator": "0.4.16",
     "@sap-ux/jest-file-matchers": "0.2.2"
   },
   "engines": {