@ui5/task-adaptation 1.6.2 → 1.6.3

package/CHANGELOG.md

@@ -2,7 +2,10 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
-A list of unreleased changes can be found [here](https://github.com/SAP/ui5-task-adaptation/compare/v1.6.2...HEAD).
+A list of unreleased changes can be found [here](https://github.com/SAP/ui5-task-adaptation/compare/v1.6.3...HEAD).
+
+<a name="v1.6.3"></a>
+## [v1.6.3] - 2026-03-18
 
 <a name="v1.6.2"></a>
 ## [v1.6.2] - 2026-03-16
@@ -146,6 +149,7 @@ A list of unreleased changes can be found [here](https://github.com/SAP/ui5-task
 <a name="v1.0.0"></a>
 ## v1.0.0 - 2020-12-09
 
+[v1.6.3]: https://github.com/SAP/ui5-task-adaptation/compare/v1.6.2...v1.6.3
 [v1.6.2]: https://github.com/SAP/ui5-task-adaptation/compare/v1.6.1...v1.6.2
 [v1.6.1]: https://github.com/SAP/ui5-task-adaptation/compare/v1.6.0...v1.6.1
 [v1.6.0]: https://github.com/SAP/ui5-task-adaptation/compare/v0.2.0...v1.6.0

package/dist/adapters/abapAdapter.js

@@ -1,11 +1,7 @@
+import { getCommonManifestUpdateCommands } from "./adapter.js";
 import { AdaptCommandChain, ManifestUpdateCommandChain, MergeCommandChain, PostCommandChain } from "./commands/command.js";
-import AddAppVariantIdHierarchyCommand from "./commands/addAppVariantIdHierarchyCommand.js";
-import ApplyDescriptorChangesCommand from "./commands/applyDescriptorChangesCommand.js";
-import SetAppVariantIdCommand from "./commands/setAppVariantIdCommand.js";
-import UpdateComponentNameCommand from "./commands/updateComponentNameCommand.js";
 import DownloadAnnotationsCommand from "./commands/downloadAnnotationsCommand.js";
 import I18nPropertiesMergeCommand from "./commands/i18nPropertiesMergeCommand.js";
-import UpdateCloudDevAdaptationCommand from "./commands/updateCloudDevAdaptationCommand.js";
 export default class AbapAdapter {
     configuration;
     annotationManager;
@@ -14,7 +10,6 @@ export default class AbapAdapter {
         this.annotationManager = annotationManager;
     }
     createAdaptCommandChain(baseApp, appVariant) {
-        const manifestChanges = appVariant.getProcessedManifestChanges();
         const appVariantIdHierarchyItem = {
             appVariantId: baseApp.id,
             version: baseApp.version,
@@ -22,18 +17,14 @@ export default class AbapAdapter {
         };
         return new AdaptCommandChain(baseApp.files, [
             new ManifestUpdateCommandChain([
-                new SetAppVariantIdCommand(appVariant.id),
-                new UpdateComponentNameCommand(baseApp.id),
-                new ApplyDescriptorChangesCommand(manifestChanges, appVariant.prefix),
-                new AddAppVariantIdHierarchyCommand(appVariantIdHierarchyItem),
-                new UpdateCloudDevAdaptationCommand(),
+                ...getCommonManifestUpdateCommands(baseApp, appVariant, appVariantIdHierarchyItem),
             ]),
             new DownloadAnnotationsCommand(appVariant.id, appVariant.prefix, this.annotationManager, this.configuration),
         ]);
     }
     createMergeCommandChain(baseApp, appVariant) {
         const manifestChanges = appVariant.getProcessedManifestChanges();
-        return new MergeCommandChain([
+        return new MergeCommandChain(appVariant.getProcessedFiles(), [
             new I18nPropertiesMergeCommand(baseApp.i18nPath, appVariant.prefix, manifestChanges),
         ]);
     }

package/dist/adapters/adapter.d.ts

@@ -1,8 +1,10 @@
 import AppVariant from "../appVariantManager.js";
 import BaseApp from "../baseAppManager.js";
-import { AdaptCommandChain, MergeCommandChain, PostCommandChain } from "./commands/command.js";
+import { IAppVariantIdHierarchyManifestItem } from "../model/appVariantIdHierarchyItem.js";
+import { AdaptCommandChain, ManifestUpdateCommand, MergeCommandChain, PostCommandChain } from "./commands/command.js";
 export interface IAdapter {
     createAdaptCommandChain(baseApp: BaseApp, appVariant: AppVariant): AdaptCommandChain;
     createMergeCommandChain(baseApp: BaseApp, appVariant: AppVariant): MergeCommandChain;
     createPostCommandChain(): PostCommandChain;
 }
+export declare function getCommonManifestUpdateCommands(baseApp: BaseApp, appVariant: AppVariant, appVariantIdHierarchyItem: IAppVariantIdHierarchyManifestItem): ManifestUpdateCommand[];

package/dist/adapters/adapter.js

@@ -1,2 +1,16 @@
-export {};
+import AddAppVariantIdHierarchyCommand from "./commands/addAppVariantIdHierarchyCommand.js";
+import ApplyDescriptorChangesCommand from "./commands/applyDescriptorChangesCommand.js";
+import SetAppVariantIdCommand from "./commands/setAppVariantIdCommand.js";
+import UpdateCloudDevAdaptationCommand from "./commands/updateCloudDevAdaptationCommand.js";
+import UpdateComponentNameCommand from "./commands/updateComponentNameCommand.js";
+export function getCommonManifestUpdateCommands(baseApp, appVariant, appVariantIdHierarchyItem) {
+    const manifestChanges = appVariant.getProcessedManifestChanges();
+    return [
+        new SetAppVariantIdCommand(appVariant.id),
+        new UpdateComponentNameCommand(baseApp.id),
+        new ApplyDescriptorChangesCommand(manifestChanges, appVariant.prefix),
+        new AddAppVariantIdHierarchyCommand(appVariantIdHierarchyItem),
+        new UpdateCloudDevAdaptationCommand(),
+    ];
+}
 //# sourceMappingURL=adapter.js.map

package/dist/adapters/cfAdapter.js

@@ -1,11 +1,7 @@
+import { getCommonManifestUpdateCommands } from "./adapter.js";
 import { AdaptCommandChain, ManifestUpdateCommandChain, MergeCommandChain, PostCommandChain } from "./commands/command.js";
 import XsAppJsonEnhanceRoutesCommand from "./commands/xsAppJsonEnhanceRoutesCommand.js";
-import AddAppVariantIdHierarchyCommand from "./commands/addAppVariantIdHierarchyCommand.js";
-import UpdateCloudDevAdaptationCommand from "./commands/updateCloudDevAdaptationCommand.js";
 import UpdateCloudPlatformCommand from "./commands/updateCloudPlatformCommand.js";
-import ApplyDescriptorChangesCommand from "./commands/applyDescriptorChangesCommand.js";
-import SetAppVariantIdCommand from "./commands/setAppVariantIdCommand.js";
-import UpdateComponentNameCommand from "./commands/updateComponentNameCommand.js";
 import I18nPropertiesMergeCommand from "./commands/i18nPropertiesMergeCommand.js";
 import XsAppJsonMergeCommand from "./commands/xsAppJsonMergeCommand.js";
 export default class CFAdapter {
@@ -14,25 +10,20 @@ export default class CFAdapter {
         this.configuration = configuration;
     }
     createAdaptCommandChain(baseApp, appVariant) {
-        const manifestChanges = appVariant.getProcessedManifestChanges();
         const appVariantIdHierarchyItem = {
             appVariantId: baseApp.id,
             version: baseApp.version
         };
         return new AdaptCommandChain(baseApp.files, [
             new ManifestUpdateCommandChain([
-                new SetAppVariantIdCommand(appVariant.id),
-                new UpdateComponentNameCommand(baseApp.id),
-                new ApplyDescriptorChangesCommand(manifestChanges, appVariant.prefix),
-                new AddAppVariantIdHierarchyCommand(appVariantIdHierarchyItem),
-                new UpdateCloudDevAdaptationCommand(),
+                ...getCommonManifestUpdateCommands(baseApp, appVariant, appVariantIdHierarchyItem),
                 new UpdateCloudPlatformCommand(this.configuration.sapCloudService),
             ]),
         ]);
     }
     createMergeCommandChain(baseApp, appVariant) {
         const manifestChanges = appVariant.getProcessedManifestChanges();
-        return new MergeCommandChain([
+        return new MergeCommandChain(appVariant.getProcessedFiles(), [
             new I18nPropertiesMergeCommand(baseApp.i18nPath, appVariant.prefix, manifestChanges),
             new XsAppJsonMergeCommand(),
         ]);

package/dist/adapters/commands/command.d.ts

@@ -14,8 +14,6 @@ export declare class AdaptCommandChain {
     constructor(files: ReadonlyMap<string, string>, commands: AdaptCommand[]);
     /**
      * Executes all commands in the chain that accept the given filename
-     * @param files - Map of all files being processed
-     * @param filename - The current file being processed
      */
     execute(): Promise<ReadonlyMap<string, string>>;
 }
@@ -35,15 +33,14 @@ export declare abstract class MergeCommand {
  * It manages a collection of commands and executes them in sequence
  */
 export declare class MergeCommandChain {
+    private appVariantFiles;
     private commands;
-    constructor(commands?: MergeCommand[]);
+    constructor(appVariantFiles: ReadonlyMap<string, string>, commands?: MergeCommand[]);
     /**
      * Executes all commands in the chain that accept the given filename
      * @param files - Map of all files being processed
-     * @param filename - The current file being processed
-     * @param appVariantContent - Content from the app variant
      */
-    execute(files: ReadonlyMap<string, string>, appVariantFiles: ReadonlyMap<string, string>): Promise<ReadonlyMap<string, string>>;
+    execute(files: ReadonlyMap<string, string>): Promise<ReadonlyMap<string, string>>;
 }
 export declare abstract class ManifestUpdateCommand {
     readonly commandType = "manifestUpdate";
@@ -64,8 +61,6 @@ export declare abstract class PostCommand {
     /**
      * Executes the command on the specified file
      * @param files - Map of all files being processed
-     * @param filename - The current file being processed
-     * @param appVariantContent - Content from the app variant
      */
     abstract execute(files: Map<string, string>): Promise<void>;
 }

package/dist/adapters/commands/command.js

@@ -10,8 +10,6 @@ export class AdaptCommandChain {
     }
     /**
      * Executes all commands in the chain that accept the given filename
-     * @param files - Map of all files being processed
-     * @param filename - The current file being processed
      */
     async execute() {
         const filesCopy = new Map(this.files);
@@ -33,19 +31,19 @@ export class MergeCommand {
  * It manages a collection of commands and executes them in sequence
  */
 export class MergeCommandChain {
+    appVariantFiles;
     commands;
-    constructor(commands = []) {
+    constructor(appVariantFiles, commands = []) {
+        this.appVariantFiles = appVariantFiles;
         this.commands = commands;
     }
     /**
      * Executes all commands in the chain that accept the given filename
      * @param files - Map of all files being processed
-     * @param filename - The current file being processed
-     * @param appVariantContent - Content from the app variant
      */
-    async execute(files, appVariantFiles) {
+    async execute(files) {
         const filesCopy = new Map(files);
-        for (const [filename, appVariantContent] of appVariantFiles) {
+        for (const [filename, appVariantContent] of this.appVariantFiles) {
             const acceptedCommands = this.commands.filter(command => command.accept(filename));
             if (acceptedCommands.length > 0) {
                 for (const command of acceptedCommands) {

package/dist/adapters/commands/xsAppJsonEnhanceRoutesCommand.js

@@ -1,8 +1,5 @@
-import { enhanceRoutesWithEndpointAndService } from "../../util/cf/xsAppJsonUtil.js";
-import CFUtil from "../../util/cfUtil.js";
-import { getLogger } from "@ui5/logger";
+import { fetchCredentialsAndEnhanceRoutes } from "../../util/cf/xsAppJsonUtil.js";
 import { PostCommand } from "./command.js";
-const log = getLogger("@ui5/task-adaptation::CFProcessor");
 export default class XsAppJsonEnhanceRoutesCommand extends PostCommand {
     configuration;
     constructor(configuration) {
@@ -10,26 +7,10 @@ export default class XsAppJsonEnhanceRoutesCommand extends PostCommand {
         this.configuration = configuration;
     }
     async execute(files) {
-        const { serviceInstanceName, space } = this.configuration;
-        if (!serviceInstanceName) {
-            throw new Error(`Service instance name must be specified in ui5.yaml configuration for app '${this.configuration.appName}'`);
-        }
-        let serviceCredentials;
-        try {
-            // Get valid service keys with proper endpoints structure
-            serviceCredentials = await CFUtil.getOrCreateServiceKeyWithEndpoints(serviceInstanceName, space);
-        }
-        catch (error) {
-            throw new Error(`Failed to get valid service keys for app '${this.configuration.appName}': ${error.message}`);
-        }
-        if (serviceCredentials) {
-            const xsAppJson = files.get("xs-app.json");
-            if (xsAppJson) {
-                files.set("xs-app.json", enhanceRoutesWithEndpointAndService(xsAppJson, serviceCredentials));
-            }
-        }
-        else {
-            log.info(`No endpoints found for app '${this.configuration.appName}'. xs-app.json will not be updated.`);
+        let xsAppJson = files.get("xs-app.json");
+        if (xsAppJson) {
+            xsAppJson = await fetchCredentialsAndEnhanceRoutes(xsAppJson, this.configuration);
+            files.set("xs-app.json", xsAppJson);
         }
     }
 }

package/dist/adapters/previewAdapter.d.ts

@@ -1,4 +1,12 @@
+import AppVariant from "../appVariantManager.js";
+import BaseApp from "../baseAppManager.js";
+import { IConfiguration } from "../model/configuration.js";
 import { IAdapter } from "./adapter.js";
-import CFAdapter from "./cfAdapter.js";
-export default class PreviewAdapter extends CFAdapter implements IAdapter {
+import { AdaptCommandChain, MergeCommandChain, PostCommandChain } from "./commands/command.js";
+export default class PreviewAdapter implements IAdapter {
+    private cfAdapter;
+    constructor(configuration: IConfiguration);
+    createAdaptCommandChain(baseApp: BaseApp, appVariant: AppVariant): AdaptCommandChain;
+    createMergeCommandChain(baseApp: BaseApp, appVariant: AppVariant): MergeCommandChain;
+    createPostCommandChain(): PostCommandChain;
 }

package/dist/adapters/previewAdapter.js

@@ -1,4 +1,17 @@
 import CFAdapter from "./cfAdapter.js";
-export default class PreviewAdapter extends CFAdapter {
+export default class PreviewAdapter {
+    cfAdapter;
+    constructor(configuration) {
+        this.cfAdapter = new CFAdapter(configuration);
+    }
+    createAdaptCommandChain(baseApp, appVariant) {
+        return this.cfAdapter.createAdaptCommandChain(baseApp, appVariant);
+    }
+    createMergeCommandChain(baseApp, appVariant) {
+        return this.cfAdapter.createMergeCommandChain(baseApp, appVariant);
+    }
+    createPostCommandChain() {
+        return this.cfAdapter.createPostCommandChain();
+    }
 }
 //# sourceMappingURL=previewAdapter.js.map

package/dist/index.js

@@ -16,7 +16,7 @@ export default ({ workspace, options, taskUtil }) => {
         const processor = determineProcessor(options.configuration);
         const adapter = processor.getAdapter();
         const adaptationProject = await AppVariant.fromWorkspace(workspace, options.projectNamespace);
-        const previewManagerPromise = PreviewManager.createFromRoot(adaptationProject.reference, processor);
+        const previewManagerPromise = PreviewManager.createFromRoot(adaptationProject.reference, processor, options.configuration);
         const appVariantIdHierarchy = await processor.getAppVariantIdHierarchy(adaptationProject.reference);
         if (appVariantIdHierarchy.length === 0) {
             throw new Error(`No app variant found for reference ${adaptationProject.reference}`);
@@ -40,7 +40,7 @@ export default ({ workspace, options, taskUtil }) => {
             const adaptCommandChain = adapter.createAdaptCommandChain(baseApp, appVariant);
             const mergeCommandChain = adapter.createMergeCommandChain(baseApp, appVariant);
             const adaptedFiles = await adaptCommandChain.execute();
-            const mergedFiles = await mergeCommandChain.execute(adaptedFiles, appVariant.getProcessedFiles());
+            const mergedFiles = await mergeCommandChain.execute(adaptedFiles);
             return mergedFiles;
         };
         let files = await fetchFilesPromises.reduce(async (previousFiles, currentFiles) => adapt(await previousFiles, await currentFiles), fetchFilesPromises.shift());

package/dist/previewManager.d.ts

@@ -1,13 +1,14 @@
 import IProcessor from "./processors/processor.js";
+import { IConfiguration } from "./model/types.js";
 export default class PreviewManager {
     private readonly fetchLibsPromises;
-    static createFromRoot(appId: string, processor: IProcessor): Promise<PreviewManager>;
+    private readonly configuration;
+    static createFromRoot(appId: string, processor: IProcessor, configuration: IConfiguration): Promise<PreviewManager>;
     static isPreviewRequested(): boolean;
     private constructor();
     processPreviewResources(baseAppFiles: ReadonlyMap<string, string>): Promise<void>;
     private preReadLibs;
     private searchBaseAppXsAppJsonFile;
-    private mergeXsAppJsonFiles;
     private static moveLibraryFiles;
     private static modifyRoutes;
 }

package/dist/previewManager.js

@@ -1,7 +1,7 @@
 import { getLogger } from "@ui5/logger";
 import ResourceUtil from "./util/resourceUtil.js";
 import path from "path";
-import { merge } from "./util/cf/xsAppJsonUtil.js";
+import { fetchCredentialsAndEnhanceRoutes, merge } from "./util/cf/xsAppJsonUtil.js";
 import FsUtil from "./util/fsUtil.js";
 const log = getLogger("@ui5/task-adaptation::PreviewManager");
 const REUSE_DIR = ".adp/reuse";
@@ -9,7 +9,8 @@ const APP_INFO_FILE = "ui5AppInfo.json";
 const XS_APP_JSON_FILE = "xs-app.json";
 export default class PreviewManager {
     fetchLibsPromises = new Map();
-    static async createFromRoot(appId, processor) {
+    configuration;
+    static async createFromRoot(appId, processor, configuration) {
         let ui5AppInfo = "";
         if (PreviewManager.isPreviewRequested()) {
             try {
@@ -22,12 +23,13 @@ export default class PreviewManager {
         else {
             log.verbose("Preview mode not requested (env variable ADP_BUILDER_MODE=preview is not set), skipping preview resources processing.");
         }
-        return new PreviewManager(appId, ui5AppInfo, processor);
+        return new PreviewManager(appId, ui5AppInfo, processor, configuration);
     }
     static isPreviewRequested() {
         return process.env.ADP_BUILDER_MODE === "preview";
     }
-    constructor(appId, ui5AppInfo, processor) {
+    constructor(appId, ui5AppInfo, processor, configuration) {
+        this.configuration = configuration;
         // If no ui5AppInfo is provided, no preview processing is needed
         if (!ui5AppInfo) {
             log.verbose("No ui5AppInfo provided, skipping preview resources processing.");
@@ -74,7 +76,11 @@ export default class PreviewManager {
             }
         }
         this.searchBaseAppXsAppJsonFile(xsAppFiles, baseAppFiles);
-        this.mergeXsAppJsonFiles(xsAppFiles, mergedFiles);
+        let xsAppJson = merge(xsAppFiles);
+        if (xsAppJson) {
+            xsAppJson = await fetchCredentialsAndEnhanceRoutes(xsAppJson, this.configuration);
+            mergedFiles.set(XS_APP_JSON_FILE, xsAppJson);
+        }
         await ResourceUtil.writeInProject(REUSE_DIR, mergedFiles);
     }
     preReadLibs(reuseLibs, processor) {
@@ -97,12 +103,6 @@ export default class PreviewManager {
             log.warn("xs-app.json is missing in the downloaded base app files for preview");
         }
     }
-    mergeXsAppJsonFiles(xsAppFiles, files) {
-        const mergedXsAppJson = merge(xsAppFiles);
-        if (mergedXsAppJson) {
-            files.set(XS_APP_JSON_FILE, mergedXsAppJson);
-        }
-    }
     static moveLibraryFiles(inputFiles, libraryName, libId) {
         const files = new Map();
         inputFiles.forEach((content, filename) => {

package/dist/util/cf/xsAppJsonUtil.d.ts

@@ -1,4 +1,4 @@
-import { ServiceCredentials } from "../../model/types.js";
+import { IConfiguration, ServiceCredentials } from "../../model/types.js";
 export declare const XSAPP_JSON_FILENAME = "xs-app.json";
 /**
  * Merges multiple xs-app.json contents into one. AppVariant and Reuse Library
@@ -11,3 +11,4 @@ export declare const XSAPP_JSON_FILENAME = "xs-app.json";
 export declare function merge(xsAppFiles: string[]): string | undefined;
 export declare function enhanceRoutesWithEndpointAndService(xsAppJsonContent: string, serviceCredentials: ServiceCredentials): string;
 export declare function enhanceRoutes(serviceCredentials: ServiceCredentials, baseRoutes: any): any;
+export declare function fetchCredentialsAndEnhanceRoutes(xsAppJson: string, { serviceInstanceName, space, appName }: IConfiguration): Promise<string>;

package/dist/util/cf/xsAppJsonUtil.js

@@ -1,4 +1,5 @@
 import { getLogger } from "@ui5/logger";
+import CFUtil from "../cfUtil.js";
 const log = getLogger("@ui5/task-adaptation::XSAppJsonUtil");
 export const XSAPP_JSON_FILENAME = "xs-app.json";
 /**
@@ -78,4 +79,22 @@ export function enhanceRoutes(serviceCredentials, baseRoutes) {
         }
     });
 }
+export async function fetchCredentialsAndEnhanceRoutes(xsAppJson, { serviceInstanceName, space, appName }) {
+    if (!serviceInstanceName) {
+        throw new Error(`Service instance name must be specified in ui5.yaml configuration for app '${appName}'`);
+    }
+    let serviceCredentials;
+    try {
+        // Get valid service keys with proper endpoints structure
+        serviceCredentials = await CFUtil.getOrCreateServiceKeyWithEndpoints(serviceInstanceName, space);
+    }
+    catch (error) {
+        throw new Error(`Failed to get valid service keys for app '${appName}': ${error.message}`);
+    }
+    if (serviceCredentials) {
+        return enhanceRoutesWithEndpointAndService(xsAppJson, serviceCredentials);
+    }
+    log.info(`No endpoints found for app '${appName}'. xs-app.json will not be updated.`);
+    return xsAppJson;
+}
 //# sourceMappingURL=xsAppJsonUtil.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ui5/task-adaptation",
-    "version": "1.6.2",
+    "version": "1.6.3",
     "description": "Custom task for ui5-builder which allows building UI5 Flexibility Adaptation Projects for SAP BTP, Cloud Foundry environment",
     "main": "index.js",
     "scripts": {
@@ -59,7 +59,6 @@
         "@types/chai-as-promised": "^7.1.4",
         "@types/js-yaml": "^4.0.3",
         "@types/jsdom": "^21.1.6",
-        "@types/lodash": "^4.14.196",
         "@types/mocha": "^9.1.0",
         "@types/semver": "^7.3.8",
         "@types/sinon": "^10.0.16",
@@ -115,7 +114,8 @@
             "src/annotations/transformers/transformer.ts",
             "src/model/configuration.ts",
             "src/model/appVariantIdHierarchyItem.ts",
-            "src/adapters/adapter.ts"
+            "src/adapters/adapter.ts",
+            "src/adapters/previewAdapter.ts"
         ],
         "check-coverage": true,
         "statements": 85,