@sap-ux/deploy-config-sub-generator 0.0.5 → 0.0.8

package/generators/app/index.js

@@ -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;
@@ -90,8 +91,8 @@ 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;
-        ({ backendConfig: this.backendConfig, isLibrary: this.isLibrary } = await (0, utils_2.getBackendConfig)(this.fs, this.options, this.launchStandaloneFromYui, this.options.projectRoot));
+        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,
             servicePath: this.options.appGenServicePath
@@ -127,7 +128,7 @@ class default_1 extends deploy_config_generator_shared_1.DeploymentGenerator {
             this.target = target;
             this.answers = answers;
         }
-        if (this.answers?.confirmConfigUpdate !== false && this.target) {
+        if (this.target) {
             this._composeWithSubGenerator(this.target, this.answers);
         }
         else {
@@ -160,7 +161,7 @@ class default_1 extends deploy_config_generator_shared_1.DeploymentGenerator {
             this.composeWith((0, utils_2.generatorNamespace)(this.genNamespace, generatorName), subGenOpts);
         }
         catch (error) {
-            deploy_config_generator_shared_1.DeploymentGenerator.logger?.error(error);
+            deploy_config_generator_shared_1.DeploymentGenerator.logger?.error(error.message);
         }
     }
 }

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.
  *
@@ -17,4 +18,13 @@ 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,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getYUIDetails = 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.
@@ -38,4 +38,18 @@ function getYUIDetails(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,6 +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;
-export declare const generatorTitle = "Deployment Configuration Generator";
 //# sourceMappingURL=constants.d.ts.map

package/generators/utils/constants.js

@@ -1,11 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.generatorTitle = 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' };
-exports.generatorTitle = 'Deployment Configuration Generator';
 //# 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.5",
+  "version": "0.0.8",
   "repository": {
     "type": "git",
     "url": "https://github.com/SAP/open-ux-tools.git",
@@ -25,19 +25,19 @@
     "i18next": "23.5.1",
     "inquirer-autocomplete-prompt": "2.0.1",
     "yeoman-generator": "5.10.0",
-    "@sap-ux/axios-extension": "1.19.0",
-    "@sap-ux/btp-utils": "1.0.1",
-    "@sap-ux/cf-deploy-config-sub-generator": "0.1.26",
-    "@sap-ux/deploy-config-generator-shared": "0.0.36",
-    "@sap-ux/abap-deploy-config-sub-generator": "0.0.50",
-    "@sap-ux/fiori-generator-shared": "0.9.8",
+    "@sap-ux/axios-extension": "1.19.1",
+    "@sap-ux/btp-utils": "1.0.2",
+    "@sap-ux/abap-deploy-config-sub-generator": "0.0.51",
+    "@sap-ux/cf-deploy-config-sub-generator": "0.1.27",
+    "@sap-ux/deploy-config-generator-shared": "0.0.37",
+    "@sap-ux/fiori-generator-shared": "0.9.9",
     "@sap-ux/i18n": "0.2.3",
-    "@sap-ux/inquirer-common": "0.6.28",
-    "@sap-ux/nodejs-utils": "0.1.7",
-    "@sap-ux/odata-service-inquirer": "2.2.20",
-    "@sap-ux/project-access": "1.29.15",
-    "@sap-ux/store": "1.0.0",
-    "@sap-ux/ui5-config": "0.26.3"
+    "@sap-ux/inquirer-common": "0.6.29",
+    "@sap-ux/nodejs-utils": "0.1.8",
+    "@sap-ux/odata-service-inquirer": "2.2.21",
+    "@sap-ux/project-access": "1.29.16",
+    "@sap-ux/ui5-config": "0.26.4",
+    "@sap-ux/store": "1.0.0"
   },
   "devDependencies": {
     "@jest/types": "29.6.3",
@@ -57,9 +57,9 @@
     "typescript": "5.3.3",
     "unionfs": "4.4.0",
     "yeoman-test": "6.3.0",
-    "@sap-ux/cf-deploy-config-inquirer": "0.2.17",
-    "@sap-ux/logger": "0.6.0",
-    "@sap-ux/cf-deploy-config-writer": "0.1.21"
+    "@sap-ux/cf-deploy-config-writer": "0.1.22",
+    "@sap-ux/cf-deploy-config-inquirer": "0.2.18",
+    "@sap-ux/logger": "0.6.0"
   },
   "engines": {
     "node": ">=18.x"