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

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.
  */
@@ -67,16 +67,6 @@ 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.
@@ -91,7 +81,7 @@ class default_1 extends deploy_config_generator_shared_1.DeploymentGenerator {
             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));
+        ({ 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 +117,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 +150,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

@@ -7,14 +7,4 @@ 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;
-}[];
 //# sourceMappingURL=utils.d.ts.map

package/generators/app/utils.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getYUIDetails = exports.parseTarget = void 0;
-const path_1 = require("path");
+exports.parseTarget = void 0;
 /**
  * Parses the target from the CLI args or the options.
  *
@@ -23,19 +22,4 @@ 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;
 //# sourceMappingURL=utils.js.map

package/generators/utils/config.js

@@ -29,7 +29,7 @@ async function getBackendConfig(fs, options, launchStandaloneFromYui, projectRoo
     else {
         // Launched as subgenerator from app gen
         backendConfig = {
-            destination: options.connectedSystem?.destination?.Name,
+            destination: options.appGenDestination || options.connectedSystem?.destination?.Name,
             url: options.appGenServiceHost,
             client: options.appGenClient,
             scp: !!options.connectedSystem?.backendSystem?.serviceKeys || false

package/generators/utils/constants.d.ts

@@ -2,5 +2,4 @@ import type { Target } from '../types';
 export declare const generatorNamespace: (bundledRootGeneratorName: string, subGenName: string) => string;
 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,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.generatorTitle = exports.cfChoice = exports.abapChoice = exports.generatorNamespace = void 0;
+exports.cfChoice = exports.abapChoice = 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.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.4",
+  "version": "0.0.7",
   "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/cf-deploy-config-sub-generator": "0.1.26",
-    "@sap-ux/abap-deploy-config-sub-generator": "0.0.50",
-    "@sap-ux/btp-utils": "1.0.1",
-    "@sap-ux/deploy-config-generator-shared": "0.0.36",
-    "@sap-ux/fiori-generator-shared": "0.9.8",
+    "@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/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",
     "@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/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/store": "1.0.0",
-    "@sap-ux/ui5-config": "0.26.3"
+    "@sap-ux/ui5-config": "0.26.4"
   },
   "devDependencies": {
     "@jest/types": "29.6.3",
@@ -57,8 +57,8 @@
     "typescript": "5.3.3",
     "unionfs": "4.4.0",
     "yeoman-test": "6.3.0",
-    "@sap-ux/cf-deploy-config-writer": "0.1.21",
-    "@sap-ux/cf-deploy-config-inquirer": "0.2.17",
+    "@sap-ux/cf-deploy-config-inquirer": "0.2.18",
+    "@sap-ux/cf-deploy-config-writer": "0.1.22",
     "@sap-ux/logger": "0.6.0"
   },
   "engines": {