@ui5/task-adaptation 1.6.5-rc.3 → 1.6.5

package/dist/{baseAppManager.js → baseApp.js}

@@ -1,4 +1,5 @@
 import { trimExtension } from "./util/commonUtil.js";
+import { validateAppId } from "./util/validator/validator.js";
 const IGNORE_FILES = [
     "manifest-bundle.zip",
     "Component-preload.js",
@@ -72,22 +73,15 @@ export default class BaseApp {
         }
         return "i18n/i18n";
     }
-    VALIDATION_RULES = new Map([["sap.app/id", (value) => {
-                if (!value.includes(".")) {
-                    // https://help.sap.com/docs/bas/developing-sap-fiori-app-in-sap-business-application-studio/releasing-sap-fiori-application-to-be-extensible-in-adaptation-projects-on-sap-s-4hana-cloud
-                    // In the manifest.json file, make sure that the attribute
-                    // sap.app/id has at least 2 segments.
-                    throw new Error(`The original application id '${value}' should consist of multiple segments split by dot, e.g.: original.id`);
-                }
-            }]]);
+    VALIDATION_RULES = new Map([["sap.app/id", validateAppId]]);
     validateProperty(value, property) {
         if (!value) {
             throw new Error(`Original application manifest should have ${property}`);
         }
-        let validatationRule = this.VALIDATION_RULES.get(property);
-        if (validatationRule) {
-            validatationRule(value);
+        let validationRule = this.VALIDATION_RULES.get(property);
+        if (validationRule) {
+            validationRule(value);
         }
     }
 }
-//# sourceMappingURL=baseAppManager.js.map
+//# sourceMappingURL=baseApp.js.map

package/dist/bundle.js

@@ -6301,7 +6301,7 @@ class _URL extends URL {
 		}
 	}
 
-var rAmpersand = /&/g, rApplicationGroupID = /^\w+$/, sClassName$2 = "sap.ui.model.odata.v4.lib._Helper", rEquals = /\=/g, rGroupID = /^(\$auto(\.\w+)?|\$direct|\w+)$/, rHash = /#/g, rNotMetaContext = /\([^/]*|\/-?\d+/g, rPlus = /\+/g, rSingleQuote = /'/g, rSingleQuoteTwice = /''/g, rWhitespace = /\s+/g, _Helper;
+var rAmpersand = /&/g, rApplicationGroupID = /^\w+$/, sClassName$2 = "sap.ui.model.odata.v4.lib._Helper", rEndsWithTransientPredicate = /\(\$uid=[-\w]+\)$/, rEquals = /\=/g, rGroupID = /^(\$auto(\.\w+)?|\$direct|\w+)$/, rHash = /#/g, rNotMetaContext = /\([^/]*|\/-?\d+/g, rPlus = /\+/g, rSingleQuote = /'/g, rSingleQuoteTwice = /''/g, rWhitespace = /\s+/g, _Helper;
 _Helper = {
   addByPath: function (mMap, sPath, oItem) {
     if (oItem) {
@@ -6495,6 +6495,19 @@ _Helper = {
     convert(mQueryOptions, "");
     return aPaths;
   },
+  copyETags: function (oSource, oTarget) {
+    if (_Helper.getPrivateAnnotation(oSource, "predicate") !== _Helper.getPrivateAnnotation(oTarget, "predicate")) {
+      return;
+    }
+    oTarget["@odata.etag"] = oSource["@odata.etag"];
+    for (const sKey in oSource) {
+      const vSourceProperty = oSource[sKey];
+      const vTargetProperty = oTarget[sKey];
+      if (vSourceProperty && vTargetProperty && typeof vSourceProperty === "object" && !Array.isArray(vSourceProperty)) {
+        _Helper.copyETags(vSourceProperty, vTargetProperty);
+      }
+    }
+  },
   copyPrivateAnnotation: function (oSource, sAnnotation, oTarget, bAllowSame) {
     if (_Helper.hasPrivateAnnotation(oSource, sAnnotation)) {
       if (_Helper.hasPrivateAnnotation(oTarget, sAnnotation)) {
@@ -6540,6 +6553,10 @@ _Helper = {
         if (typeof oResult.message === "object") {
           oResult.message = oResult.error.message.value;
         }
+        const oClone = oResult.error["@$ui5.originalMessage"] = _Helper.clone(oResult.error);
+        oResult.error.details?.forEach(function (oDetail, i) {
+          oDetail["@$ui5.originalMessage"] = oClone.details[i];
+        });
       } catch (e) {
         Log.warning(e.toString(), sBody, sClassName$2);
       }
@@ -6583,7 +6600,7 @@ _Helper = {
     };
   },
   createTechnicalDetails: function (oMessage) {
-    var oClonedMessage, oError = oMessage["@$ui5.error"], oOriginalMessage = oMessage["@$ui5.originalMessage"] || oMessage, oTechnicalDetails = {};
+    var oClonedMessage, oError = oMessage["@$ui5.error"], oOriginalMessage = oMessage["@$ui5.originalMessage"], oTechnicalDetails = {};
     if (oError && (oError.status || oError.cause)) {
       oError = oError.cause || oError;
       oTechnicalDetails.httpStatus = oError.status;
@@ -6594,7 +6611,7 @@ _Helper = {
         oTechnicalDetails.retryAfter = oError.retryAfter;
       }
     }
-    if (!(oOriginalMessage instanceof Error)) {
+    if (oOriginalMessage) {
       Object.defineProperty(oTechnicalDetails, "originalMessage", {
         enumerable: true,
         get: function () {
@@ -6709,9 +6726,11 @@ _Helper = {
         message: oMessage.message,
         numericSeverity: iNumericSeverity,
         technical: bTechnical || oMessage.technical,
-        "@$ui5.error": oError,
-        "@$ui5.originalMessage": oMessage
+        "@$ui5.error": oError
       };
+      if (!(oMessage instanceof Error)) {
+        oRawMessage["@$ui5.originalMessage"] = oMessage["@$ui5.originalMessage"] ?? oMessage;
+      }
       Object.keys(oMessage).forEach(function (sProperty) {
         if (sProperty[0] === "@") {
           if (sProperty.endsWith(".numericSeverity")) {
@@ -7016,6 +7035,28 @@ _Helper = {
     }
     return mURLParameters;
   },
+  getUsedPaths: function (aPaths, mQueryOptions) {
+    function isRelated(sPath0, sPath1) {
+      return _Helper.hasPathPrefix(sPath0, sPath1) || _Helper.hasPathPrefix(sPath1, sPath0);
+    }
+    function isUsed(sPath, mQueryOptionsForPath) {
+      let bPathMatchedExpand = false;
+      const aSelect = mQueryOptionsForPath.$select || ["*"];
+      const mExpand = mQueryOptionsForPath.$expand || ({});
+      return sPath === "*" || (sPath in mExpand) || aSelect.includes(sPath) || aSelect.some(sSelect => isRelated(sPath, sSelect)) || Object.keys(mExpand).some(sExpand => {
+        if (_Helper.hasPathPrefix(sPath, sExpand)) {
+          bPathMatchedExpand = true;
+          return isUsed(sPath.slice(sExpand.length + 1), mExpand[sExpand]);
+        }
+        if (_Helper.hasPathPrefix(sExpand, sPath)) {
+          bPathMatchedExpand = true;
+          return true;
+        }
+        return false;
+      }) || !bPathMatchedExpand && aSelect.includes("*");
+    }
+    return aPaths.filter(sPath => isUsed(sPath, mQueryOptions));
+  },
   hasPathPrefix: function (sPath, sBasePath) {
     return _Helper.getRelativePath(sPath, sBasePath) !== undefined;
   },
@@ -7134,6 +7175,9 @@ _Helper = {
     }
     return mResult;
   },
+  isAffectedBy: function (sPropertyPath, sSideEffectsPath) {
+    return _Helper.hasPathPrefix(sPropertyPath, sSideEffectsPath.endsWith("/*") ? sSideEffectsPath.slice(0, -2) : sSideEffectsPath);
+  },
   isDataAggregation: function (mParameters) {
     return mParameters && mParameters.$$aggregation && !mParameters.$$aggregation.hierarchyQualifier;
   },
@@ -7190,13 +7234,7 @@ _Helper = {
     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;
-      }
-    }
+    oMessage.longtextUrl &&= _Helper.makeAbsolute(oMessage.longtextUrl, sBase);
   },
   makeRelativePath: function (sPath, sBase) {
     return new _URL(sPath).relativeTo(new _URL(sBase));
@@ -7212,6 +7250,9 @@ _Helper = {
       return oResult;
     }, vValue);
   },
+  matchEndsWithTransientPredicate: function (sPath) {
+    return rEndsWithTransientPredicate.exec(sPath);
+  },
   merge: fnMerge,
   mergeQueryOptions: function (mQueryOptions, sOrderby, aFilters) {
     var mResult;

package/dist/cache/cacheHolder.d.ts

@@ -1,6 +1,6 @@
 export default class CacheHolder {
     private static TEMP_TASK_DIR;
-    private static getTempDir;
+    static getTempDir(...paths: string[]): string;
     static read(repoName: string, token: string): Promise<Map<string, string>>;
     static write(repoName: string, token: string, files: Map<string, string>): Promise<void>;
     private static isValid;

package/dist/index.d.ts

@@ -2,5 +2,5 @@ import { ITaskParameters } from "./model/types.js";
 /**
  * Creates an appVariant bundle from the provided resources.
  */
-declare const _default: ({ workspace, options, taskUtil }: ITaskParameters) => Promise<void>;
+declare const _default: ({ workspace, options, taskUtil }: ITaskParameters) => Promise<ReadonlyMap<string, string>>;
 export default _default;

package/dist/index.js

@@ -1,79 +1,44 @@
 import * as dotenv from "dotenv";
-import { logBuilderVersion } from "./util/commonUtil.js";
-import AppVariant from "./appVariantManager.js";
-import BaseApp from "./baseAppManager.js";
-import ResourceUtil from "./util/resourceUtil.js";
-import FilesUtil from "./util/filesUtil.js";
-import PreviewManager from "./previewManager.js";
+import { getReferences, logBuilderVersion } from "./util/commonUtil.js";
+import AppVariant from "./appVariant.js";
+import BaseApp from "./baseApp.js";
 import { initialize } from "./landscapeConfiguration.js";
 /**
  * Creates an appVariant bundle from the provided resources.
  */
-export default ({ workspace, options, taskUtil }) => {
+export default async ({ workspace, options, taskUtil }) => {
+    const ui5BuilderTools = {
+        workspace,
+        projectNamespace: options.projectNamespace,
+        taskUtil,
+    };
     dotenv.config();
-    async function process(workspace, taskUtil) {
-        logBuilderVersion();
-        const { repository, adapter } = initialize(options.configuration);
-        const adaptationProject = await AppVariant.fromWorkspace(workspace, options.projectNamespace);
-        const previewManagerPromise = PreviewManager.createFromRoot(adaptationProject.reference, repository, options.configuration);
-        const appVariantIdHierarchy = await repository.getAppVariantIdHierarchy(adaptationProject.reference);
-        if (appVariantIdHierarchy.length === 0) {
-            throw new Error(`No app variant found for reference ${adaptationProject.reference}`);
-        }
-        // appVariantIdHierarchy contains original application on bottom and the
-        // latest app variant on top. We reverse the list to process original
-        // application first and then app variants in chronological order.
-        const reversedHierarchy = appVariantIdHierarchy.toReversed();
-        const fetchFilesPromises = reversedHierarchy.map(variant => repository.fetch(variant));
-        fetchFilesPromises.push(Promise.resolve(adaptationProject.files));
-        const appVariants = new Array();
-        const adapt = async (baseAppFiles, appVariantFiles) => {
-            let baseApp = BaseApp.fromFiles(baseAppFiles);
-            let appVariant = AppVariant.fromFiles(appVariantFiles);
-            // If the app variant is the same as the adaptation project, we use the
-            // adaptation project because it contains resources that should be updated.
-            if (appVariant.id === adaptationProject.id) {
-                appVariant = adaptationProject;
-            }
-            appVariants.push(appVariant);
-            const adaptCommandChain = adapter.createAdaptCommandChain(baseApp, appVariant);
-            const mergeCommandChain = adapter.createMergeCommandChain(baseApp, appVariant);
-            const adaptedFiles = await adaptCommandChain.execute();
-            const mergedFiles = await mergeCommandChain.execute(adaptedFiles);
-            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);
-        adaptationProject.omitDeletedResources(files, options.projectNamespace, taskUtil);
-        // Read libs for preview
-        const previewManager = await previewManagerPromise;
-        const writePromises = new Array(previewManager.processPreviewResources(files));
-        files.forEach((content, filename) => {
-            const resource = ResourceUtil.createResource(filename, options.projectNamespace, content);
-            writePromises.push(workspace.write(resource));
-        });
-        await Promise.all(writePromises);
+    logBuilderVersion();
+    const { repository, adapter } = initialize(options.configuration);
+    const adaptationProject = await AppVariant.fromWorkspace(workspace, options.projectNamespace);
+    const setupCommandChain = adapter.createSetupCommandChain(adaptationProject.reference, repository);
+    await setupCommandChain.execute();
+    const appVariantIdHierarchy = await repository.getAppVariantIdHierarchy(adaptationProject.reference);
+    if (appVariantIdHierarchy.length === 0) {
+        throw new Error(`No app variant found for reference ${adaptationProject.reference}`);
     }
-    return process(workspace, taskUtil);
-    /**
-     * 4p. Reference map contains searchTerm as key and replacement as value. Base
-     * id and app variant ids are renamed to adaptation project id.
-     */
-    function getReferences(appVariants, adaptationProjectId) {
-        const references = new Map();
-        appVariants.forEach((variant, i) => {
-            if (i === 0) {
-                references.set(variant.reference, adaptationProjectId);
-            }
-            if (variant.id !== adaptationProjectId) {
-                references.set(variant.id, adaptationProjectId);
-            }
-            variant.getRenamingForMovedFiles().forEach((value, key) => references.set(key, value));
-        });
-        return references;
+    // appVariantIdHierarchy contains original application on bottom and the
+    // latest app variant on top. We reverse the list to process original
+    // application first and then app variants in chronological order.
+    const reversedHierarchy = appVariantIdHierarchy.toReversed();
+    const fetchFilesPromises = reversedHierarchy.map(variant => repository.fetch(variant));
+    const appVariants = new Array();
+    const adapt = async (baseFiles, appVariant) => {
+        appVariants.push(appVariant);
+        const baseApp = BaseApp.fromFiles(baseFiles);
+        return adapter.createAdaptCommandChain(baseApp, appVariant).execute();
+    };
+    let files = await fetchFilesPromises.shift(); // original app files
+    for (const appVariantFiles of fetchFilesPromises) {
+        files = await adapt(files, AppVariant.fromFiles(await appVariantFiles));
     }
+    files = await adapt(files, adaptationProject);
+    const references = getReferences(appVariants, adaptationProject.id);
+    return adapter.createPostCommandChain(references, adaptationProject, ui5BuilderTools).execute(files);
 };
 //# sourceMappingURL=index.js.map

package/dist/model/configuration.d.ts

@@ -22,3 +22,4 @@ export interface IAbapTargetMeta {
     name?: string;
     ignoreCertErrors?: boolean;
 }
+export declare const REUSE_DIR = ".adp/reuse";

package/dist/model/configuration.js

@@ -1,2 +1,3 @@
 export const LANDSCAPE_TYPES = ["cf", "abap"];
+export const REUSE_DIR = ".adp/reuse";
 //# sourceMappingURL=configuration.js.map

package/dist/model/types.d.ts

@@ -1,3 +1,4 @@
+import TaskUtil from "@ui5/project/build/helpers/TaskUtil";
 import { IConfiguration } from "./configuration.js";
 import Language from "./language.js";
 export interface IProjectOptions {
@@ -74,9 +75,14 @@ export interface IChangeContent {
     supportedLocales?: string[];
 }
 export interface ITaskParameters {
-    workspace: any;
+    workspace: IWorkspace;
     options: IProjectOptions;
-    taskUtil: any;
+    taskUtil: TaskUtil;
+}
+export interface UI5BuilderTools {
+    workspace: IWorkspace;
+    projectNamespace: string;
+    taskUtil: TaskUtil;
 }
 export interface IBaseAppInfo {
     filepath: string;
@@ -123,4 +129,5 @@ export type ServiceCredentials = {
     } | string>;
     "sap.cloud.service"?: string;
 };
+export type FetchFilesPromise = Map<string, Promise<ReadonlyMap<string, string>>>;
 export { IConfiguration };

package/dist/repositories/localRepository.d.ts

@@ -7,7 +7,6 @@ export default class LocalRepository implements IRepository {
     downloadAnnotationFile(_uri: string): Promise<Map<string, string>>;
     getAppVariantIdHierarchy(appId: string): Promise<ILocalResource[]>;
     fetch(resource: ILocalResource): Promise<Map<string, string>>;
-    private collectAppVariantIdHierarchyItems;
-    private getExistingManifestPath;
-    private getLocalFilesDirectory;
+    private buildManifestIndex;
+    private getLocalFilesDir;
 }

package/dist/repositories/localRepository.js

@@ -1,6 +1,7 @@
 import { getLogger } from "@ui5/logger";
 import path from "node:path";
 import fs from "node:fs/promises";
+import { glob } from "glob";
 import FsUtil from "../util/fsUtil.js";
 const log = getLogger("@ui5/task-adaptation::LocalRepository");
 export default class LocalRepository {
@@ -10,48 +11,68 @@ export default class LocalRepository {
     }
     async getAppVariantIdHierarchy(appId) {
         const items = [];
-        await this.collectAppVariantIdHierarchyItems(appId, items);
+        const baseDir = this.getLocalFilesDir();
+        const index = await this.buildManifestIndex(baseDir);
+        const visited = new Set();
+        let currentAppId = appId;
+        while (currentAppId) {
+            if (visited.has(currentAppId)) {
+                throw new Error(`Cycle detected in app variant hierarchy: '${currentAppId}' was already visited. Visited IDs: ${[...visited].join(" -> ")} -> ${currentAppId}`);
+            }
+            visited.add(currentAppId);
+            const entry = index.get(currentAppId);
+            if (!entry) {
+                throw new Error(`App '${currentAppId}' not found in local directory '${baseDir}'.`);
+            }
+            items.push({
+                appName: currentAppId,
+                cacheBusterToken: Promise.resolve("local"),
+                absolutePath: entry.absolutePath,
+            });
+            if (entry.isVariant) {
+                if (!entry.reference || typeof entry.reference !== "string") {
+                    throw new Error(`Invalid or missing 'reference' for app variant '${currentAppId}': expected a non-empty string but got '${entry.reference}'`);
+                }
+                currentAppId = entry.reference;
+            }
+            else {
+                currentAppId = undefined;
+            }
+        }
         return items;
     }
     fetch(resource) {
         log.verbose(`Fetching base app files from local directory: ${resource.absolutePath}`);
         return FsUtil.readFilesRecursively(resource.absolutePath);
     }
-    async collectAppVariantIdHierarchyItems(appId, items) {
-        const appDir = this.getLocalFilesDirectory(appId);
-        const filenames = [
-            { path: ["webapp", "manifest.json"], suffix: "" },
-            { path: ["webapp", "manifest.appdescr_variant"], suffix: "" },
-            { path: ["manifest.json"], suffix: "-opt-static-abap" },
-            { path: ["manifest.appdescr_variant"], suffix: "-opt-static-abap" },
-        ];
-        const filepaths = filenames.map((filename) => path.join(appDir + filename.suffix, ...filename.path));
-        const existingManifestPath = await this.getExistingManifestPath(filepaths);
-        items.push({
-            appName: appId,
-            cacheBusterToken: Promise.resolve("local"),
-            absolutePath: path.dirname(existingManifestPath),
-        });
-        if (existingManifestPath.endsWith("manifest.appdescr_variant")) {
-            const manifestContent = await fs.readFile(existingManifestPath, "utf-8");
-            const manifest = JSON.parse(manifestContent);
-            await this.collectAppVariantIdHierarchyItems(manifest.reference, items);
-        }
-    }
-    async getExistingManifestPath(filePaths) {
-        const existenceChecks = await Promise.all(filePaths.map((filePath) => FsUtil.exists(filePath)));
-        const existingIndex = existenceChecks.findIndex((exists) => exists);
-        if (existingIndex !== -1) {
-            return filePaths[existingIndex];
+    async buildManifestIndex(baseDir) {
+        const index = new Map();
+        const manifestPaths = await glob("**/manifest.{json,appdescr_variant}", { cwd: baseDir, absolute: true, dot: true });
+        for (const manifestPath of manifestPaths) {
+            const content = await fs.readFile(manifestPath, "utf-8");
+            const manifest = JSON.parse(content);
+            const isVariant = manifestPath.endsWith("manifest.appdescr_variant");
+            const id = isVariant ? manifest.id : manifest["sap.app"]?.id;
+            if (typeof id === "string" && id) {
+                index.set(id, {
+                    absolutePath: path.dirname(manifestPath),
+                    reference: manifest.reference,
+                    isVariant,
+                });
+            }
         }
-        throw new Error(`None of the paths exist: '${filePaths.join("', '")}'.`);
+        return index;
     }
-    getLocalFilesDirectory(appId) {
+    getLocalFilesDir() {
         const adpDirConfigured = process.env.ADP_BUILDER_DIR;
-        const adpDir = adpDirConfigured
-            ? path.normalize(adpDirConfigured).replace(/\\/g, "/").replace(/\/+$/, "").split("/")
-            : [".."];
-        return path.join(process.cwd(), ...adpDir, appId);
+        if (adpDirConfigured) {
+            const unix = adpDirConfigured.replace(/\\/g, "/").replace(/\/+$/, "");
+            if (/^[A-Za-z]:/.test(adpDirConfigured) || path.isAbsolute(unix)) {
+                return unix;
+            }
+            return path.join(process.cwd(), unix);
+        }
+        throw new Error("Environment variable 'ADP_BUILDER_DIR' is not set. Please set it to the directory containing the local app files.");
     }
 }
 //# sourceMappingURL=localRepository.js.map

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

@@ -1,4 +1,17 @@
-import { IConfiguration, ServiceCredentials } from "../../model/types.js";
+import { ServiceCredentials } from "../../model/types.js";
+export type XsApp = {
+    welcomeFile?: string;
+    authenticationMethod: "none" | "route";
+    routes: Route[];
+};
+export type Route = {
+    source: string;
+    target: string;
+    service?: string;
+    destination?: string;
+    authenticationType?: string;
+    localDir?: string;
+};
 export declare const XSAPP_JSON_FILENAME = "xs-app.json";
 /**
  * Merges multiple xs-app.json contents into one. AppVariant and Reuse Library
@@ -10,5 +23,5 @@ 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>;
+export declare function enhanceRoutes(serviceCredentials: ServiceCredentials, baseRoutes: Route[]): Route[];
+export declare function fetchCredentialsAndEnhanceRoutes(xsAppJson: string, serviceCredentialsPromise: Promise<ServiceCredentials | undefined>): Promise<string>;

package/dist/util/cf/xsAppJsonUtil.js

@@ -1,5 +1,4 @@
 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";
 /**
@@ -63,7 +62,7 @@ export function enhanceRoutes(serviceCredentials, baseRoutes) {
         return acc;
     }, {});
     return baseRoutes.map((route) => {
-        const endpointName = destinationToEndpoint[route.destination];
+        const endpointName = route.destination && destinationToEndpoint[route.destination];
         if (endpointName) {
             // There is a matching endpoint: remove destination and add endpoint/service
             const { destination: _destination, ...rest } = route;
@@ -79,22 +78,12 @@ 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}'`);
+export async function fetchCredentialsAndEnhanceRoutes(xsAppJson, serviceCredentialsPromise) {
+    const serviceCredentials = await serviceCredentialsPromise;
+    if (!serviceCredentials) {
+        log.verbose(`No service credentials available. Skipping xs-app.json update.`);
+        return xsAppJson;
     }
-    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;
+    return enhanceRoutesWithEndpointAndService(xsAppJson, serviceCredentials);
 }
 //# sourceMappingURL=xsAppJsonUtil.js.map

package/dist/util/commonUtil.d.ts

@@ -1,5 +1,6 @@
 import { IConfiguration } from "../model/types.js";
 import Language from "../model/language.js";
+import AppVariant from "../appVariant.js";
 export declare function dotToUnderscore(value: string): string;
 export declare function validateConfiguration<T extends object>(options: T, properties: Array<keyof T>): void;
 export declare function validateObject<T extends object>(options: T, properties: Array<keyof T>, message: string): void;
@@ -12,3 +13,8 @@ export declare function logBuilderVersion(): void;
 export declare function logBetaUsage(): void;
 export declare function getUniqueName(existingNames: string[], template: string): string;
 export declare function isManifestChange(filename: string, content: string): boolean;
+/**
+ * 4p. Reference map contains searchTerm as key and replacement as value. Base
+ * id and app variant ids are renamed to adaptation project id.
+ */
+export declare function getReferences(appVariants: AppVariant[], adaptationProjectId: string): Map<string, string>;

package/dist/util/commonUtil.js

@@ -98,4 +98,21 @@ export function isManifestChange(filename, content) {
     }
     return false;
 }
+/**
+ * 4p. Reference map contains searchTerm as key and replacement as value. Base
+ * id and app variant ids are renamed to adaptation project id.
+ */
+export function getReferences(appVariants, adaptationProjectId) {
+    const references = new Map();
+    appVariants.forEach((variant, i) => {
+        if (i === 0) {
+            references.set(variant.reference, adaptationProjectId);
+        }
+        if (variant.id !== adaptationProjectId) {
+            references.set(variant.id, adaptationProjectId);
+        }
+        variant.getRenamingForMovedFiles().forEach((value, key) => references.set(key, value));
+    });
+    return references;
+}
 //# sourceMappingURL=commonUtil.js.map

package/dist/util/fsUtil.d.ts

@@ -1,5 +1,5 @@
 export default class FsUtil {
-    static readInProject(filepath: string): Promise<string>;
+    static readInProject(filepath: string, encoding?: BufferEncoding): Promise<Buffer | string>;
     /**
      * Check whether a file or directory exists (non-throwing).
      * @param filePath Absolute or relative path
@@ -7,5 +7,4 @@ export default class FsUtil {
      */
     private static fileExists;
     static readFilesRecursively(rootDirectory: string): Promise<Map<string, string>>;
-    static exists(filePath: string): Promise<boolean>;
 }

package/dist/util/fsUtil.js

@@ -7,9 +7,9 @@ export default class FsUtil {
      * @param filepath The relative file path from the project root (e.g. 'ui5AppInfo.json').
      * @returns A promise that resolves to the file content as a string.
      */
-    static async readInProject(filepath) {
+    static async readInProject(filepath, encoding) {
         try {
-            return await fs.readFile(path.join(process.cwd(), filepath), "utf-8");
+            return await fs.readFile(path.join(process.cwd(), filepath), encoding);
         }
         catch (error) {
             const isProjectRoot = await FsUtil.fileExists(path.join(process.cwd(), "ui5.yaml"));
@@ -37,38 +37,17 @@ export default class FsUtil {
         }
     }
     static async readFilesRecursively(rootDirectory) {
-        const directoriesToScan = [rootDirectory];
-        const fileReadTasks = [];
-        while (directoriesToScan.length > 0) {
-            const currentDirectory = directoriesToScan.pop();
-            if (!currentDirectory) {
-                continue;
-            }
-            const entries = await fs.readdir(currentDirectory, { withFileTypes: true });
-            for (const entry of entries) {
-                const entryPath = path.join(currentDirectory, entry.name);
-                if (entry.isDirectory()) {
-                    directoriesToScan.push(entryPath);
-                }
-                else if (entry.isFile()) {
-                    fileReadTasks.push((async () => {
-                        const relativeFilePath = path.relative(rootDirectory, entryPath);
-                        const content = await fs.readFile(entryPath, "utf-8");
-                        return [relativeFilePath, content];
-                    })());
-                }
-            }
-        }
+        const entries = await fs.readdir(rootDirectory, { withFileTypes: true, recursive: true });
+        const fileReadTasks = entries
+            .filter(entry => entry.isFile())
+            .map(async (entry) => {
+            const parentPath = entry.parentPath ?? entry.path; // node v20.11.0 fallback
+            const entryPath = path.join(parentPath, entry.name);
+            const relativeFilePath = path.relative(rootDirectory, entryPath).replaceAll("\\", "/");
+            const content = await fs.readFile(entryPath, "utf-8");
+            return [relativeFilePath, content];
+        });
         return new Map(await Promise.all(fileReadTasks));
     }
-    static async exists(filePath) {
-        try {
-            await fs.access(filePath);
-            return true;
-        }
-        catch {
-            return false;
-        }
-    }
 }
 //# sourceMappingURL=fsUtil.js.map