@ui5/task-adaptation 1.3.3 → 1.4.1

package/dist/model/configuration.d.ts

@@ -13,7 +13,7 @@ export interface IConfiguration {
     enableAnnotationCache?: boolean;
     enableBetaFeatures?: boolean;
     writeTempFiles?: any;
-    connections?: (AbapTarget & IAbapTargetMeta)[];
+    target?: AbapTarget & IAbapTargetMeta;
 }
 export interface IAbapTargetMeta {
     name?: string;

package/dist/repositories/abapProvider.d.ts

@@ -2,8 +2,6 @@ import type { AbapServiceProvider } from "@sap-ux/axios-extension";
 import { IConfiguration } from "../model/types.js";
 export default class AbapProvider {
     private provider;
-    get({ connections, destination }: IConfiguration): Promise<AbapServiceProvider>;
-    private static validateAndGetTargetConfiguration;
-    private static validateConnectionConfiguration;
-    private createProvider;
+    get({ target, destination }: IConfiguration): Promise<AbapServiceProvider>;
+    private static validateAndGetAbapTarget;
 }

package/dist/repositories/abapProvider.js

@@ -3,67 +3,35 @@ import BtpUtils from "@sap-ux/btp-utils";
 import { getLogger } from "@ui5/logger";
 import { validateObject } from "../util/commonUtil.js";
 const log = getLogger("@ui5/task-adaptation::AbapProvider");
+log.debug = (message) => log.verbose(message);
 export default class AbapProvider {
     provider = null;
-    async get({ connections, destination }) {
+    async get({ target, destination }) {
         if (!this.provider) {
-            AbapProvider.validateConnectionConfiguration(connections, destination);
-            // we try to detect is it either destination for BAS or url for IDE
-            let targetConfiguration = AbapProvider.validateAndGetTargetConfiguration(connections);
-            if (targetConfiguration) {
-                this.provider = await this.createProvider(targetConfiguration);
-            }
-            else if (destination) {
-                // still if no suitable connections found, we assume that it's
-                // old config with destination
-                this.provider = await this.createProvider({ destination });
-            }
-            else {
-                // if no suitible configs found - throw error
-                const environment = BtpUtils.isAppStudio() ? "SAP Business Application Studio" : "local IDE";
-                throw new Error(`ABAP connection configuration for ${environment} is not provided`);
+            const abapTarget = AbapProvider.validateAndGetAbapTarget(target, destination);
+            if (abapTarget) {
+                this.provider = await createAbapServiceProvider(abapTarget, { ignoreCertErrors: abapTarget.ignoreCertErrors }, true, log);
             }
         }
-        return this.provider;
-    }
-    static validateAndGetTargetConfiguration(connections) {
-        // we're trying to detect is it destination for BAS or url for IDE
-        const abapTargetProperties = BtpUtils.isAppStudio() ? ["destination"] : ["url"];
-        if (connections) {
-            for (const connection of connections) {
-                try {
-                    validateObject(connection, abapTargetProperties, "should be specified in ui5.yaml configuration/target");
-                }
-                catch (error) {
-                    continue;
-                }
-                return connection;
-            }
+        if (!this.provider) {
+            throw new Error("Target should be specified in ui5.yaml configuration to connect the ABAP system");
         }
+        return this.provider;
     }
-    static validateConnectionConfiguration(connections, destination) {
-        // then abap connection config either old destination propery, or new
-        // connections/destination for BAS or connections/url for IDE
-        if (!connections && !destination) {
-            throw new Error("ABAP connections should be specified in ui5.yaml configuration");
-        }
-        if (destination) {
-            log.warn("Deprecated, use connections/destination configuration instead, see README.md");
+    static validateAndGetAbapTarget(target, destination) {
+        if (target) {
+            // if target configuration appears, we validate that it should be
+            // either target/destination for BAS or target/url for IDE we're
+            // trying to detect is it destination for BAS or url for IDE
+            const abapTargetProperties = BtpUtils.isAppStudio() ? ["destination"] : ["url"];
+            validateObject(target, abapTargetProperties, "should be specified in ui5.yaml configuration/target");
+            return target;
         }
-        // if connections configuration appears, we validate that it should be
-        // either connections/destination for BAS or connections/url for IDE
-        if (connections && !AbapProvider.validateAndGetTargetConfiguration(connections)) {
-            throw new Error("ABAP connection settings should be specified in ui5.yaml configuration");
+        else if (destination) {
+            log.warn("Destination is deprecated, use target/destination configuration instead");
+            return { destination };
         }
-        // no connections and destination the same time to avoid ambiguity
-        if (connections && destination) {
-            throw new Error("Either destination or connections should be presented in configuration, not both");
-        }
-    }
-    createProvider(abapTarget) {
-        // createAbapServiceProvider requires log.debug, which is not implemented in ui5 logger.
-        log.debug = (message) => log.verbose(message);
-        return createAbapServiceProvider(abapTarget, { ignoreCertErrors: abapTarget.ignoreCertErrors }, true, log);
+        throw new Error("Target should be specified in ui5.yaml configuration to connect the ABAP system");
     }
 }
 //# sourceMappingURL=abapProvider.js.map

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/i18nMerger.d.ts

@@ -1,4 +1,3 @@
-/// <reference path="../../types/ui5.d.ts" />
 import * as Resource from "@ui5/fs/Resource";
 import { IAppVariantInfo } from "../model/types.js";
 type Resource = typeof Resource;

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/dist/util/zipUtil.d.ts

@@ -1,2 +1 @@
-/// <reference types="node" />
 export declare function unzipZipEntries(zip: Buffer): Promise<Map<string, string>>;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ui5/task-adaptation",
-    "version": "1.3.3",
+    "version": "1.4.1",
     "description": "Custom task for ui5-builder which allows building UI5 Flexibility Adaptation Projects for SAP BTP, Cloud Foundry environment",
     "main": "index.js",
     "scripts": {
@@ -33,23 +33,24 @@
     "author": "SAP SE",
     "license": "Apache-2.0",
     "dependencies": {
-        "@sap-ux/axios-extension": "^1.13.1",
-        "@sap-ux/btp-utils": "^0.14.4",
-        "@sap-ux/store": "^0.6.0",
-        "@sap-ux/system-access": "^0.4.2",
+        "@sap-ux/axios-extension": "^1.16.6",
+        "@sap-ux/btp-utils": "^0.15.2",
+        "@sap-ux/store": "^0.9.1",
+        "@sap-ux/system-access": "^0.5.11",
         "@sap/cf-tools": "^3.2.0",
-        "@ui5/fs": "^3.0.5",
-        "@ui5/logger": "^3.0.0",
+        "@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",
@@ -61,7 +62,7 @@
         "@types/mocha": "^9.1.0",
         "@types/semver": "^7.3.8",
         "@types/sinon": "^10.0.16",
-        "@ui5/project": "^3.9.0",
+        "@ui5/project": "^4.0.3",
         "amdextract": "^3.0.0",
         "builtin-modules": "^3.2.0",
         "c8": "^9.1.0",
@@ -80,7 +81,7 @@
         "nyc": "^15.1.0",
         "rollup": "^4.9.6",
         "semver": "^7.3.5",
-        "sinon": "^17.0.1",
+        "sinon": "^18.0.1",
         "source-map-support": "^0.5.19",
         "tsx": "^4.7.1",
         "typescript": "^5.4.2",

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.1
   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);
+            }
         }
 
     };

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