@sap-ux/repo-app-import-sub-generator 1.1.31 → 1.1.32

package/generators/app/index.js

@@ -7,6 +7,7 @@ import { t } from '../utils/i18n.js';
 import { extractZip } from '../utils/download-utils.js';
 import { EventName } from '../telemetryEvents/index.js';
 import { getDefaultTargetFolder, generateAppGenInfo, sendTelemetry, TelemetryHelper, isCli, setYeomanEnvConflicterForce } from '@sap-ux/fiori-generator-shared';
+import { getFloorplanLabel } from '@sap-ux/fiori-app-sub-generator';
 import { AppDownloadType, PromptNames } from './types.js';
 import { getPrompts } from '../prompts/prompts.js';
 import { generate } from '@sap-ux/fiori-elements-writer';
@@ -22,7 +23,7 @@ import { generate as generateDeployConfig } from '@sap-ux/abap-deploy-config-wri
 import { PromptState } from '../prompts/prompt-state.js';
 import { getAppConfig, getAdtDeployConfig } from './app-config-quick-deploy.js';
 import { getAbapRepoAppConfig, getAbapRepoDeployConfig, writeServiceMetadata } from './app-config-abap-repo.js';
-import { makeValidJson, processDebugArtifacts, addPackageJsonIfNotFound } from '../utils/file-helpers.js';
+import { makeValidJson, cleanupArtifacts, addPackageJsonIfNotFound } from '../utils/file-helpers.js';
 import { replaceWebappFiles, validateAndUpdateManifestUI5Version } from '../utils/updates.js';
 import { getYUIDetails } from '../prompts/prompt-helpers.js';
 import { isValidPromptState, validateQfaJsonFile } from '../utils/validators.js';
@@ -127,7 +128,7 @@ export default class extends Generator {
         if (serviceProvider) {
             await writeServiceMetadata(serviceProvider, webappPath, this.fs);
         }
-        processDebugArtifacts(webappPath, this.fs);
+        cleanupArtifacts(webappPath, this.fs);
         const appConfig = getAbapRepoAppConfig(webappPath, this.answers.selectedApp, this.fs);
         // If package.json does not exist in the extracted app, add a minimal one with the appId as the package name.
         addPackageJsonIfNotFound(this.projectPath, appConfig, this.fs);
@@ -201,7 +202,7 @@ export default class extends Generator {
             generatorName: generatorName,
             generatorVersion: this.rootGeneratorVersion(),
             ui5Version: config.ui5?.version ?? '',
-            template: config.template.type,
+            template: getFloorplanLabel(config.template.type, config.service.version),
             serviceUrl: config.service.url,
             launchText: t('readMe.launchText')
         };

package/generators/utils/file-helpers.d.ts

@@ -17,17 +17,16 @@ export declare function makeValidJson(filePath: string, fs: Editor): QfaJsonConf
  */
 export declare function readManifest(manifestFilePath: string, fs: Editor): Manifest;
 /**
- * Removes debug, preload, and source map files from the extracted project path.
+ * Removes build artefacts from the extracted project that should not be present in a local development project.
+ * Handles debug files (-dbg.js), preload bundles, source maps, and transpiled JS files for TypeScript apps.
  * For -dbg.js files, copies the unminified content to the corresponding .js file first.
- * These files are build artefacts that cause issues with the UI5 CLI build if left in place.
  *
  * @param {string} extractedProjectPath - The path where the app files are extracted.
  * @param {Editor} fs - The file system editor.
  */
-export declare function processDebugArtifacts(extractedProjectPath: string, fs: Editor): void;
+export declare function cleanupArtifacts(extractedProjectPath: string, fs: Editor): void;
 /**
  * Writes a minimal package.json to the project path if one does not already exist.
- * Sets `sapux: true` for all apps except freestyle templates.
  *
  * @param {string} projectPath - The project root path.
  * @param {AbapRepoAppConfig} appConfig - The app configuration.

package/generators/utils/file-helpers.js

@@ -43,37 +43,49 @@ export function readManifest(manifestFilePath, fs) {
     return manifest;
 }
 /**
- * Removes debug, preload, and source map files from the extracted project path.
+ * Removes build artefacts from the extracted project that should not be present in a local development project.
+ * Handles debug files (-dbg.js), preload bundles, source maps, and transpiled JS files for TypeScript apps.
  * For -dbg.js files, copies the unminified content to the corresponding .js file first.
- * These files are build artefacts that cause issues with the UI5 CLI build if left in place.
  *
  * @param {string} extractedProjectPath - The path where the app files are extracted.
  * @param {Editor} fs - The file system editor.
  */
-export function processDebugArtifacts(extractedProjectPath, fs) {
+export function cleanupArtifacts(extractedProjectPath, fs) {
     const dbgSuffix = '-dbg.';
-    PromptState.admZip?.getEntries().forEach((entry) => {
+    const entries = PromptState.admZip?.getEntries() ?? [];
+    const tsEntryNames = new Set(entries.filter((e) => e.entryName.endsWith('.ts') && !e.entryName.endsWith('.d.ts')).map((e) => e.entryName));
+    entries.forEach((entry) => {
         const name = entry.entryName;
+        // Replace debug variants (e.g. component-dbg.js) with their non-debug counterpart
         if (name.includes(dbgSuffix)) {
-            // copies contents of -dbg.js to .js file and removes the -dbg.js file
             const extractedDebugPath = join(extractedProjectPath, name.replace(dbgSuffix, '.'));
             const debugPath = join(extractedProjectPath, name);
             fs.write(extractedDebugPath, entry.getData().toString('utf8'));
             fs.delete(debugPath);
-            RepoAppDownloadLogger.logger?.debug(`processDebugArtifacts: Copied "${debugPath}" -> "${extractedDebugPath}" and removed debug file`);
+            RepoAppDownloadLogger.logger?.debug(`cleanupArtifacts: Copied "${debugPath}" -> "${extractedDebugPath}" and removed debug file`);
+            return;
         }
-        else if (name.endsWith('-preload.js') || name.endsWith('.js.map')) {
+        // Remove preload bundles and source maps — not needed for local development
+        if (name.endsWith('-preload.js') || name.endsWith('.js.map')) {
             const filePath = join(extractedProjectPath, name);
             if (fs.exists(filePath)) {
                 fs.delete(filePath);
-                RepoAppDownloadLogger.logger?.debug(`processDebugArtifacts: Removed file: "${filePath}"`);
+                RepoAppDownloadLogger.logger?.debug(`cleanupArtifacts: Removed preload/map file: "${filePath}"`);
+            }
+            return;
+        }
+        // Remove transpiled .js files that have a .ts counterpart — TypeScript source takes precedence
+        if (tsEntryNames.size > 0 && name.endsWith('.js') && tsEntryNames.has(`${name.slice(0, -3)}.ts`)) {
+            const filePath = join(extractedProjectPath, name);
+            if (fs.exists(filePath)) {
+                fs.delete(filePath);
+                RepoAppDownloadLogger.logger?.debug(`cleanupArtifacts: Removed transpiled file: "${filePath}"`);
             }
         }
     });
 }
 /**
  * Writes a minimal package.json to the project path if one does not already exist.
- * Sets `sapux: true` for all apps except freestyle templates.
  *
  * @param {string} projectPath - The project root path.
  * @param {AbapRepoAppConfig} appConfig - The app configuration.

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": "1.1.31",
+  "version": "1.1.32",
   "repository": {
     "type": "git",
     "url": "https://github.com/SAP/open-ux-tools.git",
@@ -30,8 +30,9 @@
     "@sap-ux/inquirer-common": "1.0.20",
     "@sap-ux/project-access": "2.1.6",
     "@sap-ux/odata-service-inquirer": "3.0.22",
-    "@sap-ux/fiori-elements-writer": "3.0.47",
-    "@sap-ux/fiori-freestyle-writer": "3.0.42",
+    "@sap-ux/fiori-elements-writer": "3.0.48",
+    "@sap-ux/fiori-freestyle-writer": "3.0.43",
+    "@sap-ux/fiori-app-sub-generator": "1.1.0",
     "@sap-ux/logger": "1.0.2",
     "@sap-ux/project-input-validator": "1.0.10",
     "@sap-ux/launch-config": "1.0.11",