@sap-ux/deploy-config-sub-generator 0.0.7 → 0.0.9

package/generators/app/index.d.ts

@@ -1,6 +1,6 @@
 import { DeploymentGenerator } from '@sap-ux/deploy-config-generator-shared';
+import { AppWizard, Prompts } from '@sap-devx/yeoman-ui-types';
 import { promptNames } from '../prompts/deploy-target';
-import { AppWizard, type Prompts } from '@sap-devx/yeoman-ui-types';
 import type { Answers } from 'inquirer';
 import type { DeployConfigGenerator, DeployConfigOptions } from '../types';
 import type { FioriToolsProxyConfigBackend } from '@sap-ux/ui5-config';

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");
+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 yeoman_ui_types_1 = require("@sap-devx/yeoman-ui-types");
 /**
  * The main deployment configuration generator.
  */
@@ -47,6 +47,7 @@ class default_1 extends deploy_config_generator_shared_1.DeploymentGenerator {
         this.launchDeployConfigAsSubGenerator = opts.launchDeployConfigAsSubGenerator ?? false;
         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));
         // Extensions use options.data to pass in the options
         if (this.options.data?.destinationRoot) {
             this.launchStandaloneFromYui = true;
@@ -67,6 +68,16 @@ class default_1 extends deploy_config_generator_shared_1.DeploymentGenerator {
             this.apiHubConfig = this.options.apiHubConfig ?? (0, utils_2.getEnvApiHubConfig)();
             this.launchStandaloneFromYui = false;
         }
+        // If launched standalone, set the header, title and description
+        if (this.launchStandaloneFromYui) {
+            this.appWizard.setHeaderTitle(utils_2.generatorTitle);
+            this.prompts = new yeoman_ui_types_1.Prompts((0, utils_1.getYUIDetails)(this.options.projectRoot));
+            this.setPromptsCallback = (fn) => {
+                if (this.prompts) {
+                    this.prompts.setCallback(fn);
+                }
+            };
+        }
     }
     /**
      * Initialization phase for deployment configuration.
@@ -80,7 +91,7 @@ class default_1 extends deploy_config_generator_shared_1.DeploymentGenerator {
         if (this.isCap && !this.mtaPath) {
             this.target = deploy_config_generator_shared_1.TargetName.CF; // when CAP project and no mta.yaml, default to Cloud Foundry
         }
-        this.options.projectRoot = capRoot ?? this.mtaPath ?? this.options.appRootPath;
+        this.options.projectRoot = capRoot ?? (this.mtaPath && (0, path_1.dirname)(this.mtaPath)) ?? this.options.appRootPath;
         ({ backendConfig: this.backendConfig, isLibrary: this.isLibrary } = await (0, utils_2.getBackendConfig)(this.fs, this.options, this.launchStandaloneFromYui, this.options.appRootPath));
         const { destinationName, servicePath } = await (0, utils_2.getApiHubOptions)(this.fs, {
             appPath: this.options.appRootPath,

package/generators/app/utils.d.ts

@@ -1,4 +1,5 @@
 import type { DeployConfigOptions } from '../types';
+import type { GeneratorOptions } from 'yeoman-generator';
 /**
  * Parses the target from the CLI args or the options.
  *
@@ -7,4 +8,23 @@ import type { DeployConfigOptions } from '../types';
  * @returns - the target
  */
 export declare function parseTarget(args: string | string[], opts: DeployConfigOptions): string | undefined;
+/**
+ * Returns the details for the YUI prompt.
+ *
+ * @param appRootPath - path to the application to be displayed in YUI step description
+ * @returns step details
+ */
+export declare function getYUIDetails(appRootPath: string): {
+    name: string;
+    description: string;
+}[];
+/**
+ * Registers all the root generator's namespaces i.e the subgenerators.
+ *
+ * @param rootGenerator - the root generator name
+ * @param generatorNamespace - the namespace of the generator
+ * @param isPackageRegistered - function to check if a package is registered
+ * @param lookup - function to lookup and register the package's namespaces
+ */
+export declare function registerNamespaces(rootGenerator: string, generatorNamespace: string, isPackageRegistered: GeneratorOptions['env.isPackageRegistered'], lookup: GeneratorOptions['env.lookup']): void;
 //# sourceMappingURL=utils.d.ts.map

package/generators/app/utils.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.parseTarget = void 0;
+exports.registerNamespaces = exports.getYUIDetails = exports.parseTarget = void 0;
+const path_1 = require("path");
 /**
  * Parses the target from the CLI args or the options.
  *
@@ -22,4 +23,33 @@ function parseTarget(args, opts) {
     return result;
 }
 exports.parseTarget = parseTarget;
+/**
+ * Returns the details for the YUI prompt.
+ *
+ * @param appRootPath - path to the application to be displayed in YUI step description
+ * @returns step details
+ */
+function getYUIDetails(appRootPath) {
+    return [
+        {
+            name: 'Deployment Configuration',
+            description: `Configure Deployment settings - ${(0, path_1.basename)(appRootPath)}`
+        }
+    ];
+}
+exports.getYUIDetails = getYUIDetails;
+/**
+ * Registers all the root generator's namespaces i.e the subgenerators.
+ *
+ * @param rootGenerator - the root generator name
+ * @param generatorNamespace - the namespace of the generator
+ * @param isPackageRegistered - function to check if a package is registered
+ * @param lookup - function to lookup and register the package's namespaces
+ */
+function registerNamespaces(rootGenerator, generatorNamespace, isPackageRegistered, lookup) {
+    if (rootGenerator && !isPackageRegistered(generatorNamespace)) {
+        lookup({ packagePatterns: [rootGenerator] });
+    }
+}
+exports.registerNamespaces = registerNamespaces;
 //# sourceMappingURL=utils.js.map

package/generators/utils/constants.d.ts

@@ -1,5 +1,6 @@
 import type { Target } from '../types';
 export declare const generatorNamespace: (bundledRootGeneratorName: string, subGenName: string) => string;
+export declare const generatorTitle = "Deployment Configuration Generator";
 export declare const abapChoice: Target;
 export declare const cfChoice: Target;
 //# sourceMappingURL=constants.d.ts.map

package/generators/utils/constants.js

@@ -1,10 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.cfChoice = exports.abapChoice = exports.generatorNamespace = void 0;
+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}`;
 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' };
 //# 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.0.7",
+  "version": "0.0.9",
   "repository": {
     "type": "git",
     "url": "https://github.com/SAP/open-ux-tools.git",
@@ -25,9 +25,9 @@
     "i18next": "23.5.1",
     "inquirer-autocomplete-prompt": "2.0.1",
     "yeoman-generator": "5.10.0",
-    "@sap-ux/cf-deploy-config-sub-generator": "0.1.27",
     "@sap-ux/axios-extension": "1.19.1",
     "@sap-ux/btp-utils": "1.0.2",
+    "@sap-ux/cf-deploy-config-sub-generator": "0.1.28",
     "@sap-ux/abap-deploy-config-sub-generator": "0.0.51",
     "@sap-ux/deploy-config-generator-shared": "0.0.37",
     "@sap-ux/fiori-generator-shared": "0.9.9",
@@ -57,7 +57,7 @@
     "typescript": "5.3.3",
     "unionfs": "4.4.0",
     "yeoman-test": "6.3.0",
-    "@sap-ux/cf-deploy-config-inquirer": "0.2.18",
+    "@sap-ux/cf-deploy-config-inquirer": "0.2.19",
     "@sap-ux/cf-deploy-config-writer": "0.1.22",
     "@sap-ux/logger": "0.6.0"
   },