@ui5/task-adaptation 1.3.3 → 1.4.0

package/CHANGELOG.md

@@ -2,7 +2,10 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
-A list of unreleased changes can be found [here](https://github.com/SAP/ui5-task-adaptation/compare/v1.3.3...HEAD).
+A list of unreleased changes can be found [here](https://github.com/SAP/ui5-task-adaptation/compare/v1.4.0...HEAD).
+
+<a name="v1.4.0"></a>
+## [v1.4.0] - 2024-09-25
 
 <a name="v1.3.3"></a>
 ## [v1.3.3] - 2024-09-11
@@ -97,6 +100,7 @@ A list of unreleased changes can be found [here](https://github.com/SAP/ui5-task
 <a name="v1.0.0"></a>
 ## v1.0.0 - 2020-12-09
 
+[v1.4.0]: https://github.com/SAP/ui5-task-adaptation/compare/v1.3.3...v1.4.0
 [v1.3.3]: https://github.com/SAP/ui5-task-adaptation/compare/v1.3.2...v1.3.3
 [v1.3.2]: https://github.com/SAP/ui5-task-adaptation/compare/v1.3.1...v1.3.2
 [v1.3.1]: https://github.com/SAP/ui5-task-adaptation/compare/v1.3.0...v1.3.1

package/README.md

@@ -8,15 +8,18 @@ A custom task for [ui5-builder](https://github.com/SAP/ui5-builder) that allows
 
 ### Configuration
 #### ABAP Connection
-The following connection configuration format is used to connect to ABAP repository on SAP BAS and IDE:
+The following connection configuration format is used to connect to ABAP repository in IDE:
 ```yaml
-connections:
-    - url: example.com,
-      authenticationType: basic | reentranceTicket,
-      ignoreCertErrors: true | false
-    - destination: abc
+target:
+  url: example.com,
+  authenticationType: basic | reentranceTicket,
+  ignoreCertErrors: true | false
+```
+and in SAP Business Application Studio:
+```yaml
+target:
+  destination: abc
 ```
-In case multiple connection configuration are present, then the current environment configuration will be used. For example in above case `destination` for SAP BAS or `url` for IDE will be automaticaly used.
 OnPremise ABAP repository requires `authenticationType: basic`, credentials should be provided in project root `.env` file:
 ```
 FIORI_TOOLS_USER=<username>

package/dist/annotations/serviceRequestor.js

@@ -26,7 +26,8 @@ function retryOnError(maxRetries) {
                         retries++;
                     }
                     else {
-                        throw new Error(`Failed to fetch annotation by '${args[0]}': ${error.message}`);
+                        const message = error?.response?.data ?? error.message;
+                        throw new Error(`Failed to fetch annotation by '${args[0]}': ${message}`);
                     }
                 }
             }

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/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/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.0",
     "description": "Custom task for ui5-builder which allows building UI5 Flexibility Adaptation Projects for SAP BTP, Cloud Foundry environment",
     "main": "index.js",
     "scripts": {
@@ -33,13 +33,13 @@
     "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",
         "crc": "^4.3.2",
@@ -61,7 +61,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 +80,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",