@ui5/task-adaptation 1.1.0 → 1.1.2

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();

package/scripts/rollup.ts

@@ -65,14 +65,23 @@ export default class Builder {
             project,
             "bundleDefinition.js",
             "./dist/bundle.js",
-            "/sap.ui.fl",
             [
                 "/resources/sap/ui/fl/**",
                 "/resources/sap/suite/ui/generic/template/**"
+            ]);
+        await Bundler.run(
+            project,
+            "bundleDefinition-odata.js",
+            "./dist/bundle-odata.js",
+            [
+                "/resources/sap/ui/model/**",
+                "sap/ui/util/XMLHelper",
+                "sap/ui/core/Core"
             ],
             [
-                "sap/ui/thirdparty/URI"
-            ]);
+                "sap/ui/performance/Measurement"
+            ]
+        );
     }
 }
 

package/dist/annotations/oDataModel.d.ts

@@ -1,20 +0,0 @@
-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

@@ -1,46 +0,0 @@
-"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

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

package/dist/annotations/oDataV2Model.js

@@ -1,13 +0,0 @@
-"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/util/jsonDiffUtil.d.ts

@@ -1,28 +0,0 @@
-import Language from "../model/language";
-export interface IJsonContent {
-    language: Language;
-    json: any;
-}
-export interface IDiffProperty {
-    object: any;
-    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, options?: IDiffOptions): IDiffJson;
-    private static findDiffsAndRestoreStructure;
-    private static traverseDiffRecursive;
-}

package/dist/util/jsonDiffUtil.js

@@ -1,74 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.DiffTypeEnum = void 0;
-const jsonDiff = require("json-diff");
-const annotationDiffStructureError_1 = require("../model/annotationDiffStructureError");
-var DiffTypeEnum;
-(function (DiffTypeEnum) {
-    DiffTypeEnum[DiffTypeEnum["MINUS"] = 0] = "MINUS";
-    DiffTypeEnum[DiffTypeEnum["PLUS"] = 1] = "PLUS";
-    DiffTypeEnum[DiffTypeEnum["DELTA"] = 2] = "DELTA";
-})(DiffTypeEnum = exports.DiffTypeEnum || (exports.DiffTypeEnum = {}));
-class JsonDiffUtil {
-    static diff(jsonA, jsonB, options = {
-        throwErrorOnDiffStructure: true,
-        restoreOriginalValue: false
-    }) {
-        const json = jsonDiff.diff(jsonA, jsonB, { full: true, sort: false });
-        const properties = this.findDiffsAndRestoreStructure(json, options);
-        return {
-            json,
-            properties
-        };
-    }
-    static findDiffsAndRestoreStructure(object, options) {
-        const properties = new Set();
-        this.traverseDiffRecursive(properties, { object }, "object", options);
-        return properties;
-    }
-    static traverseDiffRecursive(properties, object, property, options) {
-        const current = object[property];
-        if (typeof current !== "object") {
-            return;
-        }
-        if (Array.isArray(current)) {
-            for (let i = 0; i < current.length; i++) {
-                const item = current[i];
-                if (["~", " ", "-", "+"].some(sign => item[0] === sign)) {
-                    current[i] = item[1];
-                    // This is a sign from json-diff plugin, that the property contains differences.
-                    // We will remove these signs, to restore the original structure
-                    if (item[0] === "~") {
-                        this.traverseDiffRecursive(properties, item, 1, options);
-                    }
-                    else if (item[0] === "+" || item[0] === "-") {
-                        if (options.throwErrorOnDiffStructure) {
-                            throw new annotationDiffStructureError_1.default(item[1]);
-                        }
-                        properties.add({
-                            object: object[property],
-                            property: i,
-                            type: item[0] === "+" ? DiffTypeEnum.PLUS : DiffTypeEnum.MINUS
-                        });
-                    }
-                }
-            }
-        }
-        else {
-            for (const key of Object.keys(current)) {
-                if (key == "__old" || key == "__new") {
-                    if (options.restoreOriginalValue) {
-                        object[property] = current["__old"];
-                    }
-                    properties.add({ object, property, type: DiffTypeEnum.DELTA });
-                    break;
-                }
-                else {
-                    this.traverseDiffRecursive(properties, current, key, options);
-                }
-            }
-        }
-    }
-}
-exports.default = JsonDiffUtil;
-//# sourceMappingURL=jsonDiffUtil.js.map

package/scripts/rollup/overrides/sap/ui/thirdparty/URI.js

@@ -1,16 +0,0 @@
-import { posix as path } from "path";
-
-export default class URI {
-    constructor(value) {
-        this.value = value;
-    }
-
-    normalize() {
-        this.value = path.normalize(this.value).replace(/\\/g, "/");
-        return this;
-    }
-
-    path() {
-        return this.value;
-    }
-}