@sap-ux/cf-deploy-config-sub-generator 0.1.11 → 0.1.12

package/generators/app/index.js

@@ -19,7 +19,6 @@ const project_access_1 = require("@sap-ux/project-access");
 const telemetryEvents_1 = require("../telemetryEvents");
 const questions_1 = require("./questions");
 Object.defineProperty(exports, "getCFQuestions", { enumerable: true, get: function () { return questions_1.getCFQuestions; } });
-const inquirer_common_1 = require("@sap-ux/inquirer-common");
 /**
  * Cloud Foundry deployment configuration generator.
  */
@@ -85,9 +84,6 @@ class default_1 extends deploy_config_generator_shared_1.DeploymentGenerator {
         if (!this.launchDeployConfigAsSubGenerator) {
             await this._init();
         }
-        else {
-            await this._processProjectConfigs();
-        }
     }
     async _init() {
         // mta executable is required as mta-lib is used
@@ -147,13 +143,7 @@ class default_1 extends deploy_config_generator_shared_1.DeploymentGenerator {
         const isCAPMissingMTA = this.isCap && this.projectRoot && !this.mtaPath;
         if (isCAPMissingMTA) {
             deploy_config_generator_shared_1.DeploymentGenerator.logger?.debug((0, utils_1.t)('cfGen.debug.capMissingMTA'));
-            // If launched as root generator, add a prompt to allow user decide if they want to add an MTA config
-            let questions = (await (0, questions_1.getCFApprouterQuestionsForCap)({
-                projectRoot: this.projectRoot ?? process.cwd()
-            }));
-            questions = (0, inquirer_common_1.withCondition)(questions, (answers) => answers.addCapMtaContinue === true);
-            questions.unshift(...(0, deploy_config_generator_shared_1.getConfirmMtaContinuePrompt)());
-            this.appRouterAnswers = (await this.prompt(questions));
+            this.appRouterAnswers = (await this.prompt(await (0, questions_1.getCAPMTAQuestions)({ projectRoot: this.projectRoot ?? process.cwd() })));
             if (this.appRouterAnswers.addCapMtaContinue !== true) {
                 this.abort = true;
                 return;

package/generators/app/questions.d.ts

@@ -1,5 +1,6 @@
-import { type CfAppRouterDeployConfigQuestions, type CfDeployConfigQuestions } from '@sap-ux/cf-deploy-config-inquirer';
+import { type CfDeployConfigQuestions } from '@sap-ux/cf-deploy-config-inquirer';
 import type { ApiHubConfig } from '@sap-ux/cf-deploy-config-writer';
+import type { Question } from 'inquirer';
 /**
  * Fetches the Cloud Foundry deployment configuration questions.
  *
@@ -21,13 +22,13 @@ export declare function getCFQuestions({ projectRoot, isAbapDirectServiceBinding
     apiHubConfig?: ApiHubConfig;
 }): Promise<CfDeployConfigQuestions[]>;
 /**
- * Retrieve the CF Approuter questions, certain prompts are restricted to support CAP project.
+ * Generate CF Approuter questions for CAP project with an existing HTML5 app and missing MTA configuration.
  *
  * @param options - the options required for retrieving the prompts.
  * @param options.projectRoot - the root path of the project.
- * @returns the cf approuter config questions.
+ * @returns the cf approuter config questions, restricting prompts being shown to the user
  */
-export declare function getCFApprouterQuestionsForCap({ projectRoot }: {
+export declare function getCAPMTAQuestions({ projectRoot }: {
     projectRoot: string;
-}): Promise<CfAppRouterDeployConfigQuestions[]>;
+}): Promise<Question[]>;
 //# sourceMappingURL=questions.d.ts.map

package/generators/app/questions.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getCFApprouterQuestionsForCap = exports.getCFQuestions = void 0;
+exports.getCAPMTAQuestions = exports.getCFQuestions = void 0;
 const btp_utils_1 = require("@sap-ux/btp-utils");
 const deploy_config_generator_shared_1 = require("@sap-ux/deploy-config-generator-shared");
 const project_access_1 = require("@sap-ux/project-access");
@@ -8,6 +8,7 @@ const cf_deploy_config_inquirer_1 = require("@sap-ux/cf-deploy-config-inquirer")
 const fiori_generator_shared_1 = require("@sap-ux/fiori-generator-shared");
 const utils_1 = require("./utils");
 const utils_2 = require("../utils");
+const inquirer_common_1 = require("@sap-ux/inquirer-common");
 /**
  * Fetches the Cloud Foundry deployment configuration questions.
  *
@@ -65,5 +66,21 @@ async function getCFApprouterQuestionsForCap({ projectRoot }) {
     };
     return (0, cf_deploy_config_inquirer_1.getAppRouterPrompts)(appRouterPromptOptions);
 }
-exports.getCFApprouterQuestionsForCap = getCFApprouterQuestionsForCap;
+/**
+ * Generate CF Approuter questions for CAP project with an existing HTML5 app and missing MTA configuration.
+ *
+ * @param options - the options required for retrieving the prompts.
+ * @param options.projectRoot - the root path of the project.
+ * @returns the cf approuter config questions, restricting prompts being shown to the user
+ */
+async function getCAPMTAQuestions({ projectRoot }) {
+    // If launched as root generator, add a prompt to allow user decide if they want to add an MTA config
+    let questions = (await getCFApprouterQuestionsForCap({
+        projectRoot
+    }));
+    questions = (0, inquirer_common_1.withCondition)(questions, (answers) => answers.addCapMtaContinue === true);
+    questions.unshift(...(0, deploy_config_generator_shared_1.getConfirmMtaContinuePrompt)());
+    return questions;
+}
+exports.getCAPMTAQuestions = getCAPMTAQuestions;
 //# sourceMappingURL=questions.js.map

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@sap-ux/cf-deploy-config-sub-generator",
   "description": "Generators for configuring Cloud Foundry deployment configuration",
-  "version": "0.1.11",
+  "version": "0.1.12",
   "repository": {
     "type": "git",
     "url": "https://github.com/SAP/open-ux-tools.git",
@@ -25,14 +25,14 @@
     "yeoman-generator": "5.10.0",
     "@sap-ux/btp-utils": "1.0.1",
     "@sap-ux/cf-deploy-config-writer": "0.1.12",
-    "@sap-ux/cf-deploy-config-inquirer": "0.2.8",
     "@sap-ux/deploy-config-generator-shared": "0.0.27",
+    "@sap-ux/cf-deploy-config-inquirer": "0.2.8",
     "@sap-ux/feature-toggle": "0.2.3",
     "@sap-ux/fiori-generator-shared": "0.9.0",
     "@sap-ux/i18n": "0.2.1",
-    "@sap-ux/inquirer-common": "0.6.19",
     "@sap-ux/project-access": "1.29.8",
-    "@sap-ux/ui5-config": "0.26.2"
+    "@sap-ux/ui5-config": "0.26.2",
+    "@sap-ux/inquirer-common": "0.6.19"
   },
   "devDependencies": {
     "@jest/types": "29.6.3",