@ui5/task-adaptation 1.1.0 → 1.1.1

package/dist/i18nManager.d.ts

@@ -1,4 +1,5 @@
-import { IDiffProperty, IJsonContent } from "./util/jsonDiffUtil";
+import { IDiffProperty } from "./annotations/comparator/comparator";
+import { IJsonPerLanguage, IJsonPromisePerLanguage } from "./model/types";
 import Language from "./model/language";
 export declare class PropertyValue {
     value: string;
@@ -31,12 +32,9 @@ export default class I18nManager {
     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<Language, any>): IJsonContent;
-    populate(annotationJsons: [Language, any][], defaultAnnotation: IJsonContent): {
-        language: Language;
-        json: any;
-    };
-    static extractDefaultLanguageAnnotation(annotationJsons: Map<Language, any>): IJsonContent;
+    populateTranslations(annotationJsons: Map<Language, Promise<any>>): Promise<IJsonPromisePerLanguage>;
+    populate(annotationJsons: [Language, Promise<any>][], defaultAnnotation: IJsonPerLanguage): Promise<IJsonPerLanguage>;
+    static extractDefaultLanguageAnnotation(annotationJsons: Map<Language, Promise<any>>): IJsonPromisePerLanguage;
     private replaceWithModelReference;
     private createReference;
     getUniqueKeyForValue(value: string): string;

package/dist/i18nManager.js

@@ -1,8 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.I18nFileContent = exports.PropertyValue = void 0;
-const jsonDiffUtil_1 = require("./util/jsonDiffUtil");
+const comparator_1 = require("./annotations/comparator/comparator");
 const annotationDiffStructureError_1 = require("./model/annotationDiffStructureError");
+const commonUtil_1 = require("./util/commonUtil");
 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
@@ -103,7 +104,7 @@ class I18nManager {
     createFiles(i18nPathName) {
         return this.i18nFileContent.createFiles(i18nPathName);
     }
-    populateTranslations(annotationJsons) {
+    async populateTranslations(annotationJsons) {
         /* We compare annotations. Diff gives us:
         {
             "string": {
@@ -127,26 +128,27 @@ class I18nManager {
         and so on */
         let defaultAnnotation = I18nManager.extractDefaultLanguageAnnotation(annotationJsons);
         if (annotationJsons.size > 0 && defaultAnnotation) {
-            defaultAnnotation = this.populate([...annotationJsons], defaultAnnotation);
+            defaultAnnotation = await this.populate([...annotationJsons], defaultAnnotation);
         }
         return defaultAnnotation;
     }
-    populate(annotationJsons, defaultAnnotation) {
-        return annotationJsons
-            .map(([language, json]) => ({ language, json }))
-            .reduce((p, c) => {
+    async populate(annotationJsons, defaultAnnotation) {
+        let p = defaultAnnotation;
+        for (const c of annotationJsons.map(([language, json]) => ({ language, json }))) {
             try {
-                const pDiff = jsonDiffUtil_1.default.diff(p.json, c.json);
+                const comparator = new comparator_1.default(await p.json, await c.json);
+                const pDiff = comparator.compare();
                 this.processDiff(pDiff.properties, p.language, c.language);
-                return { json: pDiff.json, language: p.language };
+                p.json = pDiff.json;
             }
             catch (error) {
                 if (error instanceof annotationDiffStructureError_1.default) {
-                    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 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 error;
             }
-        }, defaultAnnotation);
+        }
+        return p;
     }
     static extractDefaultLanguageAnnotation(annotationJsons) {
         let json = null;
@@ -161,20 +163,18 @@ class I18nManager {
         annotationJsons.delete(language);
         return { json, language };
     }
-    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));
-            }
+    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));
         }
     }
     createReference(value) {
@@ -184,14 +184,11 @@ class I18nManager {
         return reference;
     }
     getUniqueKeyForValue(value) {
+        if (typeof value !== "string") {
+            throw new Error("Failed to create unique key from: " + JSON.stringify(value));
+        }
         const propertyName = value.replace(/\W/gi, "_").toUpperCase();
-        let suffix = -1;
-        let suffixString;
-        do {
-            suffixString = suffix === -1 ? "" : suffix;
-            suffix++;
-        } while (this.existingKeys.has(propertyName + suffixString));
-        const key = propertyName + suffixString;
+        const key = (0, commonUtil_1.getUniqueName)([...this.existingKeys.keys()], propertyName);
         this.existingKeys.add(key);
         return key;
     }

package/dist/index.js

@@ -1,11 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const dotenv = require("dotenv");
+const commonUtil_1 = require("./util/commonUtil");
 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");
+const processor_1 = require("./processors/processor");
 /**
  * Creates an appVariant bundle from the provided resources.
  */
@@ -13,8 +13,9 @@ module.exports = ({ workspace, options, taskUtil }) => {
     dotenv.config();
     async function process(workspace, taskUtil) {
         await (0, commonUtil_1.logBuilderVersion)();
+        (0, commonUtil_1.logBetaUsage)();
         const processor = (0, processor_1.determineProcessor)(options.configuration);
-        const appVariantResources = await appVariantManager_1.default.getAppVariantResources(workspace);
+        const appVariantResources = await appVariantManager_1.default.getAppVariantResourcesToProcess(workspace);
         const appVariantInfo = await appVariantManager_1.default.process(appVariantResources, options.projectNamespace, taskUtil);
         const baseAppFiles = await processor.getBaseAppFiles(appVariantInfo.reference);
         const { resources, manifestInfo } = await baseAppManager_1.default.process(baseAppFiles, appVariantInfo, options, processor);

package/dist/model/annotationDiffStructureError.js

@@ -3,6 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 class AnnotationDiffStructureError extends Error {
     constructor(json) {
         super(JSON.stringify(json));
+        this.name = "AnnotationDiffStructureError";
+        this.message = `The structure of the OData annotation xml is different near element: ${JSON.stringify(json)}`;
     }
 }
 exports.default = AnnotationDiffStructureError;

package/dist/model/language.js

@@ -17,7 +17,7 @@ class Language {
         let configLanguages = [];
         if (languages !== undefined) {
             configLanguages = languages.map(item => {
-                if (typeof item === 'string') {
+                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());
                 }

package/dist/model/types.d.ts

@@ -1,4 +1,6 @@
+import Language from "./language";
 export interface IConfiguration {
+    writeTempFiles?: any;
     appHostId?: string;
     appId?: string;
     appName?: string;
@@ -11,6 +13,7 @@ export interface IConfiguration {
     type?: "cf" | "abap";
     languages?: any[] | undefined;
     enableAnnotationCache?: boolean;
+    enableBetaFeatures?: boolean;
 }
 export interface IProjectOptions {
     configuration: IConfiguration;
@@ -58,8 +61,8 @@ export interface IUaa {
 export interface IAppVariantInfo {
     id: string;
     reference: string;
-    manifest: IAppVariantManifest;
-    manifestChanges: Array<IChange>;
+    layer?: string;
+    changes: IChange[];
 }
 export interface IAppVariantManifest {
     id: string;
@@ -106,3 +109,11 @@ export interface IMetadata {
 export type KeyedMap<T, K extends keyof T, V> = {
     [k in K]: V;
 };
+export interface IJsonPerLanguage {
+    language: Language;
+    json: any;
+}
+export interface IJsonPromisePerLanguage {
+    language: Language;
+    json: Promise<any>;
+}

package/dist/util/commonUtil.d.ts

@@ -1,6 +1,13 @@
+import { IConfiguration } from "../model/types";
+import Language from "../model/language";
 export declare function dotToUnderscore(value: string): string;
 export declare function validateObject<T extends Object>(options: T, properties: Array<keyof T>, message: string): void;
 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 insertInArray<T>(array: T[], index: number, insert: T): void;
+export declare function writeTempAnnotations({ writeTempFiles }: IConfiguration, name: string, language: Language, content: string): void;
 export declare function removePropertiesExtension(filePath: string): string;
+export declare function traverse(json: any, paths: string[], callback: (json: any, key: string | number, paths: string[]) => void): void;
 export declare function logBuilderVersion(): Promise<void>;
+export declare function logBetaUsage(): Promise<void>;
+export declare function getUniqueName(existingNames: string[], template: string): string;

package/dist/util/commonUtil.js

@@ -1,6 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.logBuilderVersion = exports.removePropertiesExtension = exports.renameResources = exports.escapeRegex = exports.validateObject = exports.dotToUnderscore = void 0;
+exports.getUniqueName = exports.logBetaUsage = exports.logBuilderVersion = exports.traverse = exports.removePropertiesExtension = exports.writeTempAnnotations = exports.insertInArray = exports.renameResources = exports.escapeRegex = exports.validateObject = exports.dotToUnderscore = void 0;
+const fs = require("fs");
+const path_1 = require("path");
 const log = require("@ui5/logger").getLogger("rollup-plugin-ui5-resolve-task-adaptation");
 function dotToUnderscore(value) {
     return value.replace(/\./g, "_");
@@ -35,32 +37,70 @@ function renameResources(files, search, replacement) {
         escapedSearch = escapeRegex(search);
     }
     const dotToSlash = (update) => update.replaceAll(".", "\/");
-    const replace = (content) => content.replace(new RegExp(escapedSearch, "g"), replacement);
-    const replaceWithSlashesOnly = (content) => {
-        if (!search.includes(".")) {
-            return content;
+    const replaces = [
+        {
+            regexp: new RegExp(escapedSearch, "g"),
+            replacement
+        },
+        {
+            regexp: new RegExp(dotToSlash(escapedSearch), "g"),
+            replacement: dotToSlash(replacement)
         }
-        let searchWithSlashes = dotToSlash(escapedSearch);
-        return content.replace(new RegExp(searchWithSlashes, "g"), dotToSlash(replacement));
-    };
-    const renamed = new Map();
-    files.forEach((content, filepath) => {
-        // Finds the id with dots (test.id) or without dots (id) and replaces it
-        content = replace(content);
-        // Only if the id has dots, these dots will be replaced with slashes
-        // first, and then it will search for the id with slashes and replace
-        // with the appVariantId also with slashes
-        content = replaceWithSlashesOnly(content);
-        renamed.set(filepath, content);
+    ];
+    files.forEach((content, filepath, map) => {
+        map.set(filepath, replaces.reduce((p, c) => p.replace(c.regexp, c.replacement), content));
     });
-    return renamed;
+    return files;
 }
 exports.renameResources = renameResources;
+function insertInArray(array, index, insert) {
+    array.splice(index, 0, insert);
+}
+exports.insertInArray = insertInArray;
+function writeTempAnnotations({ writeTempFiles }, name, language, content) {
+    const TEMP_DIST_FOLDER = path_1.posix.join(process.cwd(), "dist-debug", name);
+    if (writeTempFiles) {
+        if (!fs.existsSync(TEMP_DIST_FOLDER)) {
+            fs.mkdirSync(TEMP_DIST_FOLDER, { recursive: true });
+        }
+        if (language) {
+            name += "-" + language.i18n;
+        }
+        fs.writeFileSync(path_1.posix.join(TEMP_DIST_FOLDER, name + ".xml"), content);
+    }
+}
+exports.writeTempAnnotations = writeTempAnnotations;
 function removePropertiesExtension(filePath) {
     const lastIndexOf = filePath.lastIndexOf(".properties");
     return filePath.substring(0, lastIndexOf);
 }
 exports.removePropertiesExtension = removePropertiesExtension;
+function traverse(json, paths, callback) {
+    for (const key of Object.keys(json)) {
+        const internPaths = [...paths];
+        internPaths.push(key);
+        if (typeof json[key] === "object") {
+            if (Array.isArray(json[key])) {
+                const array = json[key];
+                for (let i = 0; i < array.length; i++) {
+                    if (typeof array[i] === "object") {
+                        traverse(array[i], internPaths, callback);
+                    }
+                    else {
+                        callback(array, i, internPaths);
+                    }
+                }
+            }
+            else {
+                traverse(json[key], internPaths, callback);
+            }
+        }
+        else {
+            callback(json, key, internPaths);
+        }
+    }
+}
+exports.traverse = traverse;
 async function logBuilderVersion() {
     try {
         // @ts-ignore
@@ -72,4 +112,18 @@ async function logBuilderVersion() {
     }
 }
 exports.logBuilderVersion = logBuilderVersion;
+async function logBetaUsage() {
+    log.info("Beta features enabled");
+}
+exports.logBetaUsage = logBetaUsage;
+function getUniqueName(existingNames, template) {
+    let suffix = -1;
+    let suffixString;
+    do {
+        suffixString = suffix === -1 ? "" : suffix;
+        suffix++;
+    } while (existingNames.includes(template + suffixString));
+    return template + suffixString;
+}
+exports.getUniqueName = getUniqueName;
 //# sourceMappingURL=commonUtil.js.map

package/dist/util/i18nMerger.d.ts

@@ -1,6 +1,6 @@
 import { IAppVariantInfo } from "../model/types";
 export default class I18NMerger {
-    static analyzeAppVariantManifestChanges(rootFolder: string, tranlsationRegexPattern: string, appVariantInfo: IAppVariantInfo): {
+    static analyzeAppVariantManifestChanges(rootFolder: string, tranlsationRegexPattern: string, { changes }: IAppVariantInfo): {
         mergePathsRegex: RegExp[];
         copyPathsRegex: RegExp[];
     };

package/dist/util/i18nMerger.js

@@ -5,13 +5,12 @@ const resourceUtil_1 = require("./resourceUtil");
 const path_1 = require("path");
 const Resource = require("@ui5/fs/lib/Resource");
 class I18NMerger {
-    static analyzeAppVariantManifestChanges(rootFolder, tranlsationRegexPattern, appVariantInfo) {
+    static analyzeAppVariantManifestChanges(rootFolder, tranlsationRegexPattern, { changes }) {
         // check which files need to be copied and which files need to be merged and copied
         // this is necessary because lrep does not support multiple enhanceWith with multiple locations
         const mergePaths = new Set();
         const copyPaths = new Set();
-        const { manifest, manifestChanges } = appVariantInfo;
-        manifestChanges.concat(manifest.content).forEach((change) => {
+        changes.forEach((change) => {
             const i18nPathWithExtension = change.content?.bundleUrl || change.texts?.i18n;
             if (i18nPathWithExtension) {
                 // build regex to match specific + language related files
@@ -46,7 +45,7 @@ class I18NMerger {
                     let baseAppI18NPath = `${rootFolder}/${baseAppManifestI18NPath}${mergePathMatch[1] || ""}.properties`;
                     await this.mergePropertiesFiles(aggregatedResourceFilesMap, appVariantResource, baseAppI18NPath);
                 }
-                // Resource for to be copied file already exists so we only have to adjust path 
+                // Resource for to be copied file already exists so we only have to adjust path
                 // Otherwise we have to omit it. We always change the path to avoid omitting a base app file
                 this.moveToAppVarSubfolder(appVariantResource, rootFolder, i18nTargetFolder);
                 if (!shouldCopyFile) {

package/dist/util/resourceUtil.d.ts

@@ -1,8 +1,11 @@
 export default class ResourceUtil {
     static getRootFolder(projectNamespace?: string): string;
+    static relativeToRoot(resourcePath: string, projectNamespace?: string): string;
     static getResourcePath(projectNamespace?: string, ...paths: string[]): string;
     static write(dir: string, files: Map<string, string>): Promise<void[]>;
     static read(rootFolder: string, folder: string, files: Map<string, string>, exclude?: string[]): void;
     static getString(resource: any): Promise<string>;
+    static getJson(resource: any): Promise<any>;
     static setString(resource: any, str: string): void;
+    static createResource(filename: string, projectNamespace: string, content: string): any;
 }

package/dist/util/resourceUtil.js

@@ -12,6 +12,10 @@ class ResourceUtil {
         }
         return path_1.posix.join(...newPath);
     }
+    static relativeToRoot(resourcePath, projectNamespace) {
+        const rootFolder = ResourceUtil.getRootFolder(projectNamespace);
+        return path_1.posix.relative(rootFolder, resourcePath);
+    }
     static getResourcePath(projectNamespace, ...paths) {
         return path_1.posix.join(this.getRootFolder(projectNamespace), ...paths);
     }
@@ -44,9 +48,18 @@ class ResourceUtil {
     static getString(resource) {
         return resource.getBuffer().then((buffer) => buffer.toString(UTF8));
     }
+    static getJson(resource) {
+        return resource.getBuffer().then((buffer) => JSON.parse(buffer.toString(UTF8)));
+    }
     static setString(resource, str) {
         resource.setBuffer(Buffer.from(str, UTF8));
     }
+    static createResource(filename, projectNamespace, content) {
+        return resourceFactory.createResource({
+            path: this.getResourcePath(projectNamespace, filename),
+            string: content
+        });
+    }
 }
 exports.default = ResourceUtil;
 //# sourceMappingURL=resourceUtil.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ui5/task-adaptation",
-    "version": "1.1.0",
+    "version": "1.1.1",
     "description": "Custom task for ui5-builder which allows building UI5 Flexibility Adaptation Projects for SAP BTP, Cloud Foundry environment",
     "main": "index.js",
     "scripts": {
@@ -14,7 +14,7 @@
         "prepublishOnly": "git push --follow-tags",
         "release-note": "git-chglog -c .chglog/release-config.yml v$npm_package_version",
         "rollup": "npx ts-node scripts/rollup.ts",
-        "build": "npm run rollup && tsc -p ./",
+        "build": "npm run rollup && rimraf dist/resources && tsc -p ./",
         "download-metadata": "npx ts-node scripts/metadataDownloadHelper.ts"
     },
     "repository": {
@@ -43,9 +43,10 @@
         "amdextract": "^3.0.0",
         "axios": "^1.6.2",
         "builtin-modules": "^3.2.0",
+        "crc": "^4.3.2",
         "dotenv": "^16.0.3",
         "js-yaml": "^4.1.0",
-        "json-diff": "^1.0.6",
+        "jsdom": "^23.0.1",
         "rimraf": "^3.0.2",
         "rollup": "^2.56.3",
         "semver": "^7.3.5",
@@ -58,7 +59,7 @@
         "@types/chai": "^4.2.21",
         "@types/chai-as-promised": "^7.1.4",
         "@types/js-yaml": "^4.0.3",
-        "@types/json-diff": "^0.9.1",
+        "@types/jsdom": "^21.1.6",
         "@types/lodash": "^4.14.196",
         "@types/mocha": "^9.1.0",
         "@types/rimraf": "^3.0.2",

package/scripts/bundler.ts

@@ -1,16 +1,12 @@
-import * as fs from "fs";
-import { posix as path } from "path";
-import * as semver from "semver";
 import * as rollup from "rollup";
 import * as builtins from "builtin-modules";
 import ui5 from "./rollup/ui5Resolve";
 import { nodeResolve } from "@rollup/plugin-node-resolve";
 
-const log = require("@ui5/logger").getLogger("rollup-plugin-ui5-resolve-task-adaptation");
 
 export default abstract class Bundler {
 
-    static async run(project: any, input: string, output: string, namespace: string,
+    static async run(project: any, input: string, output: string,
         assets: string[], skipTransformation?: string[]): Promise<void> {
         if (skipTransformation == null) {
             skipTransformation = [];
@@ -18,20 +14,11 @@ export default abstract class Bundler {
         if (skipTransformation.includes(input) === false) {
             skipTransformation.push(input);
         }
-        const bundledUI5Version = this.getBundledUI5Version(output);
-        const ui5version = this.getVersion(project, namespace);
-        if (bundledUI5Version == null || ui5version && semver.neq(bundledUI5Version, ui5version)) {
-            if (ui5version) {
-                log.info(`Using UI5 version ${ui5version.toString()} to bundle`);
-            }
-            await this.bundle(project, input, output, assets, skipTransformation, ui5version);
-        } else {
-            log.info(`UI5 version ${bundledUI5Version!.toString()} is already bundled`);
-        }
+        await this.bundle(project, input, output, assets, skipTransformation);
     }
 
     private static async bundle(project: any, input: string, output: string,
-        assets: string[], skipTransformation: string[], ui5version: string): Promise<void> {
+        assets: string[], skipTransformation: string[]): Promise<void> {
         const inputOptions = <rollup.RollupOptions>{
             input,
             plugins: [
@@ -39,8 +26,7 @@ export default abstract class Bundler {
                     assets,
                     skipTransformation,
                     output,
-                    project,
-                    ui5version
+                    project
                 }),
                 nodeResolve({
                     preferBuiltins: true
@@ -57,19 +43,4 @@ export default abstract class Bundler {
         await bundle.write(outputOptions);
         await bundle.close();
     }
-
-    private static getBundledUI5Version(output: string) {
-        const bundleFilePath = path.join(process.cwd(), output);
-        if (fs.existsSync(bundleFilePath)) {
-            const bundle = fs.readFileSync(bundleFilePath, { encoding: "utf-8" });
-            const version = bundle.substring(2, bundle.indexOf("\n"));
-            return semver.coerce(version);
-        }
-    }
-
-    private static getVersion(project: any, namespace: string): string {
-        const isModule = (dependency: any) => dependency.id.endsWith(namespace);
-        const sapUiFlDependency = project.dependencies.find(isModule);
-        return sapUiFlDependency && sapUiFlDependency.version;
-    }
 }

package/scripts/metadataDownloadHelper.ts

@@ -53,16 +53,17 @@ export default class MetadataDownloadHelper {
         return fs.readFile(filePath, { encoding: "utf8" });
     }
 
-    static fetchMetadataFileByUri(host: string, uri: string) {
+    static fetchMetadataFileByUri(host: string, url: string) {
         const REQUEST_OPTIONS_XML = {
             headers: {
                 "Accept": "text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,image/apng,*/*;q=0.8,application/signed-exchange;v=b3;q=0.7",
                 'Cookie': process.env.cookie,
             },
-            httpsAgent
+            httpsAgent,
+            timeout: 4000
         };
-        uri = uri.endsWith("/") ? `${uri}$metadata` : `${uri}/$metadata`;
-        return RequestUtil.get(host + uri, REQUEST_OPTIONS_XML);
+        url = url.endsWith("/") ? `${url}$metadata` : `${url}/$metadata`;
+        return RequestUtil.get(host + url, REQUEST_OPTIONS_XML);
     }
 }
 
@@ -76,7 +77,8 @@ const hostArgIndex = args.findIndex(arg => arg.startsWith('--host='));
 if (hostArgIndex !== -1) {
   // Extract the value of the `--host=` argument
   const hostArg = args[hostArgIndex];
-  const host = hostArg.split('=')[1];
+  let host = hostArg.split('=')[1];
+  host = host.endsWith("/") ? host.substring(0, host.lastIndexOf("/")) : host;
 
   // Use the `host` variable as needed
   MetadataDownloadHelper.fetchAllUrls(host);

package/scripts/rollup/bundleDefinition-odata.js

@@ -0,0 +1,9 @@
+import URI from "sap/ui/thirdparty/URI";
+import V2MetadataConverter from "sap/ui/model/odata/v4/lib/_V2MetadataConverter";
+import V4MetadataConverter from "sap/ui/model/odata/v4/lib/_V4MetadataConverter";
+
+export {
+    URI,
+    V4MetadataConverter,
+    V2MetadataConverter
+};

package/scripts/rollup/overrides/sap/ui/performance/Measurement.js

@@ -0,0 +1,4 @@
+export default class PerfMeasurement {
+	static average() {}
+	static end() {}
+}

package/scripts/rollup/ui5Resolve.ts

@@ -10,6 +10,23 @@ const log = require("@ui5/logger").getLogger("rollup-plugin-ui5-resolve-task-ada
 const { resourceFactory } = require("@ui5/fs");
 
 
+interface TransformCase {
+    accept(code: string, id: string): string;
+}
+
+class UriTransformCase implements TransformCase {
+    accept(code: string, id: string) {
+        if (id !== "sap/ui/thirdparty/URI") {
+            return code;
+        }
+        const header = code.substring(0, code.indexOf("(function"));
+        const neededCode = code.substring(code.indexOf("root) {") + 8, code.lastIndexOf("}));"))
+            .replace(/root/g, "window");
+        return header + "define('sap/ui/thirdparty/URI', [], function () {" + neededCode + "});";
+    }
+}
+
+
 export default function (options: any) {
 
     let dependencies: any;
@@ -45,7 +62,7 @@ export default function (options: any) {
          * Right before writing result to dist
          */
         renderChunk: (code: string) => {
-            return `//${options.ui5version}\nvar window = {};\n${code}`;
+            return `var window = {};\n${code}`;
         },
 
 
@@ -93,12 +110,13 @@ export default function (options: any) {
             }
 
             code = replaceRequireAsync(code);
+            code = transform(code, id);
 
             code = code
-            .replace(/sap\.ui\.define/g, "define")
-            .replace(/\, \/\* bExport\= \*\/ true\)/g, ")")
-            .replace(/},.*(true|false)\);$/g, "});")
-            .replace(/},.*(true|false)\);(\n\/\/# sourceMappingURL=)*/g, "});\n//# sourceMappingURL=");
+                .replace(/sap\.ui\.define/g, "define")
+                .replace(/\, \/\* bExport\= \*\/ true\)/g, ")")
+                .replace(/},.*(true|false)\);$/g, "});")
+                .replace(/},.*(true|false)\);(\n\/\/# sourceMappingURL=)*/g, "});\n//# sourceMappingURL=");
             return convertAMDtoES6(code);
         }
 
@@ -106,6 +124,17 @@ export default function (options: any) {
 };
 
 
+function transform(code: string, id: string) {
+    const transformers = [
+        new UriTransformCase()
+    ];
+    for (const transformer of transformers) {
+        code = transformer.accept(code, id);
+    }
+    return code;
+}
+
+
 function replaceRequireAsync(code: string) {
     const requireAsyncPattern = /requireAsync((.bind\(this, ")|(\("))+(?<url>[\/\w]*)"\)/mg;
     let match, defineUrls = new Array<string>(), defineVars = new Array<string>(), matches = new Map();