@ui5/task-adaptation 1.0.21 → 1.1.0

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;
 }

package/dist/util/jsonDiffUtil.js

@@ -1,22 +1,32 @@
 "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) {
+    static diff(jsonA, jsonB, options = {
+        throwErrorOnDiffStructure: true,
+        restoreOriginalValue: false
+    }) {
         const json = jsonDiff.diff(jsonA, jsonB, { full: true, sort: false });
-        const properties = this.findDiffsAndRestoreStructure(json);
+        const properties = this.findDiffsAndRestoreStructure(json, options);
         return {
             json,
             properties
         };
     }
-    static findDiffsAndRestoreStructure(object) {
+    static findDiffsAndRestoreStructure(object, options) {
         const properties = new Set();
-        this.traverseDiffRecursive(properties, { object }, "object");
+        this.traverseDiffRecursive(properties, { object }, "object", options);
         return properties;
     }
-    static traverseDiffRecursive(properties, object, property) {
+    static traverseDiffRecursive(properties, object, property, options) {
         const current = object[property];
         if (typeof current !== "object") {
             return;
@@ -29,10 +39,17 @@ class JsonDiffUtil {
                     // 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);
+                        this.traverseDiffRecursive(properties, item, 1, options);
                     }
                     else if (item[0] === "+" || item[0] === "-") {
-                        throw new annotationDiffStructureError_1.default(item[1]);
+                        if (options.throwErrorOnDiffStructure) {
+                            throw new annotationDiffStructureError_1.default(item[1]);
+                        }
+                        properties.add({
+                            object: object[property],
+                            property: i,
+                            type: item[0] === "+" ? DiffTypeEnum.PLUS : DiffTypeEnum.MINUS
+                        });
                     }
                 }
             }
@@ -40,11 +57,14 @@ class JsonDiffUtil {
         else {
             for (const key of Object.keys(current)) {
                 if (key == "__old" || key == "__new") {
-                    properties.add({ object, property });
+                    if (options.restoreOriginalValue) {
+                        object[property] = current["__old"];
+                    }
+                    properties.add({ object, property, type: DiffTypeEnum.DELTA });
                     break;
                 }
                 else {
-                    this.traverseDiffRecursive(properties, current, key);
+                    this.traverseDiffRecursive(properties, current, key, options);
                 }
             }
         }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ui5/task-adaptation",
-    "version": "1.0.21",
+    "version": "1.1.0",
     "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,8 @@
         "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 && tsc -p ./",
+        "download-metadata": "npx ts-node scripts/metadataDownloadHelper.ts"
     },
     "repository": {
         "type": "git",
@@ -40,7 +41,7 @@
         "@ui5/project": "^2.6.0",
         "adm-zip": "^0.5.5",
         "amdextract": "^3.0.0",
-        "axios": "^1.6.0",
+        "axios": "^1.6.2",
         "builtin-modules": "^3.2.0",
         "dotenv": "^16.0.3",
         "js-yaml": "^4.1.0",

package/scripts/metadataDownloadHelper.ts

@@ -0,0 +1,85 @@
+import * as dotenv from "dotenv";
+import * as fs from "fs/promises";
+import { Agent } from "https";
+import RequestUtil from "../src/util/requestUtil";
+
+dotenv.config();
+const httpsAgent = new Agent({ rejectUnauthorized: false });
+
+export default class MetadataDownloadHelper {
+
+    static async readAllUrls() {
+        await fs.readdir("./test/resources/annotations/inline", { encoding: "utf8" });
+        const resultsObject = JSON.parse(await fs.readFile("./test/resources/allReleasedODataServices.json", { encoding: "utf8" }));
+        return this.exractUrlsFromResponse(resultsObject);
+    }
+
+    static async fetchAllUrls(host: string) {
+        const REQUEST_OPTIONS_JSON = {
+            headers: {
+                "Content-Type": "application/json; charset=utf-8",
+                'Cookie': process.env.cookie,
+            },
+            httpsAgent
+        };
+        const url = "/sap/bc/ui2/app_index?sap.fiori/cloudDevAdaptationStatus=released&fields=sap.app/id,sap.app/dataSources/OData/uri";
+        const response = await RequestUtil.get(host + url, REQUEST_OPTIONS_JSON);
+        const allUris = this.exractUrlsFromResponse(response);
+        for (const [index, url] of allUris.entries()) {
+            try {
+                const metadataFile = await this.fetchMetadataFileByUri(host, url);
+                if (typeof metadataFile === "object") {
+                    console.error(`Received object instead of xml file with content: ${JSON.stringify(metadataFile)}`)
+                    continue;
+                }
+                // @ts-ignore
+                await fs.writeFile(`test/resources/metadata/download/${index}__${url.replaceAll("/", "_")}.xml`, metadataFile, { encoding: "utf8" });
+            } catch (e: any) {
+                console.error(`Error fetching metadata file with url ${url} with error \n\n ${e}`);
+                continue;
+            }
+        }
+    }
+
+    private static exractUrlsFromResponse(resultsObject: any) {
+        let allUrls: string[] = [];
+        resultsObject.results.map((value: any) => {
+            allUrls = allUrls.concat(value["sap.app/dataSources/OData/uri"]);
+        });
+        return allUrls;
+    }
+
+    static readMetadataFileByFilePath(filePath: string) {
+        return fs.readFile(filePath, { encoding: "utf8" });
+    }
+
+    static fetchMetadataFileByUri(host: string, uri: 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
+        };
+        uri = uri.endsWith("/") ? `${uri}$metadata` : `${uri}/$metadata`;
+        return RequestUtil.get(host + uri, REQUEST_OPTIONS_XML);
+    }
+}
+
+// Get the command line arguments
+const args = process.argv;
+
+// Find the index of the `--host=` argument
+const hostArgIndex = args.findIndex(arg => arg.startsWith('--host='));
+
+// If the `--host=` argument is found
+if (hostArgIndex !== -1) {
+  // Extract the value of the `--host=` argument
+  const hostArg = args[hostArgIndex];
+  const host = hostArg.split('=')[1];
+
+  // Use the `host` variable as needed
+  MetadataDownloadHelper.fetchAllUrls(host);
+} else {
+    console.info("Please provide missing host parameter");
+}

package/scripts/rollup.ts

@@ -73,15 +73,6 @@ export default class Builder {
             [
                 "sap/ui/thirdparty/URI"
             ]);
-        await Bundler.run(
-            project,
-            "bundleDefinition-resourceBundle.js",
-            "./dist/bundle-resourceBundle.js",
-            "/sap.ui.core",
-            [
-                "/resources/sap/base/**"
-            ]
-        );
     }
 }