@sap-ux/repo-app-import-sub-generator 0.3.15 → 0.3.16

package/generators/app/app-config.js

@@ -46,7 +46,9 @@ exports.getAbapDeployConfig = getAbapDeployConfig;
  */
 const fetchServiceMetadata = async (provider, serviceUrl) => {
     try {
-        return await provider.service(serviceUrl).metadata();
+        const metdata = await provider.service(serviceUrl).metadata();
+        logger_1.default.logger?.debug('Metadata fetched successfully');
+        return metdata;
     }
     catch (err) {
         logger_1.default.logger?.error((0, i18n_1.t)('error.metadataFetchError', { error: err.message }));

package/generators/app/index.js

@@ -94,7 +94,7 @@ class default_1 extends yeoman_generator_1.default {
      */
     async prompting() {
         const quickDeployedAppConfig = this.options?.data?.quickDeployedAppConfig;
-        const questions = await (0, prompts_1.getPrompts)(this.appRootPath, quickDeployedAppConfig, this.appWizard);
+        const questions = await (0, prompts_1.getPrompts)(this.appRootPath, quickDeployedAppConfig, this.appWizard, (0, fiori_generator_shared_1.isCli)());
         const answers = await this.prompt(questions);
         const { targetFolder } = answers;
         if (quickDeployedAppConfig?.appId) {
@@ -203,7 +203,9 @@ class default_1 extends yeoman_generator_1.default {
     async install() {
         if (!this.options.skipInstall) {
             try {
+                logger_1.default.logger?.debug('Running npm install...');
                 await this._runNpmInstall(this.projectPath);
+                logger_1.default.logger?.debug('npm install completed successfully.');
             }
             catch (error) {
                 logger_1.default.logger?.error((0, i18n_1.t)('error.installationErrors.npmInstall', { error }));

package/generators/prompts/prompt-helpers.js

@@ -57,9 +57,13 @@ exports.extractAppData = extractAppData;
 const formatAppChoices = (appList) => {
     return appList
         .filter((app) => {
-        const hasRequiredFields = app['sap.app/id'] && app['sap.app/title'] && app['repoName'] && app['url'];
+        logger_1.default.logger?.debug(`formatAppChoices: ${JSON.stringify(app)}`);
+        const hasRequiredFields = app['sap.app/id'] &&
+            app['repoName'] &&
+            app['url'] &&
+            Object.prototype.hasOwnProperty.call(app, 'sap.app/title'); // allow for empty title
         if (!hasRequiredFields) {
-            logger_1.default.logger?.warn((0, i18n_1.t)('warn.requiredFieldsMissing', { app: app.appId }));
+            logger_1.default.logger?.warn((0, i18n_1.t)('warn.requiredFieldsMissing', { app: app['sap.app/id'] }));
         }
         return hasRequiredFields;
     })
@@ -85,6 +89,7 @@ async function getAppList(provider, appId) {
     }
     catch (error) {
         logger_1.default.logger?.error((0, i18n_1.t)('error.applicationListFetchError', { error: error.message }));
+        logger_1.default.logger?.debug((0, i18n_1.t)('error.applicationListFetchError', { error: JSON.stringify(error) }));
         return [];
     }
 }

package/generators/prompts/prompts.d.ts

@@ -6,7 +6,8 @@ import type { AppWizard } from '@sap-devx/yeoman-ui-types';
  * @param {string} [appRootPath] - The root path of the application.
  * @param {QuickDeployedAppConfig} [quickDeployedAppConfig] - The quick deployed app configuration.
  * @param {AppWizard} [appWizard] - The app wizard instance.
+ * @param {boolean} [isCli] - Indicates if the prompts are being generated for CLI usage.
  * @returns {Promise<RepoAppDownloadQuestions[]>} A list of prompts for user interaction.
  */
-export declare function getPrompts(appRootPath?: string, quickDeployedAppConfig?: QuickDeployedAppConfig, appWizard?: AppWizard): Promise<RepoAppDownloadQuestions[]>;
+export declare function getPrompts(appRootPath?: string, quickDeployedAppConfig?: QuickDeployedAppConfig, appWizard?: AppWizard, isCli?: boolean): Promise<RepoAppDownloadQuestions[]>;
 //# sourceMappingURL=prompts.d.ts.map

package/generators/prompts/prompts.js

@@ -1,4 +1,7 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getPrompts = void 0;
 const odata_service_inquirer_1 = require("@sap-ux/odata-service-inquirer");
@@ -8,6 +11,7 @@ const project_input_validator_1 = require("@sap-ux/project-input-validator");
 const prompt_state_1 = require("./prompt-state");
 const prompt_helpers_1 = require("./prompt-helpers");
 const validators_1 = require("../utils/validators");
+const logger_1 = __importDefault(require("../utils/logger"));
 /**
  * Gets the target folder selection prompt.
  *
@@ -43,23 +47,45 @@ const getTargetFolderPrompt = (appRootPath, appId) => {
         default: () => appRootPath
     };
 };
+const getCliValidatePrompts = async (appList, quickDeployedAppConfig, appWizard) => {
+    return {
+        when: async (answers) => {
+            if (answers?.[types_1.PromptNames.selectedApp]) {
+                try {
+                    await (0, validators_1.validateAppSelection)(answers[types_1.PromptNames.selectedApp], appList, quickDeployedAppConfig, appWizard);
+                }
+                catch (error) {
+                    if (error instanceof Error) {
+                        logger_1.default.logger?.error(error.message);
+                    }
+                    else {
+                        logger_1.default.logger?.error((0, i18n_1.t)('error.appDownloadErrors.validationError', { error: error }));
+                    }
+                }
+            }
+            return false;
+        },
+        name: `${types_1.PromptNames.selectedApp}-validation`
+    };
+};
 /**
  * Retrieves prompts for selecting a system, app list, and target folder where the app will be generated.
  *
  * @param {string} [appRootPath] - The root path of the application.
  * @param {QuickDeployedAppConfig} [quickDeployedAppConfig] - The quick deployed app configuration.
  * @param {AppWizard} [appWizard] - The app wizard instance.
+ * @param {boolean} [isCli] - Indicates if the prompts are being generated for CLI usage.
  * @returns {Promise<RepoAppDownloadQuestions[]>} A list of prompts for user interaction.
  */
-async function getPrompts(appRootPath, quickDeployedAppConfig, appWizard) {
+async function getPrompts(appRootPath, quickDeployedAppConfig, appWizard, isCli = false) {
     try {
         prompt_state_1.PromptState.reset();
         const systemQuestions = await (0, odata_service_inquirer_1.getSystemSelectionQuestions)({
-            serviceSelection: { hide: true },
+            serviceSelection: { hide: true, useAutoComplete: isCli },
             systemSelection: { defaultChoice: quickDeployedAppConfig?.serviceProviderInfo?.name }
-        }, true);
+        }, !isCli);
         let appList = [];
-        const appSelectionPrompt = [
+        const appSelectionPrompts = [
             {
                 when: async (answers) => {
                     if (answers[types_1.PromptNames.systemSelection] &&
@@ -78,11 +104,18 @@ async function getPrompts(appRootPath, quickDeployedAppConfig, appWizard) {
                 },
                 message: (0, i18n_1.t)('prompts.appSelection.message'),
                 choices: () => (appList.length ? (0, prompt_helpers_1.formatAppChoices)(appList) : []),
-                validate: async (answers) => (0, validators_1.validateAppSelection)(answers, appList, quickDeployedAppConfig, appWizard)
+                validate: async (answers) => {
+                    const result = await (0, validators_1.validateAppSelection)(answers, appList, quickDeployedAppConfig, appWizard);
+                    return !!result;
+                }
             }
         ];
+        // Only for CLI use as `list` prompt validation does not run on CLI unless autocomplete plugin is used
+        if (isCli) {
+            appSelectionPrompts?.push(getCliValidatePrompts(appList, quickDeployedAppConfig, appWizard));
+        }
         const targetFolderPrompts = getTargetFolderPrompt(appRootPath, quickDeployedAppConfig?.appId);
-        return [...systemQuestions.prompts, ...appSelectionPrompt, targetFolderPrompts];
+        return [...systemQuestions.prompts, ...appSelectionPrompts, targetFolderPrompts];
     }
     catch (error) {
         throw new Error(`Failed to generate prompts: ${error.message}`);

package/generators/utils/download-utils.js

@@ -32,6 +32,8 @@ async function extractZip(extractedProjectPath, fs) {
             if (!zipEntry.isDirectory) {
                 // Extract the file content
                 const fileContent = zipEntry.getData().toString('utf8');
+                const filePath = (0, path_1.join)(extractedProjectPath, zipEntry.entryName);
+                logger_1.default.logger?.debug(`extractZip: Extracting file: "${filePath}" with contents: "${fileContent}" .`);
                 // Load the file content into mem-fs for use in the temporary extracted project directory
                 fs.write((0, path_1.join)(extractedProjectPath, zipEntry.entryName), fileContent);
             }
@@ -49,7 +51,11 @@ exports.extractZip = extractZip;
  */
 async function downloadApp(repoName) {
     const serviceProvider = prompt_state_1.PromptState.systemSelection?.connectedSystem?.serviceProvider;
-    const downloadedAppPackage = await serviceProvider.getUi5AbapRepository().downloadFiles(repoName);
+    const ui5AbapRepository = await serviceProvider.getUi5AbapRepository();
+    ui5AbapRepository.log = logger_1.default.logger;
+    logger_1.default.logger?.debug(`App download started: ${repoName}`);
+    const downloadedAppPackage = await ui5AbapRepository.downloadFiles(repoName);
+    logger_1.default.logger?.debug(`App download completed: ${repoName}`);
     // store downloaded package in prompt state
     prompt_state_1.PromptState.admZip = downloadedAppPackage;
 }

package/generators/utils/updates.js

@@ -75,7 +75,21 @@ async function replaceWebappFiles(projectPath, extractedPath, fs) {
             const extractedFilePath = (0, path_1.join)(extractedPath, extractedFile);
             // Check if the extracted file exists before replacing
             if (fs.exists(extractedFilePath)) {
-                fs.copy(extractedFilePath, webappFilePath);
+                if (extractedFile === project_access_1.FileName.Manifest) {
+                    // Use datasource and model from the generated manifest
+                    const extractedManifestJSON = fs.readJSON(extractedFilePath);
+                    const generatedManifestJSON = fs.readJSON(webappFilePath);
+                    if (generatedManifestJSON?.['sap.app']?.dataSources && extractedManifestJSON?.['sap.app']) {
+                        extractedManifestJSON['sap.app'].dataSources = generatedManifestJSON['sap.app'].dataSources;
+                    }
+                    if (generatedManifestJSON?.['sap.ui5']?.models && extractedManifestJSON?.['sap.ui5']) {
+                        extractedManifestJSON['sap.ui5'].models = generatedManifestJSON['sap.ui5']?.models;
+                    }
+                    fs.writeJSON(webappFilePath, extractedManifestJSON, undefined, 2);
+                }
+                else {
+                    fs.copy(extractedFilePath, webappFilePath);
+                }
             }
             else {
                 logger_1.default.logger?.warn((0, i18n_1.t)('warn.extractedFileNotFound', { extractedFilePath }));

package/generators/utils/validators.js

@@ -133,6 +133,7 @@ async function validateAppSelection(answers, appList, quickDeployedAppConfig, ap
             return isQfaJsonPresent;
         }
         catch (error) {
+            logger_1.default.logger?.debug(`validateAppSelection: Error downloading app: ${error.message}`);
             return (0, i18n_1.t)('error.appDownloadErrors.appDownloadFailure', { error: error.message });
         }
     }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@sap-ux/repo-app-import-sub-generator",
   "description": "Generator to download LROP Fiori applications deployed from an ABAP repository.",
-  "version": "0.3.15",
+  "version": "0.3.16",
   "repository": {
     "type": "git",
     "url": "https://github.com/SAP/open-ux-tools.git",
@@ -25,21 +25,22 @@
     "inquirer": "8.2.6",
     "yeoman-generator": "5.10.0",
     "@sap-ux/feature-toggle": "0.3.0",
-    "@sap-ux/project-access": "1.30.2",
     "@sap-ux/inquirer-common": "0.7.5",
-    "@sap-ux/fiori-generator-shared": "0.12.4",
+    "@sap-ux/project-access": "1.30.2",
     "@sap-ux/odata-service-inquirer": "2.4.10",
     "@sap-ux/logger": "0.7.0",
-    "@sap-ux/fiori-elements-writer": "2.4.10",
     "@sap-ux/project-input-validator": "0.6.2",
+    "@sap-ux/fiori-elements-writer": "2.4.10",
     "@sap-ux/launch-config": "0.10.2",
+    "@sap-ux/fiori-generator-shared": "0.12.4",
     "@sap-ux/fiori-tools-settings": "0.2.0",
     "@sap-ux/abap-deploy-config-writer": "0.1.3",
     "@sap-ux/btp-utils": "1.1.0",
-    "@sap-ux/ui5-info": "0.11.0",
     "@sap-ux/axios-extension": "1.21.1",
-    "@sap-ux/store": "1.1.0",
-    "@sap-ux/guided-answers-helper": "0.3.0"
+    "@sap-ux/ui5-info": "0.11.0",
+    "@sap-ux/system-access": "0.6.1",
+    "@sap-ux/guided-answers-helper": "0.3.0",
+    "@sap-ux/store": "1.1.0"
   },
   "devDependencies": {
     "@jest/types": "29.6.3",
@@ -65,8 +66,8 @@
     "yeoman-test": "6.3.0",
     "yo": "4",
     "@sap-ux/nodejs-utils": "0.2.0",
-    "@sap-ux/store": "1.1.0",
-    "@sap-ux/ui5-config": "0.28.2"
+    "@sap-ux/ui5-config": "0.28.2",
+    "@sap-ux/store": "1.1.0"
   },
   "engines": {
     "node": ">=20.x"