@ui5/task-adaptation 1.0.15 → 1.0.16

package/CHANGELOG.md

@@ -2,10 +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.0.15...HEAD).
+A list of unreleased changes can be found [here](https://github.com/SAP/ui5-task-adaptation/compare/v1.0.16...HEAD).
 
-<a name="v1.0.15"></a>
-## [v1.0.15] - 2022-11-29
+<a name="v1.0.16"></a>
+## [v1.0.16] - 2023-08-15
 
 <a name="v1.0.11"></a>
 ## [v1.0.11] - 2022-03-01
@@ -46,7 +46,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.0.15]: https://github.com/SAP/ui5-task-adaptation/compare/v1.0.11...v1.0.15
+[v1.0.16]: https://github.com/SAP/ui5-task-adaptation/compare/v1.0.11...v1.0.16
 [v1.0.11]: https://github.com/SAP/ui5-task-adaptation/compare/v1.0.10...v1.0.11
 [v1.0.10]: https://github.com/SAP/ui5-task-adaptation/compare/v1.0.9...v1.0.10
 [v1.0.9]: https://github.com/SAP/ui5-task-adaptation/compare/v1.0.8...v1.0.9

package/README.md

@@ -7,7 +7,7 @@
 A custom task for [ui5-builder](https://github.com/SAP/ui5-builder) that allows building [UI5 Flexibility adaptation projects](https://help.sap.com/viewer/584e0bcbfd4a4aff91c815cefa0bce2d/Cloud/en-US/019b0c38a6b043d1a66b11d992eed290.html) for SAP BTP, Cloud Foundry environment.
 
 ## How to obtain support
-In case you need any support, please create a GitHub issue.
+In case you need any support, please create a [GitHub issue](https://github.com/SAP/ui5-task-adaptation/issues).
 
 ## License
 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).

package/dist/annotationManager.d.ts

@@ -0,0 +1,32 @@
+import AbapRepoManager from "./repositories/abapRepoManager";
+import { IConfiguration } from "./model/types";
+export interface IAnnotationFiles {
+    annotationName: string;
+    annotationFileName: string;
+}
+export default class AnnotationManager {
+    private abapRepoManager;
+    private configuration;
+    constructor(configuration: IConfiguration, abapRepoManager: AbapRepoManager);
+    ANNOTATIONS_FOLDER: string;
+    process(renamedBaseAppManifest: any, languages: string[]): Promise<Map<string, string>>;
+    private createI18nFiles;
+    private normalizeAppVariantId;
+    private createAnnotationFile;
+    private getNormalisedLanguage;
+    private getAdaptedAnnotation;
+    private getUniqueKeyForPath;
+    private downloadAnnotations;
+    private updateManifest;
+    private updateManifestDataSources;
+    private createManifestModel;
+    private enhanceManifestModel;
+    private downloadAnnotation;
+    private getODataAnnotations;
+    static traverseJson(obj: any, path: string): {
+        subject: any;
+        property: string;
+    };
+    private getDiffJsonPaths;
+    private traverseDiff;
+}

package/dist/annotationManager.js

@@ -0,0 +1,276 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const convert = require("xml-js");
+const path = require("path");
+const annotationsCacheManager_1 = require("./cache/annotationsCacheManager");
+const baseAppManager_1 = require("./baseAppManager");
+const json_diff_1 = require("json-diff");
+const util_1 = require("util");
+const { ResourceBundle } = require("../dist/bundle-resourceBundle");
+const I18N_DEFAULT_PATH = "i18n/annotations";
+const I18N_DEFAULT_MODEL_NAME = "@i18n";
+const SAPUI5 = "sap.ui5";
+const SAPAPP = "sap.app";
+const XML_OPTIONS = { compact: true, spaces: 4 };
+const log = require("@ui5/logger").getLogger("@ui5/task-adaptation::AnnotationManager");
+class AnnotationManager {
+    constructor(configuration, abapRepoManager) {
+        this.ANNOTATIONS_FOLDER = "annotations";
+        this.configuration = configuration;
+        this.abapRepoManager = abapRepoManager;
+    }
+    async process(renamedBaseAppManifest, languages) {
+        const { id } = baseAppManager_1.default.getManifestInfo(renamedBaseAppManifest);
+        baseAppManager_1.default.validateProperty(id, "sap.app/id");
+        const normalisedId = this.normalizeAppVariantId(id);
+        //TODO: switch to this after resolving @i18n custom model
+        const oDataAnnotations = this.getODataAnnotations(renamedBaseAppManifest);
+        const promises = this.downloadAnnotations(oDataAnnotations, languages);
+        const modelName = I18N_DEFAULT_MODEL_NAME; //`i18n_a9n_${normalisedId}`;
+        const i18nPathName = path.join(I18N_DEFAULT_PATH, normalisedId);
+        const keys = new Array();
+        const propertiesPerLanguage = new Map();
+        const annotationFiles = new Map();
+        const metaInfo = new Array();
+        for (const { promisesPerLanguage, annotationName } of promises) {
+            const annotationXml = await this.createAnnotationFile(promisesPerLanguage, keys, modelName, propertiesPerLanguage, id);
+            const annotationFileName = `annotations/annotation_${annotationName}.xml`;
+            annotationFiles.set(annotationFileName, annotationXml);
+            metaInfo.push({ annotationFileName, annotationName });
+        }
+        if (metaInfo.length > 0) {
+            this.updateManifest(renamedBaseAppManifest, metaInfo, modelName, i18nPathName);
+        }
+        const i18nFiles = this.createI18nFiles(propertiesPerLanguage, i18nPathName);
+        return new Map([...annotationFiles, ...i18nFiles]);
+    }
+    createI18nFiles(propertiesPerLanguage, i18nPathName) {
+        const files = new Map();
+        propertiesPerLanguage.forEach((i18nLines, language) => {
+            i18nLines.sort();
+            let filename = "i18n";
+            const normalisedLanguage = this.getNormalisedLanguage(language);
+            if (normalisedLanguage) {
+                filename += "_" + normalisedLanguage;
+            }
+            const filepath = path.join(i18nPathName, filename + ".properties");
+            files.set(filepath, i18nLines.join("\n"));
+        });
+        return files;
+    }
+    normalizeAppVariantId(id, replaceWith = "") {
+        return id.replace(/[.\W]+/gi, replaceWith);
+    }
+    async createAnnotationFile(promisesPerLanguage, keys, modelName, propertiesPerLanguage, appVariantId) {
+        const annotationJsons = new Map();
+        for (const promise of promisesPerLanguage) {
+            const { language, xml } = await promise;
+            annotationJsons.set(language, JSON.parse(convert.xml2json(xml, XML_OPTIONS)));
+        }
+        const paths = this.getDiffJsonPaths([...annotationJsons.values()]);
+        const { annotationJson, languageI18nContentMap } = this.getAdaptedAnnotation(paths, keys, annotationJsons, modelName, appVariantId);
+        languageI18nContentMap.forEach((i18nLines, language) => {
+            const properties = propertiesPerLanguage.get(language);
+            if (properties) {
+                properties.push(...i18nLines);
+            }
+            else {
+                propertiesPerLanguage.set(language, i18nLines);
+            }
+        });
+        return convert.json2xml(annotationJson, XML_OPTIONS);
+    }
+    getNormalisedLanguage(language) {
+        const normalisedLanguages = ResourceBundle._getFallbackLocales(language);
+        if (normalisedLanguages?.length > 0 && normalisedLanguages[0] != null && normalisedLanguages[0].length > 0) {
+            return normalisedLanguages[0].toLowerCase();
+        }
+    }
+    getAdaptedAnnotation(paths, keys, annotationJsons, modelName, appVariantId) {
+        const pathKeyMap = new Map();
+        const languageI18nContentMap = new Map();
+        for (const [language, json] of [...annotationJsons]) {
+            const lines = [];
+            for (const path of paths) {
+                const { subject, property } = AnnotationManager.traverseJson(json, path);
+                const value = subject[property];
+                const key = appVariantId + "_" + this.getUniqueKeyForPath(pathKeyMap, path, keys, value);
+                lines.push(key + "=" + value);
+                subject[property] = `{${modelName}>${key}}`;
+            }
+            if (lines.length > 0) {
+                languageI18nContentMap.set(language, lines);
+            }
+        }
+        return { annotationJson: [...annotationJsons][0][1], languageI18nContentMap };
+    }
+    getUniqueKeyForPath(pathKeyMap, path, keys, value) {
+        if (pathKeyMap.has(path)) {
+            return pathKeyMap.get(path);
+        }
+        const propertyName = value.replace(/\W/gi, "_").toUpperCase();
+        let suffix = "";
+        while (keys.includes(propertyName + suffix)) {
+            suffix = suffix === "" ? "0" : (parseInt(suffix) + 1).toString();
+        }
+        const key = propertyName + suffix;
+        pathKeyMap.set(path, key);
+        keys.push(key);
+        return key;
+    }
+    downloadAnnotations(annotations, languages) {
+        return [...annotations].map(([name, { uri }]) => ({
+            promisesPerLanguage: languages.map(language => this.downloadAnnotation(uri, name, language)),
+            annotationName: name
+        }));
+    }
+    updateManifest(renamedBaseAppManifest, metaInfo, modelName, i18nPathName) {
+        const uri = `${i18nPathName}/i18n.properties`;
+        this.enhanceManifestModel(renamedBaseAppManifest, modelName, uri);
+        //TODO: switch to this after resolving @i18n custom model
+        //this.createManifestModel(renamedBaseAppManifest, modelName, uri);
+        this.updateManifestDataSources(renamedBaseAppManifest, metaInfo);
+    }
+    updateManifestDataSources(renamedBaseAppManifest, metaInfo) {
+        const dataSources = renamedBaseAppManifest[SAPAPP]?.dataSources;
+        for (const { annotationName, annotationFileName } of metaInfo) {
+            dataSources[annotationName].uri = annotationFileName;
+        }
+    }
+    createManifestModel(manifest, modelName, uri) {
+        let sapui5 = manifest[SAPUI5] == null ? manifest[SAPUI5] = {} : manifest[SAPUI5];
+        if (sapui5.models == null) {
+            sapui5.models = {};
+        }
+        if (sapui5.models[modelName] == null) {
+            sapui5.models[modelName] = {};
+        }
+        sapui5.models[modelName].type = "sap.ui.model.resource.ResourceModel";
+        if (uri) {
+            sapui5.models[modelName].uri = uri;
+        }
+        return sapui5.models[modelName];
+    }
+    enhanceManifestModel(manifest, modelToEnhance, bundleUrl) {
+        let model = manifest[SAPUI5]?.models[modelToEnhance];
+        if (model) {
+            if (model.settings == null) {
+                model.settings = {};
+            }
+            if (model.settings.enhanceWith == null) {
+                model.settings.enhanceWith = [];
+            }
+            if (model.settings.enhanceWith.every((bundle) => bundle.bundleUrl !== bundleUrl)) {
+                model.settings.enhanceWith.push({
+                    bundleUrl,
+                    bundleUrlRelativeTo: "component"
+                });
+            }
+        }
+        else {
+            this.createManifestModel(manifest, modelToEnhance, bundleUrl);
+        }
+    }
+    async downloadAnnotation(uri, name, language) {
+        let annotationUri = `https://${this.configuration.destination}.dest${uri}`;
+        let cacheFilename = name;
+        if (language) {
+            annotationUri += `?sap-language=${language}`;
+            cacheFilename += `-${language}`;
+        }
+        const cacheManager = new annotationsCacheManager_1.default(this.configuration, cacheFilename);
+        log.verbose(`Getting annotation '${name}' ${language} by '${annotationUri}'`);
+        try {
+            const files = await cacheManager.getFiles(() => this.abapRepoManager.getAnnotationMetadata(annotationUri), () => this.abapRepoManager.downloadAnnotationFile(annotationUri));
+            if (!files || files.size === 0) {
+                throw new Error(`No files were fetched for '${name}' by '${annotationUri}'`);
+            }
+            return { language, xml: [...files][0][1] };
+        }
+        catch (error) {
+            throw new Error(`Failed to fetch annotation '${name}' by '${annotationUri}': ${error.message}`);
+        }
+    }
+    getODataAnnotations(renamedBaseAppManifest) {
+        const oDataAnnotations = new Map();
+        const dataSources = renamedBaseAppManifest[SAPAPP]?.dataSources;
+        if (dataSources) {
+            for (const key of Object.keys(dataSources)) {
+                const annotation = dataSources[key];
+                if (annotation?.type === "ODataAnnotation" && annotation?.uri?.startsWith("/")) {
+                    oDataAnnotations.set(key, dataSources[key]);
+                }
+            }
+        }
+        return oDataAnnotations;
+    }
+    static traverseJson(obj, path) {
+        const checkArrayIndex = (part) => {
+            if (Array.isArray(subject)) {
+                const item = parseInt(part);
+                if (isNaN(item)) {
+                    throw new Error(`Array index '${part}' is not a number in path '${path}' for ${json}`);
+                }
+            }
+        };
+        const json = util_1.inspect(obj, true, 100, false);
+        const pathParts = path.split("/");
+        if (path.endsWith("/")) {
+            pathParts.pop();
+        }
+        let property = pathParts.pop();
+        let subject = obj;
+        for (const part of pathParts) {
+            let item = part;
+            checkArrayIndex(part);
+            subject = subject[item];
+            if (subject == null) {
+                throw new Error(`Property '${item}' is undefined in path '${path}' for ${json}`);
+            }
+        }
+        checkArrayIndex(property);
+        if (subject[property] == null) {
+            throw new Error(`Target property '${property}' is undefined in path '${path}' for ${json}`);
+        }
+        return { subject, property };
+    }
+    getDiffJsonPaths(jsons) {
+        const paths = new Set();
+        if (jsons.length > 1) {
+            for (let j = 1; j < jsons.length; j++) {
+                const diffResult = json_diff_1.diff(jsons[0], jsons[j], { full: false, sort: false });
+                // if diffResult is undefined -> jsons are the same
+                if (diffResult) {
+                    for (const path of this.traverseDiff(diffResult)) {
+                        paths.add(path);
+                    }
+                }
+            }
+        }
+        return [...paths];
+    }
+    traverseDiff(obj, path = "") {
+        const branches = [];
+        if (Array.isArray(obj)) {
+            for (let i = 0; i < obj.length; i++) {
+                const item = obj[i];
+                if (item[0] == "~") {
+                    branches.push(...this.traverseDiff(item[1], path + `${i}/`));
+                }
+            }
+        }
+        else {
+            for (const key of Object.keys(obj)) {
+                if (key == "__old" || key == "__new") {
+                    branches.push(path);
+                }
+                else {
+                    branches.push(...this.traverseDiff(obj[key], path + `${key}/`));
+                }
+            }
+        }
+        return branches;
+    }
+}
+exports.default = AnnotationManager;
+//# sourceMappingURL=annotationManager.js.map

package/dist/appVariantManager.js

@@ -1,13 +1,4 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 const path = require("path");
 const resourceUtil_1 = require("./util/resourceUtil");
@@ -18,34 +9,29 @@ const OMIT_FOLDERS = [];
 const EXTENSIONS = "js,json,xml,html,properties,change,appdescr_variant";
 const MANIFEST_APP_VARIANT = "manifest.appdescr_variant";
 class AppVariantManager {
-    static process(appVariantResources, projectNamespace, taskUtil) {
-        var _a, _b;
-        return __awaiter(this, void 0, void 0, function* () {
-            const appVariantInfo = yield this.getAppVariantInfo(appVariantResources);
-            const i18nBundleName = commonUtil_1.replaceDots(appVariantInfo.id);
-            for (const resource of appVariantResources) {
-                this.writeI18nToModule(resource, projectNamespace, i18nBundleName);
-                this.omitFiles(resource, taskUtil);
-            }
-            this.adjustAddNewModelEnhanceWith((_b = (_a = appVariantInfo === null || appVariantInfo === void 0 ? void 0 : appVariantInfo.manifest) === null || _a === void 0 ? void 0 : _a.content) !== null && _b !== void 0 ? _b : [], i18nBundleName);
-            return appVariantInfo;
-        });
+    static async process(appVariantResources, projectNamespace, taskUtil) {
+        const appVariantInfo = await this.getAppVariantInfo(appVariantResources);
+        const i18nBundleName = commonUtil_1.replaceDots(appVariantInfo.id);
+        for (const resource of appVariantResources) {
+            this.writeI18nToModule(resource, projectNamespace, i18nBundleName);
+            this.omitFiles(resource, taskUtil);
+        }
+        this.adjustAddNewModelEnhanceWith(appVariantInfo?.manifest?.content ?? [], i18nBundleName);
+        return appVariantInfo;
     }
     static getAppVariantResources(workspace) {
         return workspace.byGlob(`/**/*.{${EXTENSIONS}}`);
     }
-    static getAppVariantInfo(appVariantResources) {
-        return __awaiter(this, void 0, void 0, function* () {
-            for (const resource of appVariantResources) {
-                const basename = path.basename(resource.getPath());
-                if (basename === MANIFEST_APP_VARIANT) {
-                    const manifest = yield resource.getBuffer().then((buffer) => buffer.toString("utf8")).then(JSON.parse);
-                    const { id, reference } = manifest;
-                    return { id, reference, manifest };
-                }
+    static async getAppVariantInfo(appVariantResources) {
+        for (const resource of appVariantResources) {
+            const basename = path.basename(resource.getPath());
+            if (basename === MANIFEST_APP_VARIANT) {
+                const manifest = await resource.getBuffer().then((buffer) => buffer.toString("utf8")).then(JSON.parse);
+                const { id, reference } = manifest;
+                return { id, reference, manifest };
             }
-            throw new Error("Application variant should contain manifest.appdescr_variant");
-        });
+        }
+        throw new Error("Application variant should contain manifest.appdescr_variant");
     }
     static writeI18nToModule(resource, projectNamespace, i18nBundleName) {
         if (path.extname(resource.getPath()) === ".properties") {

package/dist/baseAppManager.d.ts

@@ -1,12 +1,16 @@
 import { IAppVariantInfo, IAppVariantManifest, IProjectOptions } from "./model/types";
+import IProcessor from "./processors/processor";
 export default class BaseAppManager {
-    static process(baseAppFiles: Map<string, string>, appVariantInfo: IAppVariantInfo, options: IProjectOptions): Promise<any[]>;
-    private static getManifestInfo;
+    static process(baseAppFiles: Map<string, string>, appVariantInfo: IAppVariantInfo, options: IProjectOptions, processor: IProcessor): Promise<any[]>;
+    private static updateAdaptationProperties;
+    static getManifestInfo(manifest: any): {
+        id: string;
+        version: string;
+    };
     static renameBaseApp(baseAppFiles: Map<string, string>, search: string, replacement: string): Map<string, string>;
     private static getBaseAppManifest;
-    private static updateCloudPlatform;
     private static fillAppVariantIdHierarchy;
-    private static validateProperty;
+    static validateProperty(value: string, property: string): void;
     static applyDescriptorChanges(baseAppManifest: any, appVariantManifest: IAppVariantManifest, i18nBundleName: string): Promise<void>;
     static writeToWorkspace(baseAppFiles: Map<string, string>, projectNamespace: string): any[];
 }

package/dist/baseAppManager.js

@@ -1,13 +1,4 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 const path = require("path");
 const buildStrategy_1 = require("./buildStrategy");
@@ -17,24 +8,31 @@ const { RegistrationBuild, ApplyUtil, Applier, Change } = require("../dist/bundl
 const resourceFactory = require("@ui5/fs/lib/resourceFactory");
 const log = require("@ui5/logger").getLogger("@ui5/task-adaptation::BaseAppManager");
 class BaseAppManager {
-    static process(baseAppFiles, appVariantInfo, options) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const baseAppManifest = this.getBaseAppManifest(baseAppFiles);
-            const { id, version } = this.getManifestInfo(baseAppManifest.content);
-            const renamedBaseAppFiles = this.renameBaseApp(baseAppFiles, appVariantInfo.reference, appVariantInfo.id);
-            const { filepath, content } = this.getBaseAppManifest(renamedBaseAppFiles);
-            this.updateCloudPlatform(content, options.configuration);
-            this.fillAppVariantIdHierarchy(id, version, content);
-            const i18nBundleName = commonUtil_1.replaceDots(appVariantInfo.id);
-            yield this.applyDescriptorChanges(content, appVariantInfo.manifest, i18nBundleName);
-            renamedBaseAppFiles.set(filepath, JSON.stringify(content));
-            return this.writeToWorkspace(renamedBaseAppFiles, options.projectNamespace);
-        });
+    static async process(baseAppFiles, appVariantInfo, options, processor) {
+        const baseAppManifest = this.getBaseAppManifest(baseAppFiles);
+        const { id, version } = this.getManifestInfo(baseAppManifest.content);
+        const renamedBaseAppFiles = this.renameBaseApp(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);
+        const i18nBundleName = commonUtil_1.replaceDots(appVariantInfo.id);
+        await this.applyDescriptorChanges(content, appVariantInfo.manifest, i18nBundleName);
+        renamedBaseAppFiles.set(filepath, JSON.stringify(content));
+        return this.writeToWorkspace(renamedBaseAppFiles, options.projectNamespace);
+    }
+    static 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;
     }
     static getManifestInfo(manifest) {
-        var _a, _b, _c;
-        const id = (_a = manifest["sap.app"]) === null || _a === void 0 ? void 0 : _a.id;
-        const version = (_c = (_b = manifest["sap.app"]) === null || _b === void 0 ? void 0 : _b.applicationVersion) === null || _c === void 0 ? void 0 : _c.version;
+        const id = manifest["sap.app"]?.id;
+        const version = manifest["sap.app"]?.applicationVersion?.version;
         return { id, version };
     }
     static renameBaseApp(baseAppFiles, search, replacement) {
@@ -67,24 +65,7 @@ class BaseAppManager {
         }
         throw new Error("Original application should have manifest.json in root folder");
     }
-    static updateCloudPlatform(baseAppManifest, configuration) {
-        var _a;
-        const sapCloudService = (_a = baseAppManifest["sap.cloud"]) === null || _a === void 0 ? void 0 : _a.service;
-        const sapPlatformCf = baseAppManifest["sap.platform.cf"];
-        if (sapPlatformCf && sapCloudService) {
-            sapPlatformCf.oAuthScopes = sapPlatformCf.oAuthScopes.map((scope) => scope.replace(`$XSAPPNAME.`, `$XSAPPNAME('${sapCloudService}').`));
-        }
-        if (configuration.sapCloudService) {
-            if (baseAppManifest["sap.cloud"] == null) {
-                baseAppManifest["sap.cloud"] = {};
-            }
-            baseAppManifest["sap.cloud"].service = configuration.sapCloudService;
-        }
-        else {
-            delete baseAppManifest["sap.cloud"];
-        }
-    }
-    static fillAppVariantIdHierarchy(id, version, baseAppManifest) {
+    static fillAppVariantIdHierarchy(processor, id, version, baseAppManifest) {
         log.verbose("Filling up app variant hierarchy in manifest.json");
         this.validateProperty(id, "sap.app/id");
         this.validateProperty(version, "sap.app/applicationVersion/version");
@@ -94,36 +75,30 @@ class BaseAppManager {
         if (baseAppManifest["sap.ui5"].appVariantIdHierarchy == null) {
             baseAppManifest["sap.ui5"].appVariantIdHierarchy = [];
         }
-        baseAppManifest["sap.ui5"].appVariantIdHierarchy.unshift({
-            appVariantId: id,
-            version
-        });
+        const appVariantIdHierarchyItem = processor.createAppVariantHierarchyItem(id, version);
+        baseAppManifest["sap.ui5"].appVariantIdHierarchy.unshift(appVariantIdHierarchyItem);
     }
     static validateProperty(value, property) {
         if (!value) {
             throw new Error(`Original application manifest should have ${property}`);
         }
     }
-    static applyDescriptorChanges(baseAppManifest, appVariantManifest, i18nBundleName) {
-        var _a, _b;
-        return __awaiter(this, void 0, void 0, function* () {
-            log.verbose("Applying appVariant changes");
-            const strategy = new buildStrategy_1.default(RegistrationBuild, ApplyUtil, i18nBundleName);
-            if (appVariantManifest.layer) {
-                (_a = appVariantManifest.content) === null || _a === void 0 ? void 0 : _a.forEach(item => item.layer = appVariantManifest.layer);
-            }
-            const changesContent = (_b = appVariantManifest.content) === null || _b === void 0 ? void 0 : _b.map((change) => new Change(change));
-            if (changesContent) {
-                yield Applier.applyChanges(baseAppManifest, changesContent, strategy);
-            }
-        });
+    static async applyDescriptorChanges(baseAppManifest, appVariantManifest, i18nBundleName) {
+        log.verbose("Applying appVariant changes");
+        const strategy = new buildStrategy_1.default(RegistrationBuild, ApplyUtil, i18nBundleName);
+        if (appVariantManifest.layer) {
+            appVariantManifest.content?.forEach(item => item.layer = appVariantManifest.layer);
+        }
+        const changesContent = appVariantManifest.content?.map((change) => new Change(change));
+        if (changesContent) {
+            await Applier.applyChanges(baseAppManifest, changesContent, strategy);
+        }
     }
     static writeToWorkspace(baseAppFiles, projectNamespace) {
         const IGNORE_FILES = [
             "/manifest-bundle.zip",
             "/Component-preload.js",
-            "/sap-ui-cachebuster-info.json",
-            `/${resourceUtil_1.default.METADATA_FILENAME}`
+            "/sap-ui-cachebuster-info.json"
         ];
         const resources = [];
         for (let filename of baseAppFiles.keys()) {

package/dist/buildStrategy.js

@@ -16,6 +16,9 @@ class BuildStrategy {
         if (typeof manifest["sap.app"].i18n === "string") {
             manifest["sap.app"].i18n = { bundleUrl: manifest["sap.app"].i18n };
         }
+        if (manifest["sap.app"].i18n == null) {
+            manifest["sap.app"].i18n = {};
+        }
         if (manifest["sap.app"].i18n.enhanceWith == null) {
             manifest["sap.app"].i18n.enhanceWith = [];
         }