@ui5/task-adaptation 1.6.0 → 1.6.1

package/dist/adapters/commands/setAppVariantIdCommand.js

@@ -0,0 +1,15 @@
+import { set } from "../../util/objectPath.js";
+import { ManifestUpdateCommand } from "./command.js";
+const MANIFEST_FILE = "manifest.json";
+export default class SetAppVariantIdCommand extends ManifestUpdateCommand {
+    appVariantId;
+    constructor(appVariantId) {
+        super();
+        this.appVariantId = appVariantId;
+    }
+    accept = (filename) => filename === MANIFEST_FILE;
+    async execute(manifest) {
+        set(manifest, ["sap.app", "id"], this.appVariantId);
+    }
+}
+//# sourceMappingURL=setAppVariantIdCommand.js.map

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

@@ -0,0 +1,4 @@
+import { ManifestUpdateCommand } from "./command.js";
+export default class UpdateCloudDevAdaptationCommand extends ManifestUpdateCommand {
+    execute(manifest: any): Promise<void>;
+}

package/dist/adapters/commands/updateCloudDevAdaptationCommand.js

@@ -0,0 +1,11 @@
+import { set } from "../../util/objectPath.js";
+import { ManifestUpdateCommand } from "./command.js";
+export default class UpdateCloudDevAdaptationCommand extends ManifestUpdateCommand {
+    async execute(manifest) {
+        if (manifest["sap.fiori"]?.cloudDevAdaptationStatus) {
+            delete manifest["sap.fiori"].cloudDevAdaptationStatus;
+        }
+        set(manifest, ["sap.ui5", "isCloudDevAdaptation"], true);
+    }
+}
+//# sourceMappingURL=updateCloudDevAdaptationCommand.js.map

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

@@ -0,0 +1,6 @@
+import { ManifestUpdateCommand } from "./command.js";
+export default class UpdateCloudPlatformCommand extends ManifestUpdateCommand {
+    private sapCloudService;
+    constructor(sapCloudService: string | undefined);
+    execute(manifest: any): Promise<void>;
+}

package/dist/adapters/commands/updateCloudPlatformCommand.js

@@ -0,0 +1,23 @@
+import { set } from "../../util/objectPath.js";
+import { ManifestUpdateCommand } from "./command.js";
+export default class UpdateCloudPlatformCommand extends ManifestUpdateCommand {
+    sapCloudService;
+    constructor(sapCloudService) {
+        super();
+        this.sapCloudService = sapCloudService;
+    }
+    async execute(manifest) {
+        const sapCloudService = manifest["sap.cloud"]?.service;
+        const sapPlatformCf = manifest["sap.platform.cf"];
+        if (sapPlatformCf?.oAuthScopes && sapCloudService) {
+            sapPlatformCf.oAuthScopes = sapPlatformCf.oAuthScopes.map((scope) => scope.replace(`$XSAPPNAME.`, `$XSAPPNAME('${sapCloudService}').`));
+        }
+        if (this.sapCloudService) {
+            set(manifest, ["sap.cloud", "service"], this.sapCloudService);
+        }
+        else {
+            delete manifest["sap.cloud"];
+        }
+    }
+}
+//# sourceMappingURL=updateCloudPlatformCommand.js.map

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

@@ -0,0 +1,6 @@
+import { ManifestUpdateCommand } from "./command.js";
+export default class UpdateComponentNameCommand extends ManifestUpdateCommand {
+    private baseAppId;
+    constructor(baseAppId: string);
+    execute(manifest: any): Promise<void>;
+}

package/dist/adapters/commands/updateComponentNameCommand.js

@@ -0,0 +1,13 @@
+import { ManifestUpdateCommand } from "./command.js";
+import { set } from "../../util/objectPath.js";
+export default class UpdateComponentNameCommand extends ManifestUpdateCommand {
+    baseAppId;
+    constructor(baseAppId) {
+        super();
+        this.baseAppId = baseAppId;
+    }
+    async execute(manifest) {
+        set(manifest, ["sap.ui5", "componentName"], this.baseAppId);
+    }
+}
+//# sourceMappingURL=updateComponentNameCommand.js.map

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

@@ -0,0 +1,7 @@
+import { IConfiguration } from "../../model/types.js";
+import { PostCommand } from "./command.js";
+export default class XsAppJsonEnhanceRoutesCommand extends PostCommand {
+    private configuration;
+    constructor(configuration: IConfiguration);
+    execute(files: Map<string, string>): Promise<void>;
+}

package/dist/adapters/commands/xsAppJsonEnhanceRoutesCommand.js

@@ -0,0 +1,36 @@
+import { enhanceRoutesWithEndpointAndService } from "../../util/cf/xsAppJsonUtil.js";
+import CFUtil from "../../util/cfUtil.js";
+import { getLogger } from "@ui5/logger";
+import { PostCommand } from "./command.js";
+const log = getLogger("@ui5/task-adaptation::CFProcessor");
+export default class XsAppJsonEnhanceRoutesCommand extends PostCommand {
+    configuration;
+    constructor(configuration) {
+        super();
+        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.`);
+        }
+    }
+}
+//# sourceMappingURL=xsAppJsonEnhanceRoutesCommand.js.map

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

@@ -0,0 +1,5 @@
+import { MergeCommand } from "./command.js";
+export default class XsAppJsonMergeCommand extends MergeCommand {
+    accept: (filename: string) => filename is "xs-app.json";
+    execute(files: Map<string, string>, filename: string, appVariantContent: string): Promise<void>;
+}

package/dist/adapters/commands/xsAppJsonMergeCommand.js

@@ -0,0 +1,17 @@
+import { merge } from "../../util/cf/xsAppJsonUtil.js";
+import { MergeCommand } from "./command.js";
+export default class XsAppJsonMergeCommand extends MergeCommand {
+    accept = (filename) => filename === "xs-app.json";
+    async execute(files, filename, appVariantContent) {
+        const baseContent = files.get(filename);
+        const xsAppJsonFiles = [
+            appVariantContent,
+            baseContent // base app xs-app.json comes last
+        ].filter(file => file !== undefined);
+        const result = merge(xsAppJsonFiles);
+        if (result) {
+            files.set(filename, result);
+        }
+    }
+}
+//# sourceMappingURL=xsAppJsonMergeCommand.js.map

package/dist/adapters/previewAdapter.d.ts

@@ -0,0 +1,6 @@
+import { IAdapter } from "./adapter.js";
+import { PostCommandChain } from "./commands/command.js";
+import CFAdapter from "./cfAdapter.js";
+export default class PreviewAdapter extends CFAdapter implements IAdapter {
+    createPostCommandChain(): PostCommandChain;
+}

package/dist/adapters/previewAdapter.js

@@ -0,0 +1,8 @@
+import { PostCommandChain } from "./commands/command.js";
+import CFAdapter from "./cfAdapter.js";
+export default class PreviewAdapter extends CFAdapter {
+    createPostCommandChain() {
+        return new PostCommandChain([]);
+    }
+}
+//# sourceMappingURL=previewAdapter.js.map

package/dist/appVariantManager.js

@@ -24,6 +24,9 @@ export default class AppVariant {
         return new AppVariant(files);
     }
     constructor(files, resources) {
+        if (files.size === 0) {
+            throw new Error("Application variant sources are empty");
+        }
         this.files = files;
         this.resources = resources;
         const manifestString = files.get("manifest.appdescr_variant");

package/dist/baseAppManager.d.ts

@@ -1,5 +1,3 @@
-import AppVariant from "./appVariantManager.js";
-import IProcessor from "./processors/processor.js";
 export interface IBaseAppResources {
     resources: any[];
     manifestInfo: IManifestInfo;
@@ -25,13 +23,7 @@ export default class BaseApp {
     readonly files: ReadonlyMap<string, string>;
     static fromFiles(files: ReadonlyMap<string, string>): BaseApp;
     private constructor();
-    adapt(appVariant: AppVariant, processor: IProcessor): Promise<ReadonlyMap<string, string>>;
-    private updateComponentName;
-    private updateAdaptationProperties;
     private extractI18nPathFromManifest;
     private VALIDATION_RULES;
     private validateProperty;
-    private applyDescriptorChanges;
-    private fillAppVariantIdHierarchy;
-    private adjustAddNewModelEnhanceWith;
 }

package/dist/baseAppManager.js

@@ -1,8 +1,4 @@
-import { AppDescriptorChange, RawApplier, RegistrationBuild } from "../dist/bundle.js";
 import { trimExtension } from "./util/commonUtil.js";
-import BuildStrategy from "./buildStrategy.js";
-import { getLogger } from "@ui5/logger";
-const log = getLogger("@ui5/task-adaptation::BaseAppManager");
 const IGNORE_FILES = [
     "manifest-bundle.zip",
     "Component-preload.js",
@@ -47,6 +43,9 @@ export default class BaseApp {
         return new BaseApp(files);
     }
     constructor(files) {
+        if (files.size === 0) {
+            throw new Error("Original application sources are empty");
+        }
         this.files = preProcessFiles(files);
         const manifestString = files.get("manifest.json");
         if (!manifestString) {
@@ -59,35 +58,6 @@ export default class BaseApp {
         this.validateProperty(this.version, "sap.app/applicationVersion/version");
         this.i18nPath = this.extractI18nPathFromManifest(this.id, manifest["sap.app"]?.i18n);
     }
-    async adapt(appVariant, processor) {
-        const files = new Map(this.files);
-        const manifest = JSON.parse(files.get("manifest.json"));
-        manifest["sap.app"].id = appVariant.id;
-        await processor.updateLandscapeSpecificContent(manifest, files, appVariant.id, appVariant.prefix);
-        this.updateComponentName(manifest, this.id);
-        this.fillAppVariantIdHierarchy(processor, appVariant.reference, this.version, manifest);
-        this.updateAdaptationProperties(manifest);
-        await this.applyDescriptorChanges(manifest, appVariant);
-        files.set("manifest.json", JSON.stringify(manifest));
-        return files;
-    }
-    updateComponentName(manifest, id) {
-        if (manifest["sap.ui5"] == null) {
-            manifest["sap.ui5"] = {};
-        }
-        if (manifest["sap.ui5"].componentName == null) {
-            manifest["sap.ui5"].componentName = id;
-        }
-    }
-    updateAdaptationProperties(content) {
-        if (content["sap.fiori"]?.cloudDevAdaptationStatus) {
-            delete content["sap.fiori"].cloudDevAdaptationStatus;
-        }
-        if (content["sap.ui5"] == null) {
-            content["sap.ui5"] = {};
-        }
-        content["sap.ui5"].isCloudDevAdaptation = true;
-    }
     extractI18nPathFromManifest(sapAppId, i18nNode) {
         if (i18nNode) {
             if (i18nNode["bundleUrl"]) {
@@ -119,41 +89,5 @@ export default class BaseApp {
             validatationRule(value);
         }
     }
-    async applyDescriptorChanges(baseAppManifest, appVariant) {
-        log.verbose("Applying appVariant changes");
-        const changesContent = new Array();
-        const i18nBundleName = appVariant.prefix;
-        for (const change of appVariant.getProcessedManifestChanges()) {
-            changesContent.push(new AppDescriptorChange(change));
-            this.adjustAddNewModelEnhanceWith(change, i18nBundleName);
-        }
-        if (changesContent.length > 0) {
-            const changeHandlers = await Promise.all(changesContent.map(change => RegistrationBuild[change.getChangeType()]()));
-            await RawApplier.applyChanges(changeHandlers, baseAppManifest, changesContent, new BuildStrategy());
-        }
-    }
-    fillAppVariantIdHierarchy(processor, id, version, baseAppManifest) {
-        log.verbose("Filling up app variant hierarchy in manifest.json");
-        if (baseAppManifest["sap.ui5"] == null) {
-            baseAppManifest["sap.ui5"] = {};
-        }
-        if (baseAppManifest["sap.ui5"].appVariantIdHierarchy == null) {
-            baseAppManifest["sap.ui5"].appVariantIdHierarchy = [];
-        }
-        const appVariantIdHierarchyItem = processor.createAppVariantHierarchyItem(id, version);
-        baseAppManifest["sap.ui5"].appVariantIdHierarchy.unshift(appVariantIdHierarchyItem);
-    }
-    adjustAddNewModelEnhanceWith(change, i18nBundleName) {
-        if (change.changeType === "appdescr_ui5_addNewModelEnhanceWith") {
-            if (change.texts == null) {
-                // We need to add texts properties to changes because not all
-                // have texts property. Changes without texts property can
-                // causes issues in bundle.js This is needed for now, and will
-                // be removed as soon as change merger in openUI5 is updated
-                change.texts = { i18n: change.content?.bundleUrl || "i18n/i18n.properties" };
-            }
-            change.texts.i18n = i18nBundleName + "/" + change.texts.i18n;
-        }
-    }
 }
 //# sourceMappingURL=baseAppManager.js.map

package/dist/bundle.js

@@ -116,14 +116,10 @@ function changePropertyValueByPath (vChanges, oRootPath) {
 }
 
 var Layer = {
-  USER: "USER",
-  PUBLIC: "PUBLIC",
   CUSTOMER: "CUSTOMER",
   CUSTOMER_BASE: "CUSTOMER_BASE",
   PARTNER: "PARTNER",
-  VENDOR: "VENDOR",
-  BASE: "BASE"
-};
+  VENDOR: "VENDOR"};
 
 function checkObjectProperties(oChangeObject, oPropertyBag) {
   const aObjects = oPropertyBag.aObjects || [];
@@ -2765,10 +2761,10 @@ const PROPERTIES_PATTERNS = {
   customType: "^false$"
 };
 const SUPPORTED_TYPES = {
-  uri: typeof "string",
-  type: typeof "string",
+  uri: "string",
+  type: "string",
   settings: typeof ({}),
-  dataSourceCustom: typeof false,
+  dataSourceCustom: "boolean",
   annotations: typeof []
 };
 function isDataSourceIdExistingInManifest(oManifestDataSources, sDataSourceId) {
@@ -2956,13 +2952,7 @@ var AddLibrary = {
 };
 
 var CondenserClassification = {
-  LastOneWins: "lastOneWins",
-  Reverse: "reverse",
-  Move: "move",
-  Create: "create",
-  Destroy: "destroy",
-  Update: "update"
-};
+  LastOneWins: "lastOneWins"};
 
 var SetTitle = {
   applyChange(oManifest) {
@@ -4046,7 +4036,7 @@ const RegistrationBuild = {
   appdescr_fiori_setAbstract: () => Promise.resolve(SetAbstract),
   appdescr_fiori_setCloudDevAdaptationStatus: () => Promise.resolve(SetCloudDevAdaptationStatus)
 };
-var RegistrationBuild$1 = {
+var RegistrationBuild_default = {
   ...Registration,
   ...RegistrationBuild
 };
@@ -5852,9 +5842,7 @@ var Type = {
   Reference: "Reference",
   Literal: "Literal",
   Variable: "Variable",
-  Call: "Call",
-  Custom: "Custom"
-};
+  Call: "Call"};
 var Op = {
   Equal: "==",
   NotEqual: "!=",
@@ -6391,10 +6379,12 @@ _Helper = {
     convert(mQueryOptions, "");
     return aPaths;
   },
-  copyPrivateAnnotation: function (oSource, sAnnotation, oTarget) {
+  copyPrivateAnnotation: function (oSource, sAnnotation, oTarget, bAllowSame) {
     if (_Helper.hasPrivateAnnotation(oSource, sAnnotation)) {
       if (_Helper.hasPrivateAnnotation(oTarget, sAnnotation)) {
-        throw new Error("Must not overwrite: " + sAnnotation);
+        if (!bAllowSame || _Helper.getPrivateAnnotation(oSource, sAnnotation) !== _Helper.getPrivateAnnotation(oTarget, sAnnotation)) {
+          throw new Error("Must not overwrite: " + sAnnotation);
+        }
       }
       _Helper.setPrivateAnnotation(oTarget, sAnnotation, _Helper.getPrivateAnnotation(oSource, sAnnotation));
     }
@@ -6658,8 +6648,8 @@ _Helper = {
   },
   fireChange: function (mChangeListeners, sPropertyPath, vValue, bForceUpdate, bInArray) {
     function inform(aChangeListeners, vValue0) {
-      for (let i = 0; i < aChangeListeners.length; i += 1) {
-        aChangeListeners[i].onChange(vValue0, bForceUpdate);
+      for (const oChangeListener of aChangeListeners) {
+        oChangeListener.onChange(vValue0, bForceUpdate);
       }
     }
     if (!mChangeListeners) {
@@ -6901,13 +6891,13 @@ _Helper = {
     return sPath;
   },
   getUrlParameters: function (sQuery) {
-    const mUrlParameters = {};
-    const oUrlParams = new URLSearchParams(sQuery);
-    for (const sKey of oUrlParams.keys()) {
-      const aValues = oUrlParams.getAll(sKey);
-      mUrlParameters[sKey] = aValues.length > 1 ? aValues : aValues[0];
+    const mURLParameters = {};
+    const oURLSearchParams = new URLSearchParams(sQuery);
+    for (const sKey of oURLSearchParams.keys()) {
+      const aValues = oURLSearchParams.getAll(sKey);
+      mURLParameters[sKey] = aValues.length > 1 ? aValues : aValues[0];
     }
-    return mUrlParameters;
+    return mURLParameters;
   },
   hasPathPrefix: function (sPath, sBasePath) {
     return _Helper.getRelativePath(sPath, sBasePath) !== undefined;
@@ -7076,11 +7066,20 @@ _Helper = {
     });
   },
   makeAbsolute: function (sUrl, sBase, bServiceUrl) {
-    const oUrl = new URL(sUrl, new URL(sBase, document.baseURI));
+    const oURL = new URL(sUrl, new URL(sBase, document.baseURI));
     if (bServiceUrl) {
-      oUrl.pathname = oUrl.pathname.slice(0, oUrl.pathname.lastIndexOf("/") + 1);
+      oURL.pathname = oURL.pathname.slice(0, oURL.pathname.lastIndexOf("/") + 1);
+    }
+    return oURL.origin === new URL(document.baseURI).origin ? oURL.toString().slice(oURL.origin.length) : oURL.toString();
+  },
+  makeAbsoluteLongtextUrl: function (oMessage, sBase) {
+    if (oMessage.longtextUrl) {
+      const sAbsoluteLongtextURL = _Helper.makeAbsolute(oMessage.longtextUrl, sBase);
+      if (oMessage.longtextUrl !== sAbsoluteLongtextURL) {
+        oMessage["@$ui5.originalMessage"] ??= _Helper.clone(oMessage);
+        oMessage.longtextUrl = sAbsoluteLongtextURL;
+      }
     }
-    return oUrl.origin === new URL(document.baseURI).origin ? oUrl.toString().slice(oUrl.origin.length) : oUrl.toString();
   },
   makeRelativePath: function (sPath, sBase) {
     return new _URL(sPath).relativeTo(new _URL(sBase));
@@ -7307,7 +7306,7 @@ _Helper = {
     Object.keys(oSource).forEach(function (sProperty) {
       var sPropertyPath = _Helper.buildPath(sPath, sProperty), vSourceProperty = oSource[sProperty], vTargetProperty = oTarget[sProperty];
       if (sProperty === "@$ui5._") {
-        _Helper.setPrivateAnnotation(oTarget, "predicate", _Helper.getPrivateAnnotation(oSource, "predicate"));
+        _Helper.copyPrivateAnnotation(oSource, "predicate", oTarget, true);
       } else if (Array.isArray(vSourceProperty)) {
         oTarget[sProperty] = vSourceProperty;
         _Helper.fireChange(mChangeListeners, sPropertyPath, vSourceProperty, false, true);
@@ -7343,7 +7342,7 @@ _Helper = {
             oOldObject[sProperty] = vNewProperty;
             _Helper.fireChanges(mChangeListeners, sPropertyPath, vNewProperty, false);
           }
-        } else if (vOldProperty !== vNewProperty) {
+        } else if (vOldProperty !== vNewProperty && !oOldObject[sProperty + "@$ui5.updating"]) {
           oOldObject[sProperty] = vNewProperty;
           if (vOldProperty && typeof vOldProperty === "object") {
             _Helper.fireChanges(mChangeListeners, sPropertyPath, vOldProperty, true);
@@ -7446,6 +7445,9 @@ _Helper = {
         }
         if (sProperty === "@$ui5._") {
           sSourcePredicate = _Helper.getPrivateAnnotation(oSource, "predicate");
+          if (!sSourcePredicate) {
+            return;
+          }
           if (fnCheckKeyPredicate && fnCheckKeyPredicate(sPath)) {
             sTargetPredicate = _Helper.getPrivateAnnotation(oTarget, "predicate");
             if (sSourcePredicate !== sTargetPredicate) {
@@ -9515,4 +9517,4 @@ _V4MetadataConverter.prototype.resolveTargetPath = function (sPath) {
   };
 })(_V4MetadataConverter.prototype);
 
-export { AppDescriptorChange, RawApplier, RegistrationBuild$1 as RegistrationBuild, URI, _V2MetadataConverter as V2MetadataConverter, _V4MetadataConverter as V4MetadataConverter };
+export { AppDescriptorChange, RawApplier, RegistrationBuild_default as RegistrationBuild, URI, _V2MetadataConverter as V2MetadataConverter, _V4MetadataConverter as V4MetadataConverter };

package/dist/cache/cacheHolder.js

@@ -68,12 +68,17 @@ export function cached() {
     return function (_target, _propertyKey, descriptor) {
         const originalValue = descriptor.value;
         descriptor.value = async function (...args) {
-            let files = await CacheHolder.read(args[0], args[1]);
-            CacheHolder.clearOutdatedExcept(args[0]);
+            const repoName = args[0];
+            const cachebusterToken = args[1];
+            let files = await CacheHolder.read(repoName, cachebusterToken);
+            CacheHolder.clearOutdatedExcept(repoName);
             if (files.size === 0) {
-                log.verbose(`Cache repo '${args[0]}' with token '${args[1]}' does not contain files. Fetching...`);
+                log.verbose(`No cache for repo '${repoName}' with token '${cachebusterToken}'. Fetching from HTML5 Repository.`);
                 files = await originalValue.apply(this, args);
-                await CacheHolder.write(args[0], args[1], files);
+                await CacheHolder.write(repoName, cachebusterToken, files);
+            }
+            else {
+                log.verbose(`Using cached files for repo '${repoName}' with token '${cachebusterToken}'.`);
             }
             return files;
         };

package/dist/index.js

@@ -2,7 +2,6 @@ import * as dotenv from "dotenv";
 import { logBuilderVersion } from "./util/commonUtil.js";
 import AppVariant from "./appVariantManager.js";
 import BaseApp from "./baseAppManager.js";
-import I18nMerger from "./util/i18nMerger.js";
 import ResourceUtil from "./util/resourceUtil.js";
 import { determineProcessor } from "./processors/processor.js";
 import FilesUtil from "./util/filesUtil.js";
@@ -15,6 +14,7 @@ export default ({ workspace, options, taskUtil }) => {
     async function process(workspace, taskUtil) {
         logBuilderVersion();
         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 appVariantIdHierarchy = await processor.getAppVariantIdHierarchy(adaptationProject.reference);
@@ -37,10 +37,14 @@ export default ({ workspace, options, taskUtil }) => {
                 appVariant = adaptationProject;
             }
             appVariants.push(appVariant);
-            const adaptedFiles = await baseApp.adapt(appVariant, processor);
-            return I18nMerger.merge(adaptedFiles, baseApp.i18nPath, appVariant);
+            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());
+            return mergedFiles;
         };
         let files = await fetchFilesPromises.reduce(async (previousFiles, currentFiles) => adapt(await previousFiles, await currentFiles), fetchFilesPromises.shift());
+        files = await adapter.createPostCommandChain().execute(files);
         const references = getReferences(appVariants, adaptationProject.id);
         files = FilesUtil.filter(files);
         files = FilesUtil.rename(files, references);

package/dist/model/appVariantIdHierarchyItem.d.ts

@@ -1,5 +1,10 @@
-export default interface IAppVariantIdHierarchyItem {
+export interface IAppVariantIdHierarchyItem {
     appVariantId: string;
     repoName: string;
     cachebusterToken: string;
 }
+export interface IAppVariantIdHierarchyManifestItem {
+    appVariantId: string;
+    version: string;
+    layer?: "VENDOR";
+}

package/dist/model/types.d.ts

@@ -116,4 +116,10 @@ export interface IJsonPromisePerLanguage {
     language: Language;
     json: Promise<any>;
 }
+export type ServiceCredentials = {
+    endpoints: Record<string, {
+        destination: string;
+    } | string>;
+    "sap.cloud.service"?: string;
+};
 export { IConfiguration };

package/dist/previewManager.js

@@ -1,6 +1,8 @@
 import { getLogger } from "@ui5/logger";
 import ResourceUtil from "./util/resourceUtil.js";
 import path from "path";
+import { merge } from "./util/cf/xsAppJsonUtil.js";
+import FsUtil from "./util/fsUtil.js";
 const log = getLogger("@ui5/task-adaptation::PreviewManager");
 const REUSE_DIR = ".adp/reuse";
 const APP_INFO_FILE = "ui5AppInfo.json";
@@ -11,13 +13,15 @@ export default class PreviewManager {
         let ui5AppInfo = "";
         if (PreviewManager.isPreviewRequested()) {
             try {
-                ui5AppInfo = await ResourceUtil.readInProject(APP_INFO_FILE);
+                ui5AppInfo = await FsUtil.readInProject(APP_INFO_FILE);
             }
-            catch (_err) {
-                log.verbose("Preview mode not requested (env variable ADP_BUILDER_MODE=preview is not set), skipping preview resources processing.");
-                throw new Error(`ui5AppInfo.json is missing in project root, cannot process preview resources.`);
+            catch (error) {
+                throw new Error(`ui5AppInfo.json is missing in project root, cannot process preview resources: ${error instanceof Error ? error.message : String(error)}`);
             }
         }
+        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);
     }
     static isPreviewRequested() {
@@ -26,6 +30,7 @@ export default class PreviewManager {
     constructor(appId, ui5AppInfo, processor) {
         // If no ui5AppInfo is provided, no preview processing is needed
         if (!ui5AppInfo) {
+            log.verbose("No ui5AppInfo provided, skipping preview resources processing.");
             return;
         }
         const appInfo = JSON.parse(ui5AppInfo)[appId];
@@ -49,7 +54,7 @@ export default class PreviewManager {
     }
     async processPreviewResources(baseAppFiles) {
         log.verbose(`Downloading reuse libraries to reuse folder`);
-        const xsAppFiles = new Map();
+        const xsAppFiles = new Array();
         if (this.fetchLibsPromises.size === 0) {
             log.verbose("No reuse libraries defined in ui5AppInfo.json for preview");
             return;
@@ -64,7 +69,7 @@ export default class PreviewManager {
             for (const [filename, content] of libFiles) {
                 mergedFiles.set(filename, content);
                 if (filename.includes(XS_APP_JSON_FILE)) {
-                    xsAppFiles.set(filename, content);
+                    xsAppFiles.push(content);
                 }
             }
         }
@@ -86,29 +91,17 @@ export default class PreviewManager {
     searchBaseAppXsAppJsonFile(xsAppFiles, baseAppFiles) {
         const xsAppJsonContent = baseAppFiles.get(XS_APP_JSON_FILE);
         if (xsAppJsonContent) {
-            xsAppFiles.set(XS_APP_JSON_FILE, xsAppJsonContent);
+            xsAppFiles.push(xsAppJsonContent);
         }
         else {
             log.warn("xs-app.json is missing in the downloaded base app files for preview");
         }
     }
     mergeXsAppJsonFiles(xsAppFiles, files) {
-        // Start with empty xs-app.json
-        // welcomeFile is not needed for preview
-        const mergedXsAppJson = {
-            authenticationMethod: "none",
-            routes: []
-        };
-        xsAppFiles.forEach((xsAppInfoContent) => {
-            const xsAppInfo = JSON.parse(xsAppInfoContent);
-            if (mergedXsAppJson.authenticationMethod === "none" && xsAppInfo.authenticationMethod) {
-                mergedXsAppJson.authenticationMethod = xsAppInfo.authenticationMethod;
-            }
-            if (Array.isArray(xsAppInfo.routes)) {
-                mergedXsAppJson.routes = mergedXsAppJson.routes.concat(xsAppInfo.routes);
-            }
-        });
-        files.set(XS_APP_JSON_FILE, JSON.stringify(mergedXsAppJson, null, 2));
+        const mergedXsAppJson = merge(xsAppFiles);
+        if (mergedXsAppJson) {
+            files.set(XS_APP_JSON_FILE, mergedXsAppJson);
+        }
     }
     static moveLibraryFiles(inputFiles, libraryName, libId) {
         const files = new Map();