@ui5/task-adaptation 1.4.0 → 1.4.2

package/dist/util/commonUtil.js

@@ -69,6 +69,9 @@ export function removePropertiesExtension(filePath) {
     return filePath.substring(0, lastIndexOf);
 }
 export function traverse(json, paths, callback) {
+    if (!json) {
+        return;
+    }
     for (const key of Object.keys(json)) {
         const internPaths = [...paths];
         internPaths.push(key);

package/dist/util/requestUtil.js

@@ -5,7 +5,7 @@ export default class RequestUtil {
         return this.request(url, axios.head);
     }
     static async get(url, options) {
-        return this.request(url, axios.get, options);
+        return this.request(url, axios.get, options).then(response => response.data);
     }
     static async request(url, method, options) {
         try {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ui5/task-adaptation",
-    "version": "1.4.0",
+    "version": "1.4.2",
     "description": "Custom task for ui5-builder which allows building UI5 Flexibility Adaptation Projects for SAP BTP, Cloud Foundry environment",
     "main": "index.js",
     "scripts": {
@@ -41,15 +41,16 @@
         "@ui5/fs": "^4.0.1",
         "@ui5/logger": "^4.0.1",
         "adm-zip": "^0.5.5",
-        "axios": "^1.6.2",
+        "axios": "^1.7.9",
         "crc": "^4.3.2",
         "dotenv": "^16.0.3",
         "jsdom": "^23.0.1",
+        "meriyah": "^6.0.3",
         "temp-dir": "^2.0.0",
         "xml-js": "^1.6.11"
     },
     "devDependencies": {
-        "@buxlabs/amd-to-es6": "^0.16.1",
+        "@buxlabs/amd-to-es6": "^0.16.3",
         "@istanbuljs/nyc-config-typescript": "^1.0.1",
         "@rollup/plugin-node-resolve": "^15.2.3",
         "@types/adm-zip": "^0.4.34",

package/scripts/rollup/amdToEsm.ts

@@ -0,0 +1,22 @@
+import { parse } from "meriyah";
+import { traverse } from "../../src/util/commonUtil.js";
+
+export default function convert(content: string) {
+    return [
+        extractEsmClass
+    ].reduce((result, converter) => converter(result), content);
+}
+
+function extractEsmClass(content: string) {
+    const result = parse(content, { ranges: true });
+    let classCode: { start: number, end: number } | undefined;
+    traverse(result, [], (json, key) => {
+        if (key === "type" && json[key] === "ClassDeclaration") {
+            if (classCode) {
+                throw new Error("Only one class declaration per module is allowed");
+            }
+            classCode = json;
+        }
+    });
+    return classCode && "export default " + content.substring(classCode.start, classCode.end) || content;
+}

package/scripts/rollup/overrides/sap/base/config.js

@@ -1,4 +1,5 @@
 export default class config {
+    config = new Map();
     static get Type() {
         return {
             String: "string"
@@ -7,4 +8,14 @@ export default class config {
     static get({ name }) {
         return name === "sapUiLogLevel" ? "Error" : undefined;
     }
+    static getWritableInstance() {
+        return {
+            get(obj) {
+                config.get(obj.name);
+            },
+            set(name, obj) {
+                config.set(name, obj);
+            }
+        }
+    }
 }

package/scripts/rollup/project/ui5.yaml

@@ -6,7 +6,7 @@ metadata:
   allowSapInternal: true
 framework:
   name: SAPUI5
-  version: 0.0.0
+  version: 1.131.0
   libraries:
     - name: sap.ui.fl
     - name: sap.suite.ui.generic.template

package/scripts/rollup/ui5Resolve.ts

@@ -4,6 +4,7 @@ import * as path from "path";
 
 //@ts-ignore
 import convertAMDtoES6 from "@buxlabs/amd-to-es6";
+import convertAMDtoESM from "./amdToEsm.js";
 import { dirname } from "node:path";
 import { fileURLToPath } from "node:url";
 import { getLogger } from "@ui5/logger";
@@ -93,7 +94,11 @@ export default function (options: any) {
                 .replace(/\, \/\* bExport\= \*\/ true\)/g, ")")
                 .replace(/},.*(true|false)\);$/g, "});")
                 .replace(/},.*(true|false)\);(\n\/\/# sourceMappingURL=)*/g, "});\n//# sourceMappingURL=");
-            return convertAMDtoES6(code);
+            try {
+                return convertAMDtoES6(code);
+            } catch (_: any) {
+                return convertAMDtoESM(code);
+            }
         }
 
     };
@@ -114,6 +119,7 @@ function transform(code: string, id: string) {
 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();
+    // eslint-disable-next-line no-cond-assign
     while (match = requireAsyncPattern.exec(code)) {
         if (match.groups?.url) {
             const varaibleName = match.groups.url.split("/").pop() + crypto.randomBytes(16).toString("hex");

package/scripts/rollup.ts

@@ -120,7 +120,7 @@ export default class Builder {
             "./dist/bundle.js",
             [
                 "sap/ui/performance/Measurement",
-                "sap/base/config.js"
+                "sap/base/config"
             ]
         );
         this.copyTypeDefinition();