@sap-ux/generator-adp 0.7.11 → 0.7.13

package/generators/app/index.js

@@ -9,7 +9,6 @@ const yeoman_generator_1 = __importDefault(require("yeoman-generator"));
 const yeoman_ui_types_1 = require("@sap-devx/yeoman-ui-types");
 const adp_tooling_1 = require("@sap-ux/adp-tooling");
 const fiori_generator_shared_1 = require("@sap-ux/fiori-generator-shared");
-const btp_utils_1 = require("@sap-ux/btp-utils");
 const logger_1 = require("@sap-ux/logger");
 const feature_toggle_1 = require("@sap-ux/feature-toggle");
 const telemetryEvents_1 = require("../telemetryEvents");
@@ -155,10 +154,6 @@ class default_1 extends yeoman_generator_1.default {
         this.logger.debug(`isCfFeatureEnabled: ${this.isCfFeatureEnabled}`);
         const jsonInputString = (0, parse_json_input_1.getFirstArgAsString)(args);
         this.jsonInput = (0, parse_json_input_1.parseJsonInput)(jsonInputString, this.logger);
-        // Force the generator to overwrite existing files without additional prompting
-        if (this.env.conflicter) {
-            this.env.conflicter.force = this.options.force ?? true;
-        }
         if (!this.jsonInput) {
             this.env.lookup({
                 packagePatterns: ['@sap/generator-fiori', '@bas-dev/generator-extensibility-sub']
@@ -174,6 +169,10 @@ class default_1 extends yeoman_generator_1.default {
         }
     }
     async initializing() {
+        // Force the generator to overwrite existing files without additional prompting
+        if (this.env.conflicter) {
+            this.env.conflicter.force = this.options.force ?? true;
+        }
         await (0, i18n_1.initI18n)();
         this.isCli = (0, fiori_generator_shared_1.isCli)();
         this.layer = (0, layer_1.getFlexLayer)();
@@ -185,7 +184,7 @@ class default_1 extends yeoman_generator_1.default {
         this.logger.info(`isCfInstalled: ${this.cfInstalled}`);
         const isInternalUsage = (0, feature_toggle_1.isInternalFeaturesSettingEnabled)();
         if (!this.jsonInput) {
-            const shouldShowTargetEnv = (0, btp_utils_1.isAppStudio)() && this.cfInstalled && this.isCfFeatureEnabled;
+            const shouldShowTargetEnv = this.cfInstalled && this.isCfFeatureEnabled;
             this.prompts.splice(0, 0, (0, steps_1.getWizardPages)(shouldShowTargetEnv));
             this.prompter = this._getOrCreatePrompter();
             this.cfPrompter = new cf_services_1.CFServicesPrompter(isInternalUsage, this.isCfLoggedIn, this.logger);
@@ -308,7 +307,7 @@ class default_1 extends yeoman_generator_1.default {
         }
     }
     async install() {
-        if (!this.shouldInstallDeps || this.shouldCreateExtProject || this.isCfEnv) {
+        if (!this.shouldInstallDeps || this.shouldCreateExtProject) {
             return;
         }
         try {
@@ -319,7 +318,7 @@ class default_1 extends yeoman_generator_1.default {
         }
     }
     async end() {
-        if (this.shouldCreateExtProject || this.isCfEnv) {
+        if (this.shouldCreateExtProject) {
             return;
         }
         const telemetryData = fiori_generator_shared_1.TelemetryHelper.createTelemetryData({
@@ -332,7 +331,7 @@ class default_1 extends yeoman_generator_1.default {
                 this.logger.error((0, i18n_1.t)('error.telemetry', { error }));
             });
         }
-        if (this.isCli) {
+        if (this.isCli || this.isCfEnv) {
             return;
         }
         try {
@@ -371,7 +370,7 @@ class default_1 extends yeoman_generator_1.default {
      */
     async _determineTargetEnv() {
         const hasRequiredExtensions = this.isCfFeatureEnabled && this.cfInstalled;
-        if ((0, btp_utils_1.isAppStudio)() && hasRequiredExtensions) {
+        if (hasRequiredExtensions) {
             await this._promptForTargetEnvironment();
         }
         else {
@@ -383,7 +382,7 @@ class default_1 extends yeoman_generator_1.default {
      */
     async _promptForTargetEnvironment() {
         const targetEnvAnswers = await this.prompt([
-            (0, target_env_1.getTargetEnvPrompt)(this.appWizard, this.cfInstalled, this.isCfLoggedIn, this.cfConfig, this.vscode)
+            (0, target_env_1.getTargetEnvPrompt)(this.appWizard, this.cfInstalled, this.isCfLoggedIn, this.cfConfig)
         ]);
         this.targetEnv = targetEnvAnswers.targetEnv;
         this.isCfEnv = this.targetEnv === types_1.TargetEnv.CF;
@@ -439,13 +438,16 @@ class default_1 extends yeoman_generator_1.default {
      * Generates the ADP project artifacts for the CF environment.
      */
     async _generateAdpProjectArtifactsCF() {
-        const projectPath = this.isMtaYamlFound ? process.cwd() : this.destinationPath();
+        const projectPath = this.destinationPath();
         const publicVersions = await (0, adp_tooling_1.fetchPublicVersions)(this.logger);
         const manifest = this.cfPrompter.manifest;
         if (!manifest) {
             throw new Error('Manifest not found for base app.');
         }
-        const html5RepoRuntimeGuid = this.cfPrompter.serviceInstanceGuid;
+        const html5RepoRuntimeGuid = this.cfPrompter.html5RepoRuntimeGuid;
+        const serviceInstanceGuid = this.cfPrompter.serviceInstanceGuid;
+        const backendUrl = this.cfPrompter.backendUrl;
+        const oauthPaths = this.cfPrompter.oauthPaths;
         const config = (0, adp_tooling_1.getCfConfig)({
             attributeAnswers: this.attributeAnswers,
             cfServicesAnswers: this.cfServicesAnswers,
@@ -453,6 +455,9 @@ class default_1 extends yeoman_generator_1.default {
             layer: this.layer,
             manifest,
             html5RepoRuntimeGuid,
+            serviceInstanceGuid,
+            backendUrl,
+            oauthPaths,
             projectPath,
             publicVersions
         });
@@ -467,6 +472,9 @@ class default_1 extends yeoman_generator_1.default {
      * @returns {string} The project path from the answers.
      */
     _getProjectPath() {
+        if (this.isCfEnv) {
+            return (0, node_path_1.join)(this.destinationPath(), this.attributeAnswers.projectName);
+        }
         return (0, node_path_1.join)(this.attributeAnswers.targetFolder, this.attributeAnswers.projectName);
     }
     /**

package/generators/app/questions/cf-services.d.ts

@@ -39,6 +39,10 @@ export declare class CFServicesPrompter {
      * The manifest.
      */
     private appManifest;
+    /**
+     * The zip entries from the downloaded app content.
+     */
+    private appContentEntries;
     /**
      * Returns the loaded application manifest.
      *
@@ -46,11 +50,29 @@ export declare class CFServicesPrompter {
      */
     get manifest(): Manifest | undefined;
     /**
-     * Returns the service instance GUID.
+     * Returns the HTML5 repo service instance GUID.
+     *
+     * @returns {string} HTML5 repo service instance GUID.
+     */
+    get html5RepoRuntimeGuid(): string;
+    /**
+     * Returns the business service instance GUID.
+     *
+     * @returns {string | undefined} Business service instance GUID.
+     */
+    get serviceInstanceGuid(): string | undefined;
+    /**
+     * Returns the backend URL from service keys endpoints.
+     *
+     * @returns {string | undefined} Backend URL from the first endpoint that has a url property, or undefined.
+     */
+    get backendUrl(): string | undefined;
+    /**
+     * Returns the OAuth paths extracted from xs-app.json routes that have a source property.
      *
-     * @returns Service instance GUID.
+     * @returns {string[]} Array of path patterns that should receive OAuth Bearer tokens.
      */
-    get serviceInstanceGuid(): string;
+    get oauthPaths(): string[];
     /**
      * Constructor for CFServicesPrompter.
      *

package/generators/app/questions/cf-services.js

@@ -49,6 +49,10 @@ class CFServicesPrompter {
      * The manifest.
      */
     appManifest;
+    /**
+     * The zip entries from the downloaded app content.
+     */
+    appContentEntries;
     /**
      * Returns the loaded application manifest.
      *
@@ -58,13 +62,41 @@ class CFServicesPrompter {
         return this.appManifest;
     }
     /**
-     * Returns the service instance GUID.
+     * Returns the HTML5 repo service instance GUID.
      *
-     * @returns Service instance GUID.
+     * @returns {string} HTML5 repo service instance GUID.
      */
-    get serviceInstanceGuid() {
+    get html5RepoRuntimeGuid() {
         return this.html5RepoServiceInstanceGuid;
     }
+    /**
+     * Returns the business service instance GUID.
+     *
+     * @returns {string | undefined} Business service instance GUID.
+     */
+    get serviceInstanceGuid() {
+        return this.businessServiceInfo?.serviceInstance?.guid;
+    }
+    /**
+     * Returns the backend URL from service keys endpoints.
+     *
+     * @returns {string | undefined} Backend URL from the first endpoint that has a url property, or undefined.
+     */
+    get backendUrl() {
+        const serviceKeys = this.businessServiceInfo?.serviceKeys ?? [];
+        return (0, adp_tooling_1.getBackendUrlFromServiceKeys)(serviceKeys);
+    }
+    /**
+     * Returns the OAuth paths extracted from xs-app.json routes that have a source property.
+     *
+     * @returns {string[]} Array of path patterns that should receive OAuth Bearer tokens.
+     */
+    get oauthPaths() {
+        if (!this.appContentEntries) {
+            return [];
+        }
+        return (0, adp_tooling_1.getOAuthPathsFromXsApp)(this.appContentEntries);
+    }
     /**
      * Constructor for CFServicesPrompter.
      *
@@ -188,6 +220,7 @@ class CFServicesPrompter {
                     const { entries, serviceInstanceGuid, manifest } = await (0, adp_tooling_1.downloadAppContent)(cfConfig.space.GUID, app, this.logger);
                     this.appManifest = manifest;
                     this.html5RepoServiceInstanceGuid = serviceInstanceGuid;
+                    this.appContentEntries = entries;
                     await (0, adp_tooling_1.validateSmartTemplateApplication)(manifest);
                     await (0, adp_tooling_1.validateODataEndpoints)(entries, this.businessServiceInfo.serviceKeys, this.logger);
                 }

package/generators/app/questions/helper/validators.d.ts

@@ -46,10 +46,9 @@ export declare function validateJsonInput(systemLookup: SystemLookup, isCustomer
  *
  * @param {string} value - The value to validate.
  * @param {boolean} isCFLoggedIn - Whether Cloud Foundry is logged in.
- * @param {any} vscode - The vscode instance.
  * @returns {Promise<string | boolean>} Returns true if the environment is valid, otherwise returns an error message.
  */
-export declare function validateEnvironment(value: string, isCFLoggedIn: boolean, vscode: any): Promise<string | boolean>;
+export declare function validateEnvironment(value: string, isCFLoggedIn: boolean): Promise<string | boolean>;
 /**
  * Validates the project path.
  *

package/generators/app/questions/helper/validators.js

@@ -9,7 +9,6 @@ exports.validateEnvironment = validateEnvironment;
 exports.validateProjectPath = validateProjectPath;
 exports.validateBusinessSolutionName = validateBusinessSolutionName;
 const node_fs_1 = __importDefault(require("node:fs"));
-const btp_utils_1 = require("@sap-ux/btp-utils");
 const adp_tooling_1 = require("@sap-ux/adp-tooling");
 const project_input_validator_1 = require("@sap-ux/project-input-validator");
 const i18n_1 = require("../../../utils/i18n");
@@ -69,19 +68,12 @@ async function validateJsonInput(systemLookup, isCustomerBase, { projectName, ta
  *
  * @param {string} value - The value to validate.
  * @param {boolean} isCFLoggedIn - Whether Cloud Foundry is logged in.
- * @param {any} vscode - The vscode instance.
  * @returns {Promise<string | boolean>} Returns true if the environment is valid, otherwise returns an error message.
  */
-async function validateEnvironment(value, isCFLoggedIn, vscode) {
+async function validateEnvironment(value, isCFLoggedIn) {
     if (value === 'CF' && !isCFLoggedIn) {
         return (0, i18n_1.t)('error.cfNotLoggedIn');
     }
-    if (value === 'CF' && !(0, btp_utils_1.isAppStudio)()) {
-        const isExtLoginEnabled = await (0, adp_tooling_1.isExternalLoginEnabled)(vscode);
-        if (!isExtLoginEnabled) {
-            return (0, i18n_1.t)('error.cfLoginCannotBeDetected');
-        }
-    }
     return true;
 }
 /**

package/generators/app/questions/target-env.d.ts

@@ -15,10 +15,9 @@ type EnvironmentChoice = {
  * @param {boolean} isCfInstalled - Whether Cloud Foundry is installed.
  * @param {boolean} isCFLoggedIn - Whether Cloud Foundry is logged in.
  * @param {CfConfig} cfConfig - The CF config service instance.
- * @param {any} vscode - The vscode instance.
  * @returns {object[]} The target environment prompt.
  */
-export declare function getTargetEnvPrompt(appWizard: AppWizard, isCfInstalled: boolean, isCFLoggedIn: boolean, cfConfig: CfConfig, vscode: any): TargetEnvQuestion;
+export declare function getTargetEnvPrompt(appWizard: AppWizard, isCfInstalled: boolean, isCFLoggedIn: boolean, cfConfig: CfConfig): TargetEnvQuestion;
 /**
  * Returns the environments.
  *

package/generators/app/questions/target-env.js

@@ -16,10 +16,9 @@ const validators_1 = require("./helper/validators");
  * @param {boolean} isCfInstalled - Whether Cloud Foundry is installed.
  * @param {boolean} isCFLoggedIn - Whether Cloud Foundry is logged in.
  * @param {CfConfig} cfConfig - The CF config service instance.
- * @param {any} vscode - The vscode instance.
  * @returns {object[]} The target environment prompt.
  */
-function getTargetEnvPrompt(appWizard, isCfInstalled, isCFLoggedIn, cfConfig, vscode) {
+function getTargetEnvPrompt(appWizard, isCfInstalled, isCFLoggedIn, cfConfig) {
     return {
         type: 'list',
         name: 'targetEnv',
@@ -31,7 +30,7 @@ function getTargetEnvPrompt(appWizard, isCfInstalled, isCFLoggedIn, cfConfig, vs
             hint: (0, i18n_1.t)('prompts.targetEnvTooltip'),
             breadcrumb: (0, i18n_1.t)('prompts.targetEnvBreadcrumb')
         },
-        validate: (value) => (0, validators_1.validateEnvironment)(value, isCFLoggedIn, vscode),
+        validate: (value) => (0, validators_1.validateEnvironment)(value, isCFLoggedIn),
         additionalMessages: (value) => (0, additional_messages_1.getTargetEnvAdditionalMessages)(value, isCFLoggedIn, cfConfig)
     };
 }

package/package.json

@@ -3,7 +3,7 @@
   "displayName": "SAPUI5 Adaptation Project",
   "homepage": "https://help.sap.com/viewer/584e0bcbfd4a4aff91c815cefa0bce2d/Cloud/en-US/ada9567b767941aba8d49fdb4fdedea7.html",
   "description": "Adaptation project allows you to create an app variant for an existing SAP Fiori elements-based or SAPUI5 freestyle application, without changing the original application.",
-  "version": "0.7.11",
+  "version": "0.7.13",
   "repository": {
     "type": "git",
     "url": "https://github.com/SAP/open-ux-tools.git",
@@ -30,18 +30,18 @@
     "i18next": "25.3.0",
     "yeoman-generator": "5.10.0",
     "uuid": "10.0.0",
-    "@sap-ux/adp-tooling": "0.18.11",
+    "@sap-ux/adp-tooling": "0.18.13",
     "@sap-ux/axios-extension": "1.24.3",
-    "@sap-ux/btp-utils": "1.1.5",
     "@sap-ux/feature-toggle": "0.3.4",
-    "@sap-ux/inquirer-common": "0.9.8",
+    "@sap-ux/btp-utils": "1.1.5",
+    "@sap-ux/inquirer-common": "0.9.9",
     "@sap-ux/logger": "0.7.1",
-    "@sap-ux/project-access": "1.32.11",
+    "@sap-ux/project-access": "1.32.12",
     "@sap-ux/store": "1.3.3",
     "@sap-ux/system-access": "0.6.29",
-    "@sap-ux/project-input-validator": "0.6.33",
-    "@sap-ux/fiori-generator-shared": "0.13.36",
-    "@sap-ux/odata-service-writer": "0.27.32"
+    "@sap-ux/fiori-generator-shared": "0.13.37",
+    "@sap-ux/project-input-validator": "0.6.34",
+    "@sap-ux/odata-service-writer": "0.27.33"
   },
   "devDependencies": {
     "@jest/types": "30.0.1",
@@ -56,7 +56,7 @@
     "fs-extra": "10.0.0",
     "rimraf": "6.0.1",
     "yeoman-test": "6.3.0",
-    "@sap-ux/deploy-config-sub-generator": "0.5.9"
+    "@sap-ux/deploy-config-sub-generator": "0.5.10"
   },
   "engines": {
     "node": ">=20.x"