@sap-ux/deploy-config-sub-generator 0.3.46 → 0.3.48

package/generators/app/index.d.ts

@@ -1,11 +1,10 @@
 import { DeploymentGenerator } from '@sap-ux/deploy-config-generator-shared';
+import { promptNames } from '../utils';
 import { AppWizard, Prompts } from '@sap-devx/yeoman-ui-types';
-import { promptNames } from '../prompts/deploy-target';
 import type { Answers } from 'inquirer';
-import type { DeployConfigGenerator, DeployConfigOptions } from '../types';
+import type { DeployConfigGenerator, DeployConfigOptions, DeployConfigSubGenPromptOptions } from '../types';
 import type { FioriToolsProxyConfigBackend } from '@sap-ux/ui5-config';
 import type { VSCodeInstance } from '@sap-ux/fiori-generator-shared';
-import type { CommonPromptOptions } from '@sap-ux/inquirer-common';
 import type { ApiHubConfig } from '@sap-ux/cf-deploy-config-sub-generator';
 /**
  * The main deployment configuration generator.
@@ -17,7 +16,7 @@ export default class extends DeploymentGenerator implements DeployConfigGenerato
     readonly launchStandaloneFromYui: boolean;
     readonly apiHubConfig: ApiHubConfig;
     launchDeployConfigAsSubGenerator: boolean;
-    extensionPromptOpts?: Record<string, CommonPromptOptions>;
+    promptOptions?: DeployConfigSubGenPromptOptions;
     vscode: VSCodeInstance;
     cfDestination: string;
     mtaPath?: string;
@@ -53,5 +52,5 @@ export default class extends DeploymentGenerator implements DeployConfigGenerato
     private _composeWithSubGenerator;
 }
 export { promptNames };
-export type { DeployConfigOptions };
+export type { DeployConfigOptions, DeployConfigSubGenPromptOptions };
 //# sourceMappingURL=index.d.ts.map

package/generators/app/index.js

@@ -10,10 +10,10 @@ const project_access_1 = require("@sap-ux/project-access");
 const deploy_config_generator_shared_1 = require("@sap-ux/deploy-config-generator-shared");
 const utils_1 = require("./utils");
 const utils_2 = require("../utils");
+Object.defineProperty(exports, "promptNames", { enumerable: true, get: function () { return utils_2.promptNames; } });
 const yeoman_ui_types_1 = require("@sap-devx/yeoman-ui-types");
 const prompting_1 = require("./prompting");
-const deploy_target_1 = require("../prompts/deploy-target");
-Object.defineProperty(exports, "promptNames", { enumerable: true, get: function () { return deploy_target_1.promptNames; } });
+const deployConfigSubGenNamespace = '@sap-ux/deploy-config-sub-generator';
 /**
  * The main deployment configuration generator.
  */
@@ -24,7 +24,7 @@ class default_1 extends deploy_config_generator_shared_1.DeploymentGenerator {
     launchStandaloneFromYui;
     apiHubConfig;
     launchDeployConfigAsSubGenerator;
-    extensionPromptOpts;
+    promptOptions;
     vscode;
     cfDestination;
     mtaPath;
@@ -45,6 +45,7 @@ class default_1 extends deploy_config_generator_shared_1.DeploymentGenerator {
         this.appWizard = opts.appWizard ?? yeoman_ui_types_1.AppWizard.create(opts);
         this.genNamespace = opts.namespace;
         this.launchDeployConfigAsSubGenerator = opts.launchDeployConfigAsSubGenerator ?? false;
+        this.promptOptions = opts?.subGenPromptOptions;
         this.target = (0, utils_1.parseTarget)(args, opts);
         this.vscode = opts.vscode;
         (0, utils_1.registerNamespaces)(this.rootGeneratorName(), this.genNamespace, this.env.isPackageRegistered.bind(this.env), this.env.lookup.bind(this.env));
@@ -84,7 +85,11 @@ class default_1 extends deploy_config_generator_shared_1.DeploymentGenerator {
      */
     async initializing() {
         await super.initializing();
-        this.extensionPromptOpts = await (0, deploy_config_generator_shared_1.getExtensionGenPromptOpts)(this.env.create.bind(this.env), this.rootGeneratorName(), this.vscode);
+        const promptOptions = await (0, deploy_config_generator_shared_1.getExtensionGenPromptOpts)(this.env.create.bind(this.env), deployConfigSubGenNamespace, this.vscode);
+        this.promptOptions = {
+            ...promptOptions,
+            ...this.promptOptions
+        };
         const capRoot = await (0, project_access_1.findCapProjectRoot)(this.options.appRootPath);
         this.isCap = !!capRoot;
         this.mtaPath = (await (0, project_access_1.getMtaPath)(this.options.appRootPath))?.mtaPath;
@@ -123,7 +128,7 @@ class default_1 extends deploy_config_generator_shared_1.DeploymentGenerator {
             const { target, answers } = await (0, prompting_1.promptDeployConfigQuestions)(this.fs, this.options, this.prompt.bind(this), {
                 launchDeployConfigAsSubGenerator: this.launchDeployConfigAsSubGenerator,
                 launchStandaloneFromYui: this.launchStandaloneFromYui,
-                extensionPromptOpts: this.extensionPromptOpts,
+                promptOptions: this.promptOptions,
                 supportedTargets,
                 backendConfig: this.backendConfig,
                 cfDestination: this.cfDestination,

package/generators/app/prompting.d.ts

@@ -1,7 +1,6 @@
-import type { CommonPromptOptions } from '@sap-ux/inquirer-common';
 import type { AbapDeployConfigAnswersInternal } from '@sap-ux/abap-deploy-config-sub-generator';
 import type { ApiHubConfig, CfDeployConfigAnswers } from '@sap-ux/cf-deploy-config-sub-generator';
-import type { Target, DeployConfigOptions } from '../types';
+import type { Target, DeployConfigOptions, DeployConfigSubGenPromptOptions } from '../types';
 import type { FioriToolsProxyConfigBackend } from '@sap-ux/ui5-config';
 import type { Editor } from 'mem-fs-editor';
 import type { GeneratorOptions } from 'yeoman-generator';
@@ -14,7 +13,7 @@ import type { GeneratorOptions } from 'yeoman-generator';
  * @param promptOpts - options for prompting
  * @param promptOpts.launchDeployConfigAsSubGenerator - whether the generator is launched as a sub generator
  * @param promptOpts.launchStandaloneFromYui - whether the generator is launched standalone from YUI
- * @param promptOpts.extensionPromptOpts - extension prompt options
+ * @param promptOpts.promptOptions - extension prompt options
  * @param promptOpts.supportedTargets - supported deployment targets
  * @param promptOpts.backendConfig - backend configuration
  * @param promptOpts.cfDestination - CF destination
@@ -24,10 +23,10 @@ import type { GeneratorOptions } from 'yeoman-generator';
  * @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 }: {
+export declare function promptDeployConfigQuestions(fs: Editor, options: DeployConfigOptions, prompt: GeneratorOptions['prompt'], { launchDeployConfigAsSubGenerator, launchStandaloneFromYui, promptOptions, supportedTargets, backendConfig, cfDestination, isCap, apiHubConfig, isLibrary }: {
     launchDeployConfigAsSubGenerator: boolean;
     launchStandaloneFromYui: boolean;
-    extensionPromptOpts?: Record<string, CommonPromptOptions>;
+    promptOptions?: DeployConfigSubGenPromptOptions;
     supportedTargets: Target[];
     backendConfig: FioriToolsProxyConfigBackend;
     cfDestination: string;

package/generators/app/prompting.js

@@ -11,7 +11,7 @@ const prompts_1 = require("../prompts");
  * @param promptOpts - options for prompting
  * @param promptOpts.launchDeployConfigAsSubGenerator - whether the generator is launched as a sub generator
  * @param promptOpts.launchStandaloneFromYui - whether the generator is launched standalone from YUI
- * @param promptOpts.extensionPromptOpts - extension prompt options
+ * @param promptOpts.promptOptions - extension prompt options
  * @param promptOpts.supportedTargets - supported deployment targets
  * @param promptOpts.backendConfig - backend configuration
  * @param promptOpts.cfDestination - CF destination
@@ -21,13 +21,13 @@ const prompts_1 = require("../prompts");
  * @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 }, targetDeployment) {
+async function promptDeployConfigQuestions(fs, options, prompt, { launchDeployConfigAsSubGenerator, launchStandaloneFromYui, promptOptions, supportedTargets, backendConfig, cfDestination, isCap, apiHubConfig, isLibrary }, targetDeployment) {
     let answers = {};
     if (launchDeployConfigAsSubGenerator) {
         const { questions, abapAnswers } = await (0, prompts_1.getSubGenPrompts)(fs, options, {
             launchDeployConfigAsSubGenerator,
             launchStandaloneFromYui,
-            extensionPromptOpts,
+            promptOptions,
             supportedTargets,
             backendConfig,
             cfDestination,

package/generators/prompts/deploy-target.d.ts

@@ -1,17 +1,11 @@
 import type { Target } from '../types';
 import type { Question } from 'inquirer';
-import type { CommonPromptOptions } from '@sap-ux/inquirer-common';
-export declare enum promptNames {
-    targetName = "targetName"
-}
 /**
  * Returns the deployment target question.
  *
  * @param supportedTargets - supported targets
  * @param projectRoot - path to the project
- * @param extensionPromptOpts - extension prompt options
- * @param launchStandaloneFromYui - whether the generator is launched standalone from YUI
  * @returns - the deployment target question
  */
-export declare function getDeployTargetQuestion(supportedTargets: Target[], projectRoot: string, extensionPromptOpts?: Record<string, CommonPromptOptions>, launchStandaloneFromYui?: boolean): Question[];
+export declare function getDeployTargetQuestion(supportedTargets: Target[], projectRoot: string): Question[];
 //# sourceMappingURL=deploy-target.d.ts.map

package/generators/prompts/deploy-target.js

@@ -1,27 +1,19 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.promptNames = void 0;
 exports.getDeployTargetQuestion = getDeployTargetQuestion;
 const utils_1 = require("../utils");
-const inquirer_common_1 = require("@sap-ux/inquirer-common");
-var promptNames;
-(function (promptNames) {
-    promptNames["targetName"] = "targetName";
-})(promptNames || (exports.promptNames = promptNames = {}));
 /**
  * Returns the deployment target question.
  *
  * @param supportedTargets - supported targets
  * @param projectRoot - path to the project
- * @param extensionPromptOpts - extension prompt options
- * @param launchStandaloneFromYui - whether the generator is launched standalone from YUI
  * @returns - the deployment target question
  */
-function getDeployTargetQuestion(supportedTargets, projectRoot, extensionPromptOpts, launchStandaloneFromYui) {
-    const deployTargetPrompts = [
+function getDeployTargetQuestion(supportedTargets, projectRoot) {
+    return [
         {
             type: 'list',
-            name: promptNames.targetName,
+            name: utils_1.promptNames.targetName,
             guiOptions: {
                 breadcrumb: (0, utils_1.t)('prompts.deployTarget.breadcrumb')
             },
@@ -31,8 +23,5 @@ function getDeployTargetQuestion(supportedTargets, projectRoot, extensionPromptO
             choices: supportedTargets.map((target) => ({ name: target.description, value: target.name }))
         }
     ];
-    return extensionPromptOpts && launchStandaloneFromYui
-        ? (0, inquirer_common_1.extendWithOptions)(deployTargetPrompts, extensionPromptOpts)
-        : deployTargetPrompts;
 }
 //# sourceMappingURL=deploy-target.js.map

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

@@ -2,9 +2,8 @@ import type { FioriToolsProxyConfigBackend } from '@sap-ux/ui5-config';
 import type { Editor } from 'mem-fs-editor';
 import type { ApiHubConfig } from '@sap-ux/cf-deploy-config-sub-generator';
 import type { AbapDeployConfigAnswersInternal } from '@sap-ux/abap-deploy-config-sub-generator';
-import type { CommonPromptOptions, PromptDefaultValue } from '@sap-ux/inquirer-common';
 import type { Question } from 'inquirer';
-import type { DeployConfigOptions, Target } from '../types';
+import type { DeployConfigOptions, DeployConfigSubGenPromptOptions, Target } from '../types';
 /**
  * Retrieves the combined sub generator prompts.
  *
@@ -13,7 +12,7 @@ import type { DeployConfigOptions, Target } from '../types';
  * @param promptOpts - options for prompts
  * @param promptOpts.launchDeployConfigAsSubGenerator - whether the generator is launched as a sub generator
  * @param promptOpts.launchStandaloneFromYui - whether the generator is launched standalone from YUI
- * @param promptOpts.extensionPromptOpts - extension prompt options
+ * @param promptOpts.promptOptions - sub gen prompt options
  * @param promptOpts.supportedTargets - supported deployment targets
  * @param promptOpts.backendConfig - backend configuration
  * @param promptOpts.cfDestination - CF destination
@@ -23,10 +22,10 @@ import type { DeployConfigOptions, Target } from '../types';
  * @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 }: {
+export declare function getSubGenPrompts(fs: Editor, options: DeployConfigOptions, { launchDeployConfigAsSubGenerator, launchStandaloneFromYui, promptOptions, supportedTargets, backendConfig, cfDestination, isCap, apiHubConfig, isLibrary }: {
     launchDeployConfigAsSubGenerator: boolean;
     launchStandaloneFromYui: boolean;
-    extensionPromptOpts?: Record<string, CommonPromptOptions & PromptDefaultValue<string | boolean>>;
+    promptOptions?: DeployConfigSubGenPromptOptions;
     supportedTargets: Target[];
     backendConfig: FioriToolsProxyConfigBackend;
     cfDestination: string;

package/generators/prompts/sub-gen.js

@@ -17,7 +17,7 @@ const deploy_target_1 = require("./deploy-target");
  * @param promptOpts - options for prompts
  * @param promptOpts.launchDeployConfigAsSubGenerator - whether the generator is launched as a sub generator
  * @param promptOpts.launchStandaloneFromYui - whether the generator is launched standalone from YUI
- * @param promptOpts.extensionPromptOpts - extension prompt options
+ * @param promptOpts.promptOptions - sub gen prompt options
  * @param promptOpts.supportedTargets - supported deployment targets
  * @param promptOpts.backendConfig - backend configuration
  * @param promptOpts.cfDestination - CF destination
@@ -27,7 +27,7 @@ const deploy_target_1 = require("./deploy-target");
  * @param targetDeployment - target deployment
  * @returns - deployment configuration answers
  */
-async function getSubGenPrompts(fs, options, { launchDeployConfigAsSubGenerator, launchStandaloneFromYui, extensionPromptOpts, supportedTargets, backendConfig, cfDestination, isCap, apiHubConfig, isLibrary }, targetDeployment) {
+async function getSubGenPrompts(fs, options, { launchDeployConfigAsSubGenerator, launchStandaloneFromYui, promptOptions, 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);
@@ -67,8 +67,7 @@ async function getSubGenPrompts(fs, options, { launchDeployConfigAsSubGenerator,
             supportedTargets,
             abapPrompts,
             cfPrompts,
-            extensionPromptOpts,
-            launchStandaloneFromYui
+            promptOptions
         });
     }
     else {
@@ -84,14 +83,15 @@ async function getSubGenPrompts(fs, options, { launchDeployConfigAsSubGenerator,
  * @param opts.supportedTargets - the support deployment targets
  * @param opts.abapPrompts - abap specific prompts
  * @param opts.cfPrompts - cf specific prompts
- * @param opts.extensionPromptOpts - extension prompt options
- * @param opts.launchStandaloneFromYui - whether the generator is launched standalone from YUI
+ * @param opts.promptOptions - sub gen prompt options
  * @returns - all the different prompts combined
  */
-function combineAllPrompts(projectRoot, { supportedTargets, abapPrompts, cfPrompts, extensionPromptOpts, launchStandaloneFromYui }) {
-    const questions = (0, deploy_target_1.getDeployTargetQuestion)(supportedTargets, projectRoot, extensionPromptOpts, launchStandaloneFromYui);
+function combineAllPrompts(projectRoot, { supportedTargets, abapPrompts, cfPrompts, promptOptions }) {
+    const questions = (0, deploy_target_1.getDeployTargetQuestion)(supportedTargets, projectRoot);
     questions.push(...(0, inquirer_common_1.withCondition)(abapPrompts, (answers) => answers.targetName === deploy_config_generator_shared_1.TargetName.ABAP));
     questions.push(...(0, inquirer_common_1.withCondition)(cfPrompts, (answers) => answers.targetName === deploy_config_generator_shared_1.TargetName.CF));
-    return questions;
+    return promptOptions
+        ? (0, inquirer_common_1.extendWithOptions)(questions, promptOptions)
+        : questions;
 }
 //# sourceMappingURL=sub-gen.js.map

package/generators/types/index.d.ts

@@ -5,9 +5,13 @@ import type { ApiHubConfig } from '@sap-ux/cf-deploy-config-writer';
 import type { LogWrapper, VSCodeInstance } from '@sap-ux/fiori-generator-shared';
 import type { OdataServiceAnswers } from '@sap-ux/odata-service-inquirer';
 import type { FioriToolsProxyConfigBackend } from '@sap-ux/ui5-config';
-import type { CommonPromptOptions } from '@sap-ux/inquirer-common';
 import type { AbapDeployConfigPromptOptions } from '@sap-ux/abap-deploy-config-sub-generator';
 import type { CfDeployConfigPromptOptions } from '@sap-ux/cf-deploy-config-sub-generator';
+import type { CommonPromptOptions } from '@sap-ux/inquirer-common';
+import type { promptNames } from '../utils';
+export type DeployConfigSubGenPromptOptions = {
+    [promptNames.targetName]: CommonPromptOptions;
+} | AbapDeployConfigPromptOptions | CfDeployConfigPromptOptions;
 export interface DeployConfigOptions extends Generator.GeneratorOptions {
     /**
      * The target deployment
@@ -70,7 +74,7 @@ export interface DeployConfigOptions extends Generator.GeneratorOptions {
     /**
      * Deployment configuration prompt options for sub generators
      */
-    subGenPromptOptions?: AbapDeployConfigPromptOptions | CfDeployConfigPromptOptions;
+    subGenPromptOptions?: DeployConfigSubGenPromptOptions;
 }
 /**
  * The deployment target (CF or ABAP)
@@ -91,10 +95,6 @@ export interface DeployConfigGenerator {
      * Instance of vscode
      */
     vscode: VSCodeInstance;
-    /**
-     * Options loaded from extension generators
-     */
-    extensionPromptOpts?: Record<string, CommonPromptOptions>;
     /**
      * The generator namespace that will be used for calling subgens
      */

package/generators/utils/constants.d.ts

@@ -3,4 +3,7 @@ export declare const generatorNamespace: (bundledRootGeneratorName: string, subG
 export declare const generatorTitle = "Deployment Configuration Generator";
 export declare const abapChoice: Target;
 export declare const cfChoice: Target;
+export declare enum promptNames {
+    targetName = "targetName"
+}
 //# sourceMappingURL=constants.d.ts.map

package/generators/utils/constants.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.cfChoice = exports.abapChoice = exports.generatorTitle = exports.generatorNamespace = void 0;
+exports.promptNames = exports.cfChoice = exports.abapChoice = exports.generatorTitle = exports.generatorNamespace = void 0;
 // When deployment generator is bundled the namespacing is relative to the root generator
 const deploy_config_generator_shared_1 = require("@sap-ux/deploy-config-generator-shared");
 const generatorNamespace = (bundledRootGeneratorName, subGenName) => `${bundledRootGeneratorName}_${subGenName}`;
@@ -8,4 +8,8 @@ exports.generatorNamespace = generatorNamespace;
 exports.generatorTitle = 'Deployment Configuration Generator';
 exports.abapChoice = { name: deploy_config_generator_shared_1.TargetName.ABAP, description: 'ABAP' };
 exports.cfChoice = { name: deploy_config_generator_shared_1.TargetName.CF, description: 'Cloud Foundry' };
+var promptNames;
+(function (promptNames) {
+    promptNames["targetName"] = "targetName";
+})(promptNames || (exports.promptNames = promptNames = {}));
 //# sourceMappingURL=constants.js.map

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.46",
+  "version": "0.3.48",
   "repository": {
     "type": "git",
     "url": "https://github.com/SAP/open-ux-tools.git",
@@ -25,12 +25,12 @@
     "i18next": "25.3.0",
     "yeoman-generator": "5.10.0",
     "@sap-ux/btp-utils": "1.1.0",
-    "@sap-ux/cf-deploy-config-sub-generator": "0.2.38",
+    "@sap-ux/cf-deploy-config-sub-generator": "0.2.39",
+    "@sap-ux/abap-deploy-config-sub-generator": "0.1.44",
     "@sap-ux/deploy-config-generator-shared": "0.1.22",
     "@sap-ux/fiori-generator-shared": "0.13.3",
-    "@sap-ux/abap-deploy-config-sub-generator": "0.1.42",
     "@sap-ux/inquirer-common": "0.7.27",
-    "@sap-ux/odata-service-inquirer": "2.5.22",
+    "@sap-ux/odata-service-inquirer": "2.5.23",
     "@sap-ux/project-access": "1.30.7",
     "@sap-ux/store": "1.1.2",
     "@sap-ux/ui5-config": "0.29.0"
@@ -50,8 +50,8 @@
     "rimraf": "5.0.5",
     "unionfs": "4.4.0",
     "yeoman-test": "6.3.0",
-    "@sap-ux/abap-deploy-config-inquirer": "1.4.38",
-    "@sap-ux/cf-deploy-config-inquirer": "0.3.30",
+    "@sap-ux/abap-deploy-config-inquirer": "1.5.1",
+    "@sap-ux/cf-deploy-config-inquirer": "0.4.0",
     "@sap-ux/cf-deploy-config-writer": "0.3.16",
     "@sap-ux/jest-file-matchers": "0.2.4"
   },
@@ -64,7 +64,7 @@
     "watch": "tsc --watch",
     "lint": "eslint . --ext .ts",
     "lint:fix": "eslint . --ext .ts --fix",
-    "test": "jest --ci --forceExit --detectOpenHandles --colors --passWithNoTests",
+    "test": "jest --ci --forceExit --detectOpenHandles --colors",
     "test-u": "jest --ci --forceExit --detectOpenHandles --colors -u",
     "link": "pnpm link --global",
     "unlink": "pnpm unlink --global"