@ui5/task-adaptation 1.0.21 → 1.0.23

package/CHANGELOG.md

@@ -2,7 +2,10 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
-A list of unreleased changes can be found [here](https://github.com/SAP/ui5-task-adaptation/compare/v1.0.21...HEAD).
+A list of unreleased changes can be found [here](https://github.com/SAP/ui5-task-adaptation/compare/v1.0.23...HEAD).
+
+<a name="v1.0.23"></a>
+## [v1.0.23] - 2024-01-19
 
 <a name="v1.0.21"></a>
 ## [v1.0.21] - 2024-01-03
@@ -64,6 +67,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.23]: https://github.com/SAP/ui5-task-adaptation/compare/v1.0.21...v1.0.23
 [v1.0.21]: https://github.com/SAP/ui5-task-adaptation/compare/v1.0.20...v1.0.21
 [v1.0.20]: https://github.com/SAP/ui5-task-adaptation/compare/v1.0.19...v1.0.20
 [v1.0.19]: https://github.com/SAP/ui5-task-adaptation/compare/v1.0.18...v1.0.19

package/dist/annotationManager.d.ts

@@ -1,5 +1,6 @@
 import AbapRepoManager from "./repositories/abapRepoManager";
 import { IConfiguration } from "./model/types";
+import Language from "./model/language";
 export interface IAnnotationFiles {
     annotationName: string;
     annotationFileName: string;
@@ -9,14 +10,12 @@ export default class AnnotationManager {
     private configuration;
     constructor(configuration: IConfiguration, abapRepoManager: AbapRepoManager);
     ANNOTATIONS_FOLDER: string;
-    process(renamedBaseAppManifest: any, languages: string[]): Promise<Map<string, string>>;
+    process(renamedBaseAppManifest: any, languages: Language[]): Promise<Map<string, string>>;
     private normalizeAppVariantId;
     private createAnnotationFile;
-    private downloadAnnotations;
     private updateManifestModel;
     private updateManifestDataSources;
     private createManifestModel;
     private enhanceManifestModel;
-    private downloadAnnotation;
-    private getODataAnnotations;
+    private createODataModels;
 }

package/dist/annotationManager.js

@@ -1,15 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const annotationsCacheManager_1 = require("./cache/annotationsCacheManager");
 const baseAppManager_1 = require("./baseAppManager");
 const i18nManager_1 = require("./i18nManager");
+const oDataV2Model_1 = require("./annotations/oDataV2Model");
+const serviceRequestor_1 = require("./annotations/serviceRequestor");
 const xmlUtil_1 = require("./util/xmlUtil");
 const path_1 = require("path");
 const I18N_DEFAULT_PATH = "i18n/annotations";
 const I18N_DEFAULT_MODEL_NAME = "@i18n";
 const SAPUI5 = "sap.ui5";
 const SAPAPP = "sap.app";
-const log = require("@ui5/logger").getLogger("@ui5/task-adaptation::AnnotationManager");
 class AnnotationManager {
     constructor(configuration, abapRepoManager) {
         this.ANNOTATIONS_FOLDER = "annotations";
@@ -21,18 +21,19 @@ class AnnotationManager {
         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_1.posix.join(I18N_DEFAULT_PATH, normalisedId);
         const annotationFiles = new Map();
         const metaInfo = new Array();
         const i18nManager = new i18nManager_1.default(modelName, id, languages);
-        for (const { promisesPerLanguage, annotationName } of promises) {
-            const annotationXml = await this.createAnnotationFile(promisesPerLanguage, i18nManager);
-            const annotationFileName = `annotations/annotation_${annotationName}.xml`;
-            annotationFiles.set(annotationFileName, annotationXml);
-            metaInfo.push({ annotationFileName, annotationName });
+        const oDataModels = this.createODataModels(renamedBaseAppManifest);
+        for (const oDataModel of oDataModels) {
+            for (const { annotationJsons, annotationName } of oDataModel.getAnnotationJsons(languages)) {
+                const annotationXml = await this.createAnnotationFile(await annotationJsons, i18nManager);
+                const annotationFileName = `annotations/annotation_${annotationName}.xml`;
+                annotationFiles.set(annotationFileName, annotationXml);
+                metaInfo.push({ annotationFileName, annotationName });
+            }
         }
         if (metaInfo.length > 0) {
             this.updateManifestDataSources(renamedBaseAppManifest, metaInfo);
@@ -46,21 +47,10 @@ class AnnotationManager {
     normalizeAppVariantId(id, replaceWith = "") {
         return id.replace(/[.\W]+/gi, replaceWith);
     }
-    async createAnnotationFile(promisesPerLanguage, i18nManager) {
-        const annotationJsons = new Map();
-        for (const promise of promisesPerLanguage) {
-            const { language, xml } = await promise;
-            annotationJsons.set(language, xmlUtil_1.default.xmlToJson(xml));
-        }
+    async createAnnotationFile(annotationJsons, i18nManager) {
         const annotationJson = i18nManager.populateTranslations(annotationJsons);
         return xmlUtil_1.default.jsonToXml(annotationJson.json);
     }
-    downloadAnnotations(annotations, languages) {
-        return [...annotations].map(([name, { uri }]) => ({
-            promisesPerLanguage: languages.map(language => this.downloadAnnotation(uri, name, language)),
-            annotationName: name
-        }));
-    }
     updateManifestModel(renamedBaseAppManifest, modelName, i18nPathName) {
         const uri = `${i18nPathName}/i18n.properties`;
         this.enhanceManifestModel(renamedBaseAppManifest, modelName, uri);
@@ -107,44 +97,18 @@ class AnnotationManager {
             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 {
-            let files;
-            if (this.configuration.enableAnnotationCache) {
-                files = await cacheManager.getFiles(() => this.abapRepoManager.getAnnotationMetadata(annotationUri), () => this.abapRepoManager.downloadAnnotationFile(annotationUri));
-            }
-            else {
-                files = await 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;
+    createODataModels(renamedBaseAppManifest) {
+        const serviceRequestor = new serviceRequestor_1.default(this.configuration, this.abapRepoManager);
+        const oDataModels = [
+            new oDataV2Model_1.default(serviceRequestor)
+        ];
+        const dataSources = renamedBaseAppManifest["sap.app"]?.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]);
-                }
+            for (const name of Object.keys(dataSources)) {
+                oDataModels.forEach(model => model.addDataSource(dataSources[name], name));
             }
         }
-        return oDataAnnotations;
+        return oDataModels;
     }
 }
 exports.default = AnnotationManager;

package/dist/annotations/oDataModel.d.ts

@@ -0,0 +1,20 @@
+import ServiceRequestor, { ILanguageJsonContent, ILanguageXmlContent } from "./serviceRequestor";
+import Language from "../model/language";
+export default class ODataModel {
+    protected oDataAnnotations: Map<string, any>;
+    private serviceRequestor;
+    constructor(serviceRequestor: ServiceRequestor);
+    getAnnotationJsons(languages: Language[]): AnnotationJsonPerName[];
+    private getPromisesPerLanguage;
+    private createAnnotationJsons;
+    protected afterXmlDownload({ language, xml }: ILanguageXmlContent): Promise<ILanguageJsonContent>;
+    protected transformJsons(annotationJsons: Map<Language, any>): Promise<Map<Language, any>>;
+}
+export interface PromisePerAnnotation {
+    promisesPerLanguage: Promise<ILanguageXmlContent>[];
+    annotationName: string;
+}
+export interface AnnotationJsonPerName {
+    annotationName: string;
+    annotationJsons: Promise<Map<Language, any>>;
+}

package/dist/annotations/oDataModel.js

@@ -0,0 +1,46 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const xmlUtil_1 = require("../util/xmlUtil");
+class ODataModel {
+    constructor(serviceRequestor) {
+        this.oDataAnnotations = new Map();
+        this.serviceRequestor = serviceRequestor;
+    }
+    getAnnotationJsons(languages) {
+        const result = [];
+        const promisesPerLanguagePerName = this.getPromisesPerLanguage(languages);
+        for (const { promisesPerLanguage, annotationName } of promisesPerLanguagePerName) {
+            result.push({
+                annotationName,
+                annotationJsons: this.createAnnotationJsons(promisesPerLanguage)
+            });
+        }
+        return result;
+    }
+    getPromisesPerLanguage(languages) {
+        return [...this.oDataAnnotations].map(([annotationName, uri]) => ({
+            promisesPerLanguage: languages.map(language => this.serviceRequestor.downloadAnnotation(uri, annotationName, language)
+                .then(this.afterXmlDownload)),
+            annotationName
+        }));
+    }
+    async createAnnotationJsons(promisesPerLanguage) {
+        const annotationJsons = new Map();
+        for (const promise of promisesPerLanguage) {
+            const { language, json } = await promise;
+            annotationJsons.set(language, json);
+        }
+        return this.transformJsons(annotationJsons);
+    }
+    async afterXmlDownload({ language, xml }) {
+        return {
+            json: xmlUtil_1.default.xmlToJson(xml),
+            language
+        };
+    }
+    async transformJsons(annotationJsons) {
+        return annotationJsons;
+    }
+}
+exports.default = ODataModel;
+//# sourceMappingURL=oDataModel.js.map

package/dist/annotations/oDataV2Model.d.ts

@@ -0,0 +1,4 @@
+import ODataModel from "./oDataModel";
+export default class ODataV2Model extends ODataModel {
+    addDataSource({ uri, type }: any, name: string): void;
+}

package/dist/annotations/oDataV2Model.js

@@ -0,0 +1,13 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const oDataModel_1 = require("./oDataModel");
+class ODataV2Model extends oDataModel_1.default {
+    addDataSource({ uri, type }, name) {
+        if (uri?.startsWith("/") &&
+            type === "ODataAnnotation") {
+            this.oDataAnnotations.set(name, uri);
+        }
+    }
+}
+exports.default = ODataV2Model;
+//# sourceMappingURL=oDataV2Model.js.map

package/dist/annotations/serviceRequestor.d.ts

@@ -0,0 +1,17 @@
+import AbapRepoManager from "../repositories/abapRepoManager";
+import { IConfiguration } from "../model/types";
+import Language from "../model/language";
+export interface ILanguageXmlContent {
+    language: Language;
+    xml: string;
+}
+export interface ILanguageJsonContent {
+    language: Language;
+    json: any;
+}
+export default class ServiceRequestor {
+    private abapRepoManager;
+    private configuration;
+    constructor(configuration: IConfiguration, abapRepoManager: AbapRepoManager);
+    downloadAnnotation(uri: string, name: string, language: Language): Promise<ILanguageXmlContent>;
+}

package/dist/annotations/serviceRequestor.js

@@ -0,0 +1,36 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const annotationsCacheManager_1 = require("../cache/annotationsCacheManager");
+const log = require("@ui5/logger").getLogger("@ui5/task-adaptation::ServiceRequestor");
+class ServiceRequestor {
+    constructor(configuration, abapRepoManager) {
+        this.abapRepoManager = abapRepoManager;
+        this.configuration = configuration;
+    }
+    async downloadAnnotation(uri, name, language) {
+        if (language.sap) {
+            uri += `?sap-language=${language.sap}`;
+            name += `-${language.sap}`;
+        }
+        const cacheManager = new annotationsCacheManager_1.default(this.configuration, name);
+        log.verbose(`Getting annotation '${name}' ${language.sap} by '${uri}'`);
+        try {
+            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);
+            }
+            if (!files || files.size === 0) {
+                throw new Error(`No files were fetched for '${name}' by '${uri}'`);
+            }
+            return { language, xml: [...files][0][1] };
+        }
+        catch (error) {
+            throw new Error(`Failed to fetch annotation by '${uri}': ${error.message}`);
+        }
+    }
+}
+exports.default = ServiceRequestor;
+//# sourceMappingURL=serviceRequestor.js.map

package/dist/appVariantManager.js

@@ -25,7 +25,7 @@ class AppVariantManager {
         for (const resource of appVariantResources) {
             const resourcePath = resource.getPath();
             const basename = path_1.posix.dirname(resourcePath);
-            if (changesFolder === basename) {
+            if (basename.startsWith(changesFolder)) {
                 changes.set(resourcePath, await resourceUtil_1.default.getString(resource));
                 resourcesByPath.set(resourcePath, resource);
             }

package/dist/i18nManager.d.ts

@@ -1,20 +1,21 @@
 import { IDiffProperty, IJsonContent } from "./util/jsonDiffUtil";
+import Language from "./model/language";
 export declare class PropertyValue {
     value: string;
     isReference: boolean;
     qualifier: string;
-    language: string;
+    language: Language;
     private static OLD;
     private static NEW;
     private constructor();
     get isOld(): boolean;
     set(diff: any, references: Map<string, string>): void;
-    static oldFrom(language: string, value?: string): PropertyValue;
-    static newFrom(language: string, value?: string): PropertyValue;
+    static oldFrom(language: Language, value?: string): PropertyValue;
+    static newFrom(language: Language, value?: string): PropertyValue;
 }
 export declare class I18nFileContent {
     private properties;
-    constructor(languages: string[]);
+    constructor(languages: Language[]);
     add(prop: PropertyValue, key: string): void;
     private initKeyValuesForOtherLanguages;
     hasTranslations(): boolean;
@@ -27,15 +28,15 @@ export default class I18nManager {
     private references;
     private existingKeys;
     private i18nFileContent;
-    constructor(modelName: string, appVariantId: string, languages: string[]);
-    processDiff(properties: Set<IDiffProperty>, previousLanguage: string, currentLanguage: string): void;
+    constructor(modelName: string, appVariantId: string, languages: Language[]);
+    processDiff(properties: Set<IDiffProperty>, previousLanguage: Language, currentLanguage: Language): void;
     createFiles(i18nPathName: string): Map<string, string>;
-    populateTranslations(annotationJsons: Map<string, any>): IJsonContent;
-    populate(annotationJsons: [string, any][], defaultAnnotation: IJsonContent): {
-        language: string;
+    populateTranslations(annotationJsons: Map<Language, any>): IJsonContent;
+    populate(annotationJsons: [Language, any][], defaultAnnotation: IJsonContent): {
+        language: Language;
         json: any;
     };
-    static extractDefaultLanguageAnnotation(annotationJsons: Map<string, any>): IJsonContent;
+    static extractDefaultLanguageAnnotation(annotationJsons: Map<Language, any>): IJsonContent;
     private replaceWithModelReference;
     private createReference;
     getUniqueKeyForValue(value: string): string;

package/dist/i18nManager.js

@@ -6,7 +6,6 @@ const annotationDiffStructureError_1 = require("./model/annotationDiffStructureE
 const posix_1 = require("path/posix"); // Ensure standardized dir separators to ensure Windows compatibility
 // To generate keys, english language is more common, so compare all other
 // languages with it
-const DEFAULT_LANGUAGES = ["", "EN", "EN_US", "EN_GB"];
 class PropertyValue {
     constructor(qualifier, language, value) {
         this.isReference = false;
@@ -71,8 +70,8 @@ class I18nFileContent {
         if (this.hasTranslations()) {
             this.properties.forEach((i18nLines, language) => {
                 let filename = "i18n";
-                if (language) {
-                    filename += "_" + language.toLowerCase();
+                if (language.i18n) {
+                    filename += "_" + language.i18n;
                 }
                 const filepath = (0, posix_1.join)(i18nPathName, filename + ".properties");
                 files.set(filepath, [...i18nLines].map(([key, value]) => `${key}=${value}`).join("\n"));
@@ -143,7 +142,7 @@ class I18nManager {
             }
             catch (error) {
                 if (error instanceof annotationDiffStructureError_1.default) {
-                    throw new Error(`The structure of the oData annotation xml of language '${p.language}' is different from xml of language '${c.language}' near element: ${error.message}`);
+                    throw new Error(`The structure of the oData annotation xml of language '${p.language.sap}' is different from xml of language '${c.language.sap}' near element: ${error.message}`);
                 }
                 throw error;
             }
@@ -151,9 +150,8 @@ class I18nManager {
     }
     static extractDefaultLanguageAnnotation(annotationJsons) {
         let json = null;
-        for (const language of DEFAULT_LANGUAGES) {
-            json = annotationJsons.get(language);
-            if (json != null) {
+        for (const [language, json] of annotationJsons) {
+            if (language.isDefault) {
                 annotationJsons.delete(language);
                 return { json, language };
             }
@@ -163,18 +161,20 @@ class I18nManager {
         annotationJsons.delete(language);
         return { json, language };
     }
-    replaceWithModelReference({ object, property }, propertyValues) {
-        const diff = object[property];
-        this.initPropertyValues(diff, propertyValues);
-        // If there are already generated key, like on step 3. above comment, we
-        // take it (from __old), so we don't need to generate new
-        const propReference = propertyValues.find(prop => prop.isReference);
-        let reference = propReference?.value ?? this.createReference(diff.__old);
-        object[property] = reference;
-        // Other values, which are not references, are extracted to .properties
-        const key = this.references.get(reference);
-        if (key) {
-            propertyValues.filter(prop => !prop.isReference).forEach(prop => this.i18nFileContent.add(prop, key));
+    replaceWithModelReference({ object, property, type }, propertyValues) {
+        if (type === jsonDiffUtil_1.DiffTypeEnum.DELTA) {
+            const diff = object[property];
+            this.initPropertyValues(diff, propertyValues);
+            // If there are already generated key, like on step 3. above comment, we
+            // take it (from __old), so we don't need to generate new
+            const propReference = propertyValues.find(prop => prop.isReference);
+            let reference = propReference?.value ?? this.createReference(diff.__old);
+            object[property] = reference;
+            // Other values, which are not references, are extracted to .properties
+            const key = this.references.get(reference);
+            if (key) {
+                propertyValues.filter(prop => !prop.isReference).forEach(prop => this.i18nFileContent.add(prop, key));
+            }
         }
     }
     createReference(value) {

package/dist/index.js

@@ -5,12 +5,14 @@ const appVariantManager_1 = require("./appVariantManager");
 const baseAppManager_1 = require("./baseAppManager");
 const processor_1 = require("./processors/processor");
 const i18nMerger_1 = require("./util/i18nMerger");
+const commonUtil_1 = require("./util/commonUtil");
 /**
  * Creates an appVariant bundle from the provided resources.
  */
 module.exports = ({ workspace, options, taskUtil }) => {
     dotenv.config();
     async function process(workspace, taskUtil) {
+        await (0, commonUtil_1.logBuilderVersion)();
         const processor = (0, processor_1.determineProcessor)(options.configuration);
         const appVariantResources = await appVariantManager_1.default.getAppVariantResources(workspace);
         const appVariantInfo = await appVariantManager_1.default.process(appVariantResources, options.projectNamespace, taskUtil);

package/dist/model/language.d.ts

@@ -0,0 +1,13 @@
+export default class Language {
+    sap: string;
+    i18n: string;
+    isDefault: boolean;
+    constructor(sap: string, i18n: string);
+    /**
+     * Create a language array from languages in configuration and default language.
+     * @param languages Typically an array of objects. Probably could be undefined.
+     * @returns An array of type Language, where the default language is placed first,
+     * followed by the passed config languages.
+     */
+    static create(languages: any[] | undefined): Language[];
+}

package/dist/model/language.js

@@ -0,0 +1,37 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+class Language {
+    constructor(sap, i18n) {
+        this.sap = sap;
+        this.i18n = i18n;
+        this.isDefault = sap === "";
+    }
+    /**
+     * Create a language array from languages in configuration and default language.
+     * @param languages Typically an array of objects. Probably could be undefined.
+     * @returns An array of type Language, where the default language is placed first,
+     * followed by the passed config languages.
+     */
+    static create(languages) {
+        const defaultLanguage = new Language("", "");
+        let configLanguages = [];
+        if (languages !== undefined) {
+            configLanguages = languages.map(item => {
+                if (typeof item === 'string') {
+                    // For legacy language format support which is just a string and doesn't contain i18n
+                    return new Language(item, item.toLowerCase());
+                }
+                else if (item.sap !== undefined && item.i18n !== undefined) {
+                    return new Language(item.sap, item.i18n);
+                }
+                else {
+                    throw new Error("Can not parse languages from ui5.yaml configuration. Please use the 'AdaptationProject: Create wizard' to generate the project.");
+                }
+            });
+        }
+        return [defaultLanguage, ...configLanguages];
+    }
+    ;
+}
+exports.default = Language;
+//# sourceMappingURL=language.js.map

package/dist/model/types.d.ts

@@ -9,7 +9,7 @@ export interface IConfiguration {
     destination?: string;
     credentials?: IAuth;
     type?: "cf" | "abap";
-    languages?: string[];
+    languages?: any[] | undefined;
     enableAnnotationCache?: boolean;
 }
 export interface IProjectOptions {

package/dist/processors/abapProcessor.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const commonUtil_1 = require("../util/commonUtil");
+const language_1 = require("../model/language");
 class AbapProcessor {
     constructor(configuration, cacheManager, abapRepoManager, annotationManager) {
         this.configuration = configuration;
@@ -15,8 +16,7 @@ class AbapProcessor {
         (0, commonUtil_1.validateObject)(this.configuration, ["destination", "appName"], "should be specified in ui5.yaml configuration");
     }
     async updateLandscapeSpecificContent(renamedBaseAppManifest, baseAppFiles) {
-        const { languages } = this.configuration;
-        const files = await this.annotationManager.process(renamedBaseAppManifest, ["", ...(languages ?? ["EN"])]);
+        const files = await this.annotationManager.process(renamedBaseAppManifest, (language_1.default.create(this.configuration.languages)));
         if (baseAppFiles) {
             files.forEach((value, key) => baseAppFiles.set(key, value));
         }

package/dist/repositories/abapRepoManager.js

@@ -23,7 +23,8 @@ class AbapRepoManager {
         return { changedOn: header.modified };
     }
     async downloadAnnotationFile(uri) {
-        const annotation = await requestUtil_1.default.retryWithAuth(() => requestUtil_1.default.get(uri, REQUEST_OPTIONS_XML), () => requestUtil_1.default.get(uri, REQUEST_OPTIONS_XML, this.getAuth()));
+        const annotationUri = `https://${this.configuration.destination}.dest${uri}`;
+        const annotation = await requestUtil_1.default.retryWithAuth(() => requestUtil_1.default.get(annotationUri, REQUEST_OPTIONS_XML), () => requestUtil_1.default.get(annotationUri, REQUEST_OPTIONS_XML, this.getAuth()));
         return new Map([["annotation.xml", annotation]]);
     }
     getMetadata(baseAppId) {

package/dist/util/cfUtil.js

@@ -66,7 +66,7 @@ class CFUtil {
                     key: types_1.eFilters.service_instance_guids
                 }]
         }).catch((error) => {
-            throw Error("Failed to get service credentials: " + error.message);
+            throw new Error("Failed to get service credentials: " + error.message);
         });
     }
     static async createServiceKey(serviceInstanceName, serviceKeyName) {

package/dist/util/commonUtil.d.ts

@@ -3,3 +3,4 @@ export declare function validateObject<T extends Object>(options: T, properties:
 export declare function escapeRegex(update: string): string;
 export declare function renameResources(files: Map<string, string>, search: string, replacement: string): Map<string, string>;
 export declare function removePropertiesExtension(filePath: string): string;
+export declare function logBuilderVersion(): Promise<void>;

package/dist/util/commonUtil.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.removePropertiesExtension = exports.renameResources = exports.escapeRegex = exports.validateObject = exports.dotToUnderscore = void 0;
+exports.logBuilderVersion = exports.removePropertiesExtension = exports.renameResources = exports.escapeRegex = exports.validateObject = exports.dotToUnderscore = void 0;
+const log = require("@ui5/logger").getLogger("rollup-plugin-ui5-resolve-task-adaptation");
 function dotToUnderscore(value) {
     return value.replace(/\./g, "_");
 }
@@ -60,4 +61,15 @@ function removePropertiesExtension(filePath) {
     return filePath.substring(0, lastIndexOf);
 }
 exports.removePropertiesExtension = removePropertiesExtension;
+async function logBuilderVersion() {
+    try {
+        // @ts-ignore
+        const packageJSON = await Promise.resolve().then(() => require("../../package.json"));
+        log.info(`Running app-variant-bundler-build with version ${packageJSON.version}`);
+    }
+    catch (e) {
+        // do nothing
+    }
+}
+exports.logBuilderVersion = logBuilderVersion;
 //# sourceMappingURL=commonUtil.js.map

package/dist/util/jsonDiffUtil.d.ts

@@ -1,17 +1,28 @@
+import Language from "../model/language";
 export interface IJsonContent {
-    language: string;
+    language: Language;
     json: any;
 }
 export interface IDiffProperty {
     object: any;
-    property: string;
+    property: string | number;
+    type: DiffTypeEnum;
+}
+export declare enum DiffTypeEnum {
+    MINUS = 0,
+    PLUS = 1,
+    DELTA = 2
 }
 export interface IDiffJson {
     json: any;
     properties: Set<IDiffProperty>;
 }
+export interface IDiffOptions {
+    restoreOriginalValue: boolean;
+    throwErrorOnDiffStructure: boolean;
+}
 export default class JsonDiffUtil {
-    static diff(jsonA: any, jsonB: any): IDiffJson;
+    static diff(jsonA: any, jsonB: any, options?: IDiffOptions): IDiffJson;
     private static findDiffsAndRestoreStructure;
     private static traverseDiffRecursive;
 }