@ui5/task-adaptation 1.4.3 → 1.5.1

package/CHANGELOG.md

@@ -2,10 +2,13 @@
 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.4.3...HEAD).
+A list of unreleased changes can be found [here](https://github.com/SAP/ui5-task-adaptation/compare/v1.5.1...HEAD).
+
+<a name="v1.5.1"></a>
+## [v1.5.1] - 2025-08-06
 
 <a name="v1.4.3"></a>
-## [v1.4.3] - 2025-04-07
+## [v1.4.3] - 2025-04-17
 ### Bug Fixes
 - Handling undefined oAuthScopes ([#122](https://github.com/SAP/ui5-task-adaptation/issues/122)) [`ea6296b`](https://github.com/SAP/ui5-task-adaptation/commit/ea6296b143e7fcbf8ce3902499be2d4c2fea61a5)
 - Better error handling in CF ([#121](https://github.com/SAP/ui5-task-adaptation/issues/121)) [`8ce564f`](https://github.com/SAP/ui5-task-adaptation/commit/8ce564fa847a512f4de341f14b1788bca3075da8)
@@ -116,6 +119,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.5.1]: https://github.com/SAP/ui5-task-adaptation/compare/v1.4.3...v1.5.1
 [v1.4.3]: https://github.com/SAP/ui5-task-adaptation/compare/v1.4.2...v1.4.3
 [v1.4.2]: https://github.com/SAP/ui5-task-adaptation/compare/v1.4.0...v1.4.2
 [v1.4.0]: https://github.com/SAP/ui5-task-adaptation/compare/v1.3.3...v1.4.0

package/README.md

@@ -4,28 +4,29 @@
 [![npm version](https://badge.fury.io/js/@ui5%2Ftask-adaptation.svg)](https://badge.fury.io/js/@ui5%2Ftask-adaptation)
 
 ## Description
-A custom task for [ui5-builder](https://github.com/SAP/ui5-builder) that allows building SAPUI5 adaptation projects for [SAP S/4HANA Cloud](https://help.sap.com/docs/bas/584e0bcbfd4a4aff91c815cefa0bce2d/6fc4e11a4b1941efa8e37a428d046f8f.html?locale=en-US&state=PRODUCTION&version=Cloud) and [SAP BTP, Cloud Foundry environment](https://help.sap.com/viewer/584e0bcbfd4a4aff91c815cefa0bce2d/Cloud/en-US/019b0c38a6b043d1a66b11d992eed290.html).
+A custom task for [ui5-builder](https://github.com/SAP/ui5-builder) that allows you to build SAPUI5 adaptation projects for [SAP S/4HANA Cloud](https://help.sap.com/docs/bas/584e0bcbfd4a4aff91c815cefa0bce2d/6fc4e11a4b1941efa8e37a428d046f8f.html?locale=en-US&state=PRODUCTION&version=Cloud) and [SAP BTP, Cloud Foundry environment](https://help.sap.com/viewer/584e0bcbfd4a4aff91c815cefa0bce2d/Cloud/en-US/019b0c38a6b043d1a66b11d992eed290.html).
 
 ### Configuration
-#### ABAP Connection
-The following connection configuration format is used to connect to ABAP repository in IDE:
+#### Connection
+When creating an adaptation project, the Yeoman generator automatically generates the following connection configurations in the `ui5.yaml` file, depending on your IDE:
+
+For local IDEs like VS Code:
 ```yaml
 target:
   url: example.com,
-  authenticationType: basic | reentranceTicket,
+  authenticationType: reentranceTicket,
   ignoreCertErrors: true | false
 ```
-and in SAP Business Application Studio:
+In SAP Business Application Studio:
 ```yaml
 target:
   destination: abc
 ```
-OnPremise ABAP repository requires `authenticationType: basic`, credentials should be provided in project root `.env` file:
-```
-FIORI_TOOLS_USER=<username>
-FIORI_TOOLS_PASSWORD=<password>
-```
-Whereas S4/Hana uses `authenticationType: reentranceTicket` to authentificate. A browser window will be opened.
+
+For more information, see [Create an Adaptation Project](https://help.sap.com/docs/bas/developing-sap-fiori-app-in-sap-business-application-studio/create-project) (on SAP S/4HANA Cloud) or [Create an Adaptation Project](https://help.sap.com/docs/bas/developing-sap-fiori-app-in-sap-business-application-studio/create-adaptation-project-c7b455d488bc4229af7efe0311546752) (on SAP BTP, Cloud Foundry environment).
+> [!NOTE]  
+> For SAP S/4HANA (on-premise) systems, a different builder is used.
+
 
 ## How to obtain support
 In case you need any support, please create a [GitHub issue](https://github.com/SAP/ui5-task-adaptation/issues).
@@ -34,4 +35,7 @@ In case you need any support, please create a [GitHub issue](https://github.com/
 Copyright (c) 2020 SAP SE or an SAP affiliate company. All rights reserved. This file and all other files in this repository are licensed under the Apache License, v 2.0 except as noted otherwise in the [LICENSE file](LICENSE).
 
 ## Release History
-See [CHANGELOG.md](CHANGELOG.md).
+See [CHANGELOG.md](CHANGELOG.md).
+
+## Contributing
+Please refer to the [SAP Contribution Guidelines](https://github.com/SAP/.github/blob/main/CONTRIBUTING.md) for instructions on how to contribute to ui5-task-adaptation.

package/dist/annotationManager.js

@@ -1,4 +1,3 @@
-import BaseAppManager from "./baseAppManager.js";
 import DataSourceManager from "./annotations/dataSource/dataSourceManager.js";
 import I18nManager from "./i18nManager.js";
 import ServiceRequestor from "./annotations/serviceRequestor.js";
@@ -15,8 +14,7 @@ export default class AnnotationManager {
     }
     ANNOTATIONS_FOLDER = "annotations";
     async process(renamedBaseAppManifest, languages) {
-        const { id } = BaseAppManager.getIdVersion(renamedBaseAppManifest);
-        BaseAppManager.validateProperty(id, "sap.app/id");
+        const { id } = renamedBaseAppManifest["sap.app"];
         const normalisedId = this.normalizeAppVariantId(id);
         //TODO: switch to this after resolving @i18n custom model
         const modelName = I18N_DEFAULT_MODEL_NAME; //`i18n_a9n_${normalisedId}`;

package/dist/annotations/serviceRequestor.js

@@ -4,7 +4,6 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-import AnnotationsCacheManager from "../cache/annotationsCacheManager.js";
 import ServerError from "../model/serverError.js";
 import { getLogger } from "@ui5/logger";
 import { writeTempAnnotations } from "../util/commonUtil.js";
@@ -46,20 +45,9 @@ export default class ServiceRequestor {
     //old decorators are already subject of compiler error, but it works. So we
     //wait till esbuild implement it correctly.
     async downloadAnnotation(uri, name, language) {
-        let cacheName = name;
-        if (language.sap) {
-            uri += `?sap-language=${language.sap}`;
-            cacheName += `-${language.sap}`;
-        }
-        const cacheManager = new AnnotationsCacheManager(this.configuration, cacheName);
-        log.verbose(`Getting annotation '${cacheName}' ${language} by '${uri}'`);
-        let files;
-        if (this.configuration.enableAnnotationCache) {
-            files = await cacheManager.getFiles(() => this.abapRepoManager.getAnnotationMetadata(uri), () => this.abapRepoManager.downloadAnnotationFile(uri));
-        }
-        else {
-            files = await this.abapRepoManager.downloadAnnotationFile(uri);
-        }
+        uri += `?sap-language=${language.sap}`;
+        log.verbose(`Getting annotation '${name}' ${language} by '${uri}'`);
+        let files = await this.abapRepoManager.downloadAnnotationFile(uri);
         if (!files || files.size === 0) {
             throw new Error(`No files were fetched for '${name}' by '${uri}'`);
         }

package/dist/appVariantManager.d.ts

@@ -1,12 +1,19 @@
-import { IAppVariantInfo } from "./model/types.js";
-export default class AppVariantManager {
-    static process(appVariantResources: any[], projectNamespace: string, taskUtil: any): Promise<IAppVariantInfo>;
-    static getAppVariantResourcesToProcess(workspace: any): Promise<any[]>;
-    static updateChanges(appVariantResources: any[], projectNamespace: string): Promise<void>;
-    private static isManifestChange;
-    private static isManifestAppVariant;
-    static getAppVariantInfo(appVariantResources: any[]): Promise<IAppVariantInfo>;
-    private static validateManifest;
-    private static updateRelativePaths;
-    private static omitFiles;
+import { IChange } from "./model/types.js";
+import TaskUtil from "@ui5/project/build/helpers/TaskUtil";
+export default class AppVariant {
+    readonly files: ReadonlyMap<string, string>;
+    readonly resources?: ReadonlyArray<Resource>;
+    readonly id: string;
+    readonly reference: string;
+    readonly layer: any;
+    readonly content: any;
+    static fromWorkspace(workspace: IWorkspace, projectNamespace: string): Promise<AppVariant>;
+    static fromFiles(files: ReadonlyMap<string, string>): AppVariant;
+    private constructor();
+    getProcessedFiles(): Map<string, string>;
+    getProcessedManifestChanges(): IChange[];
+    private validateManifest;
+    private updateRelativePaths;
+    private isManifestChange;
+    omitDeletedResources(files: ReadonlyMap<string, string>, projectNamespace: string, taskUtil: TaskUtil): void;
 }

package/dist/appVariantManager.js

@@ -1,101 +1,98 @@
 import ResourceUtil from "./util/resourceUtil.js";
 import { posix as path } from "path";
-import { renameResources } from "./util/commonUtil.js";
-const EXTENSIONS_TO_PROCESS = "js,json,xml,html,properties,change,appdescr_variant,ctrl_variant,ctrl_variant_change,ctrl_variant_management_change,variant,fioriversion,codeChange,xmlViewChange,context";
-export default class AppVariantManager {
-    static async process(appVariantResources, projectNamespace, taskUtil) {
-        for (const resource of appVariantResources) {
-            this.omitFiles(resource, taskUtil);
-        }
-        await this.updateChanges(appVariantResources, projectNamespace);
-        return this.getAppVariantInfo(appVariantResources);
+import { rename } from "./util/commonUtil.js";
+const CHANGES_DIR = "changes/";
+const CHANGES_EXT = ".change";
+const MANIFEST_CHANGE = "appdescr_";
+export default class AppVariant {
+    files;
+    resources;
+    id;
+    reference;
+    layer;
+    content;
+    static async fromWorkspace(workspace, projectNamespace) {
+        const EXTENSIONS_TO_PROCESS = "js,json,xml,html,properties,change,appdescr_variant,ctrl_variant,ctrl_variant_change,ctrl_variant_management_change,variant,fioriversion,codeChange,xmlViewChange,context";
+        const resources = await workspace.byGlob(`/**/*.{${EXTENSIONS_TO_PROCESS}}`);
+        const files = await ResourceUtil.toFileMap(resources, projectNamespace);
+        return new AppVariant(files, resources);
+    }
+    static fromFiles(files) {
+        return new AppVariant(files);
     }
-    static getAppVariantResourcesToProcess(workspace) {
-        return workspace.byGlob(`/**/*.{${EXTENSIONS_TO_PROCESS}}`);
+    constructor(files, resources) {
+        this.files = files;
+        this.resources = resources;
+        const manifestString = files.get("manifest.appdescr_variant");
+        this.validateManifest(manifestString);
+        const { reference, id, layer, content } = JSON.parse(manifestString);
+        this.reference = reference;
+        this.id = id;
+        this.layer = layer;
+        this.content = content;
     }
-    static async updateChanges(appVariantResources, projectNamespace) {
-        const changesFolder = ResourceUtil.getResourcePath(projectNamespace, "changes");
-        const changes = new Map();
-        const resourcesByPath = new Map();
-        let manifest;
-        for (const resource of appVariantResources) {
-            if (this.isManifestAppVariant(resource)) {
-                manifest = await ResourceUtil.getJson(resource);
+    getProcessedFiles() {
+        const files = new Map();
+        this.files.forEach((content, filename) => {
+            if (filename.startsWith(CHANGES_DIR)) {
+                if (!this.isManifestChange(filename, content)) {
+                    files.set(filename, rename(content, this.reference, this.id));
+                }
             }
-            const resourcePath = resource.getPath();
-            const basename = path.dirname(resourcePath);
-            if (basename.startsWith(changesFolder)) {
-                changes.set(resourcePath, await ResourceUtil.getString(resource));
-                resourcesByPath.set(resourcePath, resource);
+            else if (filename !== "manifest.appdescr_variant") {
+                files.set(filename, content);
             }
-        }
-        this.updateRelativePaths(changes, projectNamespace);
-        this.validateManifest(manifest);
-        const renamedChanges = renameResources(changes, manifest.reference, manifest.id);
-        renamedChanges.forEach((renamedContent, resourcePath) => {
-            const resource = resourcesByPath.get(resourcePath);
-            ResourceUtil.setString(resource, renamedContent);
         });
+        return files;
     }
-    static isManifestChange(resource) {
-        const changesManifestFolder = path.join("changes", "manifest");
-        const resourcePath = typeof resource === "string" ? resource : resource.getPath();
-        const dirname = path.dirname(resourcePath);
-        return dirname.endsWith(changesManifestFolder);
-    }
-    static isManifestAppVariant(resource) {
-        const MANIFEST_APP_VARIANT = "manifest.appdescr_variant";
-        const basename = path.basename(resource.getPath());
-        return basename === MANIFEST_APP_VARIANT;
-    }
-    static async getAppVariantInfo(appVariantResources) {
-        let manifest;
-        const manifestChanges = [];
-        for (const resource of appVariantResources) {
-            if (this.isManifestAppVariant(resource)) {
-                manifest = await ResourceUtil.getJson(resource);
-            }
-            else if (this.isManifestChange(resource)) {
-                const content = await ResourceUtil.getString(resource);
-                manifestChanges.push(JSON.parse(content));
-            }
-        }
-        this.validateManifest(manifest);
+    getProcessedManifestChanges() {
         // Order is important: apply manifest.json changes first, then *.change
         // files. UI5 does the same.
-        const changes = (manifest.content ?? []).concat(manifestChanges);
-        return {
-            id: manifest.id,
-            reference: manifest.reference,
-            layer: manifest.layer,
-            changes
-        };
+        const manifestChanges = structuredClone(this.content) ?? [];
+        this.files.forEach((content, filename) => {
+            if (this.isManifestChange(filename, content)) {
+                const change = JSON.parse(rename(content, this.reference, this.id));
+                this.updateRelativePaths(change, filename);
+                manifestChanges.push(change);
+            }
+        });
+        if (this.layer) {
+            manifestChanges.forEach(change => change.layer = this.layer ?? change.layer);
+        }
+        return manifestChanges;
     }
-    static validateManifest(manifest) {
+    validateManifest(manifest) {
         if (!manifest) {
             throw new Error("Adaptation project should contain manifest.appdescr_variant");
         }
     }
-    // TODO In future this should be handled by merger which needs to know change and target location
-    static updateRelativePaths(changes, projectNamespace) {
-        changes.forEach((jsonString, resourcePath) => {
-            if (this.isManifestChange(resourcePath)) {
-                const change = JSON.parse(jsonString);
-                if (change.changeType === "appdescr_app_addAnnotationsToOData") {
-                    for (const dataSource of Object.values(change.content.dataSource)) {
-                        if (!dataSource.uri.startsWith("/")) {
-                            const basepath = path.dirname(ResourceUtil.relativeToRoot(resourcePath, projectNamespace));
-                            dataSource.uri = path.join(basepath.replace(/^\//, ""), dataSource.uri);
-                        }
-                    }
-                    changes.set(resourcePath, JSON.stringify(change));
+    updateRelativePaths(change, filename) {
+        // TODO In future this should be handled by merger which needs to know change and target location
+        if (change.changeType === "appdescr_app_addAnnotationsToOData") {
+            for (const dataSource of Object.values(change?.content?.dataSource)) {
+                if (!dataSource.uri.startsWith("/")) {
+                    const basepath = path.dirname(filename);
+                    dataSource.uri = path.join(basepath.replace(/^\//, ""), dataSource.uri);
                 }
             }
-        });
+        }
     }
-    static omitFiles(resource, taskUtil) {
-        if (this.isManifestAppVariant(resource) || this.isManifestChange(resource)) {
-            taskUtil.setTag(resource, taskUtil.STANDARD_TAGS.OmitFromBuildResult, true);
+    isManifestChange(filename, content) {
+        if (filename.endsWith(CHANGES_EXT)) {
+            const change = JSON.parse(content);
+            return change.changeType?.startsWith(MANIFEST_CHANGE);
+        }
+        return false;
+    }
+    omitDeletedResources(files, projectNamespace, taskUtil) {
+        if (!this.resources) {
+            return;
+        }
+        for (const resource of this.resources) {
+            const relativePath = ResourceUtil.relativeToRoot(resource.getPath(), projectNamespace);
+            if (!files.has(relativePath)) {
+                taskUtil.setTag(resource, taskUtil.STANDARD_TAGS.OmitFromBuildResult, true);
+            }
         }
     }
 }

package/dist/baseAppManager.d.ts

@@ -1,4 +1,4 @@
-import { IAppVariantInfo, IProjectOptions } from "./model/types.js";
+import AppVariant from "./appVariantManager.js";
 import IProcessor from "./processors/processor.js";
 export interface IBaseAppResources {
     resources: any[];
@@ -11,19 +11,19 @@ export interface IManifestIdVersion {
 export interface IManifestInfo extends IManifestIdVersion {
     i18nPath: string;
 }
-export default class BaseAppManager {
-    static process(baseAppFiles: Map<string, string>, appVariantInfo: IAppVariantInfo, options: IProjectOptions, processor: IProcessor): Promise<IBaseAppResources>;
-    private static updateAdaptationProperties;
-    static getIdVersion(manifest: any): IManifestIdVersion;
-    static getManifestInfo(manifest: any): IManifestInfo;
-    private static extractI18nPathFromManifest;
-    private static extractI18NFromBundleName;
-    private static extractI18NFromBundleUrl;
-    private static getBaseAppManifest;
-    private static fillAppVariantIdHierarchy;
-    private static VALIDATION_RULES;
-    static validateProperty(value: string, property: string): void;
-    static applyDescriptorChanges(baseAppManifest: any, { layer, changes, id }: IAppVariantInfo): Promise<void>;
-    private static adjustAddNewModelEnhanceWith;
-    static writeToWorkspace(baseAppFiles: Map<string, string>, projectNamespace: string): any[];
+export default class BaseApp {
+    readonly id: string;
+    readonly version: string;
+    readonly i18nPath: string;
+    readonly files: ReadonlyMap<string, string>;
+    static fromFiles(files: ReadonlyMap<string, string>): BaseApp;
+    private constructor();
+    adapt(appVariant: AppVariant, processor: IProcessor): Promise<ReadonlyMap<string, string>>;
+    private updateAdaptationProperties;
+    private extractI18nPathFromManifest;
+    private fillAppVariantIdHierarchy;
+    private VALIDATION_RULES;
+    private validateProperty;
+    private applyDescriptorChanges;
+    private adjustAddNewModelEnhanceWith;
 }

package/dist/baseAppManager.js

@@ -1,29 +1,46 @@
-import { Applier, AppDescriptorChange, RegistrationBuild } from "../dist/bundle.js";
-import { dotToUnderscore, removePropertiesExtension } from "./util/commonUtil.js";
+import { AppDescriptorChange, Applier, RegistrationBuild } from "../dist/bundle.js";
+import { dotToUnderscore, trimExtension } from "./util/commonUtil.js";
 import BuildStrategy from "./buildStrategy.js";
-import ResourceUtil from "./util/resourceUtil.js";
 import { getLogger } from "@ui5/logger";
 import { renameResources } from "./util/commonUtil.js";
 const log = getLogger("@ui5/task-adaptation::BaseAppManager");
-export default class BaseAppManager {
-    static async process(baseAppFiles, appVariantInfo, options, processor) {
-        const baseAppManifest = this.getBaseAppManifest(baseAppFiles);
-        const { id, version } = this.getIdVersion(baseAppManifest.content);
-        this.validateProperty(id, "sap.app/id");
-        this.validateProperty(version, "sap.app/applicationVersion/version");
-        const renamedBaseAppFiles = renameResources(baseAppFiles, appVariantInfo.reference, appVariantInfo.id);
-        const { filepath, content } = this.getBaseAppManifest(renamedBaseAppFiles);
-        await processor.updateLandscapeSpecificContent(content, renamedBaseAppFiles);
-        this.fillAppVariantIdHierarchy(processor, id, version, content);
-        this.updateAdaptationProperties(content);
-        await this.applyDescriptorChanges(content, appVariantInfo);
-        renamedBaseAppFiles.set(filepath, JSON.stringify(content));
-        return {
-            resources: this.writeToWorkspace(renamedBaseAppFiles, options.projectNamespace),
-            manifestInfo: this.getManifestInfo(content)
-        };
+const IGNORE_FILES = [
+    "manifest-bundle.zip",
+    "Component-preload.js",
+    "sap-ui-cachebuster-info.json"
+];
+export default class BaseApp {
+    id;
+    version;
+    i18nPath;
+    files;
+    static fromFiles(files) {
+        return new BaseApp(files);
     }
-    static updateAdaptationProperties(content) {
+    constructor(files) {
+        this.files = new Map([...files].filter(([filename]) => !IGNORE_FILES.includes(filename)));
+        const manifestString = files.get("manifest.json");
+        if (!manifestString) {
+            throw new Error("Original application should have manifest.json in root folder");
+        }
+        const manifest = JSON.parse(manifestString);
+        this.id = manifest["sap.app"]?.id;
+        this.version = manifest["sap.app"]?.applicationVersion?.version;
+        this.validateProperty(this.id, "sap.app/id");
+        this.validateProperty(this.version, "sap.app/applicationVersion/version");
+        this.i18nPath = this.extractI18nPathFromManifest(this.id, manifest["sap.app"]?.i18n);
+    }
+    async adapt(appVariant, processor) {
+        const files = renameResources(this.files, appVariant.reference, appVariant.id);
+        const manifest = JSON.parse(files.get("manifest.json"));
+        await processor.updateLandscapeSpecificContent(manifest, files);
+        this.fillAppVariantIdHierarchy(processor, this.id, this.version, manifest);
+        this.updateAdaptationProperties(manifest);
+        await this.applyDescriptorChanges(manifest, appVariant);
+        files.set("manifest.json", JSON.stringify(manifest));
+        return files;
+    }
+    updateAdaptationProperties(content) {
         if (content["sap.fiori"]?.cloudDevAdaptationStatus) {
             delete content["sap.fiori"].cloudDevAdaptationStatus;
         }
@@ -32,42 +49,21 @@ export default class BaseAppManager {
         }
         content["sap.ui5"].isCloudDevAdaptation = true;
     }
-    static getIdVersion(manifest) {
-        const id = manifest["sap.app"]?.id;
-        const version = manifest["sap.app"]?.applicationVersion?.version;
-        return { id, version };
-    }
-    static getManifestInfo(manifest) {
-        const { id, version } = this.getIdVersion(manifest);
-        const i18nNode = manifest["sap.app"]?.i18n;
-        const i18nPath = this.extractI18nPathFromManifest(id, i18nNode);
-        return { id, version, i18nPath };
-    }
-    static extractI18nPathFromManifest(sapAppId, i18nNode) {
-        if (typeof i18nNode === "object") {
-            return i18nNode["bundleUrl"] ? this.extractI18NFromBundleUrl(i18nNode) : this.extractI18NFromBundleName(i18nNode, sapAppId);
-        }
-        else {
-            return `${sapAppId?.replaceAll(".", "/")}/${i18nNode}`;
-        }
-    }
-    static extractI18NFromBundleName(i18nNode, sapAppId) {
-        return i18nNode["bundleName"].replace(sapAppId, "").replaceAll(".", "/").substring(1);
-    }
-    static extractI18NFromBundleUrl(i18nNode) {
-        return removePropertiesExtension(i18nNode["bundleUrl"]);
-    }
-    static getBaseAppManifest(baseAppFiles) {
-        const manifestContent = baseAppFiles.get("manifest.json");
-        if (manifestContent) {
-            return {
-                content: JSON.parse(manifestContent),
-                filepath: "manifest.json"
-            };
+    extractI18nPathFromManifest(sapAppId, i18nNode) {
+        if (i18nNode) {
+            if (i18nNode["bundleUrl"]) {
+                return trimExtension(i18nNode["bundleUrl"]);
+            }
+            else if (i18nNode["bundleName"]) {
+                return i18nNode["bundleName"].replace(sapAppId, "").replaceAll(".", "/").substring(1);
+            }
+            else if (typeof i18nNode === "string") {
+                return trimExtension(i18nNode);
+            }
         }
-        throw new Error("Original application should have manifest.json in root folder");
+        return "i18n/i18n";
     }
-    static fillAppVariantIdHierarchy(processor, id, version, baseAppManifest) {
+    fillAppVariantIdHierarchy(processor, id, version, baseAppManifest) {
         log.verbose("Filling up app variant hierarchy in manifest.json");
         if (baseAppManifest["sap.ui5"] == null) {
             baseAppManifest["sap.ui5"] = {};
@@ -78,12 +74,12 @@ export default class BaseAppManager {
         const appVariantIdHierarchyItem = processor.createAppVariantHierarchyItem(id, version);
         baseAppManifest["sap.ui5"].appVariantIdHierarchy.unshift(appVariantIdHierarchyItem);
     }
-    static VALIDATION_RULES = new Map([["sap.app/id", (value) => {
+    VALIDATION_RULES = new Map([["sap.app/id", (value) => {
                 if (!value.includes(".")) {
                     throw new Error(`The original application id '${value}' should consist of multiple segments split by dot, e.g.: original.id`);
                 }
             }]]);
-    static validateProperty(value, property) {
+    validateProperty(value, property) {
         if (!value) {
             throw new Error(`Original application manifest should have ${property}`);
         }
@@ -92,14 +88,11 @@ export default class BaseAppManager {
             validatationRule(value);
         }
     }
-    static async applyDescriptorChanges(baseAppManifest, { layer, changes, id }) {
+    async applyDescriptorChanges(baseAppManifest, appVariant) {
         log.verbose("Applying appVariant changes");
         const changesContent = new Array();
-        const i18nBundleName = dotToUnderscore(id);
-        for (const change of structuredClone(changes)) {
-            if (layer) {
-                change.layer = layer;
-            }
+        const i18nBundleName = dotToUnderscore(appVariant.id);
+        for (const change of appVariant.getProcessedManifestChanges()) {
             changesContent.push(new AppDescriptorChange(change));
             this.adjustAddNewModelEnhanceWith(change, i18nBundleName);
         }
@@ -108,7 +101,7 @@ export default class BaseAppManager {
             await Applier.applyChanges(baseAppManifest, changesContent, strategy);
         }
     }
-    static adjustAddNewModelEnhanceWith(change, i18nBundleName) {
+    adjustAddNewModelEnhanceWith(change, i18nBundleName) {
         if (change.changeType === "appdescr_ui5_addNewModelEnhanceWith") {
             if (change.texts == null) {
                 // We need to add texts properties to changes because not all
@@ -120,20 +113,5 @@ export default class BaseAppManager {
             change.texts.i18n = i18nBundleName + "/" + change.texts.i18n;
         }
     }
-    static writeToWorkspace(baseAppFiles, projectNamespace) {
-        const IGNORE_FILES = [
-            "manifest-bundle.zip",
-            "Component-preload.js",
-            "sap-ui-cachebuster-info.json"
-        ];
-        const resources = [];
-        for (let filename of baseAppFiles.keys()) {
-            if (!IGNORE_FILES.includes(filename)) {
-                const resource = ResourceUtil.createResource(filename, projectNamespace, baseAppFiles.get(filename));
-                resources.push(resource);
-            }
-        }
-        return resources;
-    }
 }
 //# sourceMappingURL=baseAppManager.js.map