@ui5/task-adaptation 1.4.2 → 1.4.3

package/dist/model/configuration.d.ts

@@ -4,8 +4,8 @@ export interface IConfiguration {
     appId?: string;
     appName?: string;
     appVersion?: string;
-    spaceGuid?: string;
-    orgGuid?: string;
+    space?: string;
+    org?: string;
     sapCloudService?: string;
     destination?: string;
     type?: "cf" | "abap";

package/dist/model/types.d.ts

@@ -8,7 +8,7 @@ export interface ICreateServiceInstanceParams {
     spaceGuid: string;
     planName: string;
     serviceName: string;
-    serviceInstanceName?: string;
+    serviceInstanceName: string;
     tags: string[];
     parameters?: any;
 }

package/dist/processors/cfProcessor.js

@@ -19,7 +19,7 @@ export default class CFProcessor {
     updateCloudPlatform(renamedBaseAppManifest) {
         const sapCloudService = renamedBaseAppManifest["sap.cloud"]?.service;
         const sapPlatformCf = renamedBaseAppManifest["sap.platform.cf"];
-        if (sapPlatformCf && sapCloudService) {
+        if (sapPlatformCf?.oAuthScopes && sapCloudService) {
             sapPlatformCf.oAuthScopes = sapPlatformCf.oAuthScopes.map((scope) => scope.replace(`$XSAPPNAME.`, `$XSAPPNAME('${sapCloudService}').`));
         }
         if (this.configuration.sapCloudService) {

package/dist/processors/processor.js

@@ -22,7 +22,7 @@ export function determineProcessor(configuration) {
                 processor.validateConfiguration();
                 return processor;
             }
-            catch (error) {
+            catch (_error) {
                 continue;
             }
         }

package/dist/repositories/html5RepoManager.js

@@ -13,7 +13,7 @@ export default class HTML5RepoManager {
         return this.requestMetadata(configuration, baseUri, token);
     }
     static async getHtml5RepoInfo(configuration) {
-        const spaceGuid = await CFUtil.getSpaceGuid(configuration?.spaceGuid);
+        const spaceGuid = await CFUtil.getSpaceGuid(configuration?.space);
         const credentials = await this.getHTML5Credentials(spaceGuid);
         const token = await this.getToken(credentials);
         return {
@@ -33,7 +33,8 @@ export default class HTML5RepoManager {
         const createParams = {
             spaceGuid,
             planName: PLAN_NAME,
-            serviceName: SERVIСE_INSTANCE_NAME,
+            serviceName: "html5-apps-repo",
+            serviceInstanceName: SERVIСE_INSTANCE_NAME,
             tags: ["html5-apps-repo-rt"]
         };
         const serviceKeys = await CFUtil.getServiceInstanceKeys(getParams, createParams);

package/dist/util/cfUtil.d.ts

@@ -14,6 +14,7 @@ export default class CFUtil {
     private static getServiceKeys;
     private static createServiceKey;
     private static getServiceInstance;
+    static processErrors(json: any): void;
     static requestCfApi(url: string): Promise<IResource[]>;
     static getOAuthToken(): Promise<string>;
     private static cfExecute;

package/dist/util/cfUtil.js

@@ -1,4 +1,5 @@
-import { cfCreateService, cfGetInstanceCredentials, cfGetTarget } from "@sap/cf-tools/out/src/cf-local.js";
+import { cfCreateService, cfGetInstanceCredentials } from "@sap/cf-tools/out/src/cf-local.js";
+import { getSpaceGuidThrowIfUndefined } from "@sap/cf-tools/out/src/utils.js";
 import { Cli } from "@sap/cf-tools/out/src/cli.js";
 import { eFilters } from "@sap/cf-tools/out/src/types.js";
 import { getLogger } from "@ui5/logger";
@@ -34,16 +35,20 @@ export default class CFUtil {
     }
     static async createService(params) {
         log.verbose(`Creating a service instance with parameters: ${JSON.stringify(params)}`);
-        const resources = await this.requestCfApi(`/v3/service_plans?names=${params.planName}&space_guids=${params.spaceGuid}`);
-        const publicPlan = resources.find(resource => resource.visibility_type === "public");
-        if (!publicPlan) {
-            throw new Error(`Cannot find a public plan by name '${params.serviceName}' in space '${params.spaceGuid}'`);
+        const serviceOfferings = await this.requestCfApi(`/v3/service_offerings?names=${params.serviceName}`);
+        if (serviceOfferings.length === 0) {
+            throw new Error(`Cannot find a service offering by name '${params.serviceName}'`);
+        }
+        const plans = await this.requestCfApi(`/v3/service_plans?service_offering_guids=${serviceOfferings[0].guid}`);
+        const plan = plans.find(plan => plan.name === params.planName);
+        if (!plan) {
+            throw new Error(`Cannot find a plan by name '${params.planName}' for service '${params.serviceName}'`);
         }
         try {
-            await cfCreateService(publicPlan.guid, params.serviceName, params.parameters, params.tags);
+            await cfCreateService(plan.guid, params.serviceInstanceName, params.parameters, params.tags);
         }
         catch (error) {
-            throw new Error(`Cannot create a service instance '${params.serviceName}' in space '${params.spaceGuid}': ${error.message}`);
+            throw new Error(`Cannot create a service instance '${params.serviceInstanceName}' in space '${params.spaceGuid}': ${error.message}`);
         }
     }
     static async getOrCreateServiceKeys(serviceInstance) {
@@ -73,7 +78,7 @@ export default class CFUtil {
             return this.cfExecute(["create-service-key", serviceInstanceName, serviceKeyName]);
         }
         catch (error) {
-            throw new Error(`Couldn't create a service key for instance: ${serviceInstanceName}`);
+            throw new Error(`Couldn't create a service key for instance ${serviceInstanceName}: ${error.message}`);
         }
     }
     static async getServiceInstance(params) {
@@ -92,9 +97,19 @@ export default class CFUtil {
             guid: service.guid
         }));
     }
+    static processErrors(json) {
+        if (json?.errors?.length > 0) {
+            const message = JSON.stringify(json.errors);
+            if (json?.errors?.some((e) => e.title === "CF-NotAuthenticated" || e.code === 10002)) {
+                throw new Error(`Authentication error. Use 'cf login' to authenticate in Cloud Foundry: ${message}`);
+            }
+            throw new Error(`Failed sending request to Cloud Foundry: ${message}`);
+        }
+    }
     static async requestCfApi(url) {
         const response = await this.cfExecute(["curl", url]);
         const json = this.parseJson(response);
+        this.processErrors(json);
         const resources = json?.resources;
         const totalPages = json?.pagination?.total_pages;
         if (totalPages > 1) {
@@ -105,7 +120,7 @@ export default class CFUtil {
                 return this.parseJson(response)?.resources || [];
             })).then(resources => [].concat(...resources)));
         }
-        return resources;
+        return resources ?? [];
     }
     static getOAuthToken() {
         return this.cfExecute(["oauth-token"]);
@@ -152,20 +167,9 @@ export default class CFUtil {
      * @memberof CFUtil
      */
     static async getSpaceGuid(spaceGuid) {
-        if (spaceGuid == null) {
-            const spaceName = (await cfGetTarget())?.space;
-            if (spaceName) {
-                const resources = await this.requestCfApi(`/v3/spaces?names=${spaceName}`);
-                for (const resource of resources) {
-                    spaceGuid = resource.guid;
-                    break;
-                }
-            }
-        }
-        if (spaceGuid == null) {
-            throw new Error("Please login to Cloud Foundry with 'cf login' and try again");
-        }
-        return spaceGuid;
+        return spaceGuid ?? getSpaceGuidThrowIfUndefined().catch((e) => {
+            throw new Error("Please specify space and org guids in ui5.yaml or login to Cloud Foundry with 'cf login' and try again: " + e.message);
+        });
     }
 }
 //# sourceMappingURL=cfUtil.js.map

package/dist/util/commonUtil.d.ts

@@ -1,7 +1,7 @@
 import { IConfiguration } from "../model/types.js";
 import Language from "../model/language.js";
 export declare function dotToUnderscore(value: string): string;
-export declare function validateObject<T extends Object>(options: T, properties: Array<keyof T>, message: string): void;
+export declare function validateObject<T extends object>(options: T, properties: Array<keyof T>, message: string): void;
 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 insertInArray<T>(array: T[], index: number, insert: T): void;

package/dist/util/commonUtil.js

@@ -102,7 +102,7 @@ export function logBuilderVersion() {
         const packageJsonVersion = JSON.parse(packageJson).version;
         log.info(`Running app-variant-bundler-build with version ${packageJsonVersion}`);
     }
-    catch (e) {
+    catch (_error) {
         // do nothing
     }
 }

package/dist/util/requestUtil.d.ts

@@ -1,6 +1,7 @@
+import { AxiosRequestConfig } from "axios";
 export default class RequestUtil {
     static head(url: string): Promise<any>;
     static get(url: string, options?: any): Promise<any>;
-    static request(url: string, method: Function, options?: any): Promise<any>;
+    static request(url: string, method: (url: string, config?: AxiosRequestConfig) => any, options?: any): Promise<any>;
     private static handleError;
 }

package/eslint.config.js

@@ -1,5 +1,3 @@
-// @ts-check
-
 import * as eslintimport from "eslint-plugin-import";
 
 import eslint from "@eslint/js";
@@ -11,7 +9,11 @@ export default tseslint.config(
     {
         languageOptions: {
             parserOptions: {
-                project: true,
+                project: [
+                    "./tsconfig.json",
+                    "./test/tsconfig.json",
+                    "./scripts/tsconfig.json"
+                ],
                 tsconfigRootDir: import.meta.dirname,
             },
         },
@@ -46,7 +48,24 @@ export default tseslint.config(
                 {
                     "js": "always"
                 }
+            ],
+            "@typescript-eslint/no-unused-vars": [
+                "warn", // or "error"
+                {
+                    "argsIgnorePattern": "^_",
+                    "varsIgnorePattern": "^_",
+                    "caughtErrorsIgnorePattern": "^_"
+                }
             ]
         }
+    },
+    {
+        files: ["test/**/*.spec.ts"],
+        rules: {
+            "@typescript-eslint/no-unused-expressions": "off"
+        },
+    },
+    {
+        ignores: ["test/resources/**"]
     }
 );

package/package.json

@@ -1,14 +1,13 @@
 {
     "name": "@ui5/task-adaptation",
-    "version": "1.4.2",
+    "version": "1.4.3",
     "description": "Custom task for ui5-builder which allows building UI5 Flexibility Adaptation Projects for SAP BTP, Cloud Foundry environment",
     "main": "index.js",
     "scripts": {
         "test": "npm run lint && npm run build && npm run coverage",
-        "lint": "npx eslint ./src",
+        "lint": "eslint ./src ./test",
         "dev": "UI5_LOG_LVL=error mocha --no-timeouts --no-warnings --import=tsx --loader=esmock 'test/**/*.spec.ts'",
-        "perf": "UI5_LOG_LVL=error mocha --no-timeouts --no-warnings --import=tsx --loader=esmock 'test/**/*.perf.ts'",
-        "coverage": "npx c8 npm run dev",
+        "coverage": "c8 npm run dev",
         "preversion": "npm test",
         "version": "git-chglog --next-tag v$npm_package_version -o CHANGELOG.md && git add CHANGELOG.md",
         "prepublishOnly": "git push --follow-tags",
@@ -34,14 +33,14 @@
     "license": "Apache-2.0",
     "dependencies": {
         "@sap-ux/axios-extension": "^1.16.6",
-        "@sap-ux/btp-utils": "^0.15.2",
+        "@sap-ux/btp-utils": "^1.0.2",
         "@sap-ux/store": "^0.9.1",
         "@sap-ux/system-access": "^0.5.11",
         "@sap/cf-tools": "^3.2.0",
         "@ui5/fs": "^4.0.1",
         "@ui5/logger": "^4.0.1",
         "adm-zip": "^0.5.5",
-        "axios": "^1.7.9",
+        "axios": "^1.8.3",
         "crc": "^4.3.2",
         "dotenv": "^16.0.3",
         "jsdom": "^23.0.1",
@@ -51,8 +50,7 @@
     },
     "devDependencies": {
         "@buxlabs/amd-to-es6": "^0.16.3",
-        "@istanbuljs/nyc-config-typescript": "^1.0.1",
-        "@rollup/plugin-node-resolve": "^15.2.3",
+        "@rollup/plugin-node-resolve": "^15.3.0",
         "@types/adm-zip": "^0.4.34",
         "@types/chai": "^4.2.21",
         "@types/chai-as-promised": "^7.1.4",
@@ -65,27 +63,29 @@
         "@ui5/project": "^4.0.3",
         "amdextract": "^3.0.0",
         "builtin-modules": "^3.2.0",
-        "c8": "^9.1.0",
+        "c8": "^10.1.3",
         "chai": "^4.3.4",
         "chai-as-promised": "^7.1.1",
         "chalk": "^4.1.2",
-        "eslint": "^8.57.0",
-        "eslint-plugin-import": "^2.29.1",
+        "eslint": "^9.22.0",
+        "eslint-plugin-import": "^2.31.0",
         "esmock": "^2.6.3",
         "glob": "^10.3.10",
         "js-yaml": "^4.1.0",
         "lodash": "^4.17.21",
         "minimatch": "^9.0.3",
-        "mocha": "^10.2.0",
+        "mocha": "^11.1.0",
         "mock-require": "^3.0.3",
-        "nyc": "^15.1.0",
-        "rollup": "^4.9.6",
+        "rollup": "^4.24.0",
         "semver": "^7.3.5",
         "sinon": "^18.0.1",
         "source-map-support": "^0.5.19",
         "tsx": "^4.7.1",
         "typescript": "^5.4.2",
-        "typescript-eslint": "^7.2.0"
+        "typescript-eslint": "^8.26.1"
+    },
+    "optionalDependencies": {
+        "@rollup/rollup-linux-x64-gnu": "4.39.0"
     },
     "c8": {
         "src": "./src",

package/scripts/rollup/bundle.d.ts

@@ -1,13 +1,12 @@
 export declare const RegistrationBuild: () => void;
 
 export declare class Applier {
-    static applyChanges(manifest: any, changes: Change[], strategy: any): Promise<void>;
+    static applyChanges(manifest: any, changes: AppDescriptorChange[], strategy: any): Promise<void>;
 }
 
-export declare class Change {
+export declare class AppDescriptorChange {
     constructor(change: any);
     getLayer(): string;
-    _oDefinition: any;
 }
 
 export declare class V2MetadataConverter {

package/scripts/rollup/bundleDefinition.js

@@ -1,7 +1,7 @@
 //Flex
+import AppDescriptorChange from "sap/ui/fl/apply/_internal/flexObjects/AppDescriptorChange";
 import Applier from "sap/ui/fl/apply/_internal/changes/descriptor/Applier";
 import ApplyUtil from "sap/ui/fl/apply/_internal/changes/descriptor/ApplyUtil";
-import Change from "sap/ui/fl/Change";
 import RegistrationBuild from "sap/ui/fl/apply/_internal/changes/descriptor/RegistrationBuild";
 //OData
 import URI from "sap/ui/thirdparty/URI";
@@ -10,9 +10,9 @@ import V4MetadataConverter from "sap/ui/model/odata/v4/lib/_V4MetadataConverter"
 
 export {
     //Flex
+    AppDescriptorChange,
     Applier,
     ApplyUtil,
-    Change,
     RegistrationBuild,
     //OData
     URI,

package/scripts/rollup/overrides/sap/ui/fl/Utils.js

@@ -0,0 +1,13 @@
+/*!
+ * OpenUI5
+ * (c) Copyright 2009-2025 SAP SE or an SAP affiliate company.
+ * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
+ */
+
+sap.ui.define([
+], function (
+) {
+    return {
+        getChangeFromChangesMap: function () { }
+    };
+});

package/scripts/rollup/overrides/sap/ui/fl/apply/_internal/changes/FlexCustomData.js

@@ -0,0 +1,13 @@
+/*!
+ * OpenUI5
+ * (c) Copyright 2009-2025 SAP SE or an SAP affiliate company.
+ * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
+ */
+
+sap.ui.define([
+], function (
+) {
+    return {
+        hasChangeApplyFinishedCustomData: function () { }
+    };
+});

package/scripts/rollup/overrides/sap/ui/fl/apply/_internal/flexObjects/AnnotationChange.js

@@ -0,0 +1,11 @@
+/*!
+ * OpenUI5
+ * (c) Copyright 2009-2020 SAP SE or an SAP affiliate company.
+ * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
+ */
+
+sap.ui.define([
+], function (
+) {
+    return function () {};
+}, true);

package/scripts/rollup/overrides/sap/ui/fl/apply/_internal/flexObjects/AppDescriptorChange.js

@@ -0,0 +1,68 @@
+/*!
+ * OpenUI5
+ * (c) Copyright 2009-2020 SAP SE or an SAP affiliate company.
+ * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
+ */
+
+sap.ui.define([
+], function (
+) {
+    "use strict";
+
+    /**
+     * Flexibility change class. Stores change content and related information.
+     *
+     * @param {object} oFile - File content and admin data
+     *
+     * @class sap.ui.fl.Change
+     * @private
+     * @ui5-restricted
+     * @experimental Since 1.25.0
+     */
+    var AppDescriptorChange = function (content) {
+        this.content = content;
+    };
+
+    /**
+     * Returns the change type.
+     *
+     * @returns {String} Change type of the file, for example <code>LabelChange</code>
+     * @public
+     */
+    AppDescriptorChange.prototype.getChangeType = function () {
+        return this.content?.flexObjectMetadata?.changeType || this.content?.changeType;
+    };
+
+    /**
+     * Gets the layer type for the change.
+     * @returns {string} Layer of the change file
+     *
+     * @public
+     */
+    AppDescriptorChange.prototype.getLayer = function () {
+        return this.content.layer;
+    };
+
+    /**
+     * Returns the content section of the change.
+     * @returns {string} Content of the change file. The content structure can be any JSON.
+     *
+     * @public
+     */
+    AppDescriptorChange.prototype.getContent = function () {
+        return this.content.content;
+    };
+
+    /**
+     * Returns all texts.
+     *
+     * @returns {object} All texts
+     *
+     * @function
+     */
+    AppDescriptorChange.prototype.getTexts = function () {
+        return this.content.texts;
+    };
+
+    return AppDescriptorChange;
+}, true);

package/scripts/rollup/overrides/sap/ui/fl/apply/_internal/flexObjects/VariantChange.js

@@ -0,0 +1,11 @@
+/*!
+ * OpenUI5
+ * (c) Copyright 2009-2020 SAP SE or an SAP affiliate company.
+ * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
+ */
+
+sap.ui.define([
+], function (
+) {
+    return function () {};
+}, true);

package/scripts/rollup/overrides/sap/ui/fl/apply/_internal/flexObjects/VariantManagementChange.js

@@ -0,0 +1,11 @@
+/*!
+ * OpenUI5
+ * (c) Copyright 2009-2020 SAP SE or an SAP affiliate company.
+ * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
+ */
+
+sap.ui.define([
+], function (
+) {
+    return function () {};
+}, true);

package/scripts/rollup/overrides/sap/ui/fl/apply/_internal/flexState/controlVariants/VariantManagementState.js

@@ -0,0 +1,13 @@
+/*!
+ * OpenUI5
+ * (c) Copyright 2009-2025 SAP SE or an SAP affiliate company.
+ * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
+ */
+
+sap.ui.define([
+], function (
+) {
+    return {
+        getChangeInformationProvider: function () { }
+    };
+});

package/scripts/rollup/overrides/sap/ui/fl/initial/_internal/changeHandlers/ChangeHandlerRegistration.js

@@ -0,0 +1,13 @@
+/*!
+* OpenUI5
+ * (c) Copyright 2009-2025 SAP SE or an SAP affiliate company.
+ * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
+*/
+
+sap.ui.define([
+], function (
+) {
+    return {
+        waitForChangeHandlerRegistration: function () { }
+    };
+});

package/scripts/rollup/overrides/sap/ui/fl/initial/_internal/changeHandlers/ChangeHandlerStorage.js

@@ -0,0 +1,14 @@
+/*!
+* OpenUI5
+ * (c) Copyright 2009-2025 SAP SE or an SAP affiliate company.
+ * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
+*/
+
+sap.ui.define([
+], function (
+) {
+    return {
+        getAnnotationChangeHandler: function () { },
+        getChangeHandler: function () { }
+    };
+});

package/scripts/rollup/project/ui5.yaml

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

package/scripts/rollup/overrides/sap/ui/fl/Change.js

@@ -1,74 +0,0 @@
-/*!
- * OpenUI5
- * (c) Copyright 2009-2020 SAP SE or an SAP affiliate company.
- * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
- */
-
-sap.ui.define([
-
-], function (
-
-) {
-	"use strict";
-
-	/**
-	 * Flexibility change class. Stores change content and related information.
-	 *
-	 * @param {object} oFile - File content and admin data
-	 *
-	 * @class sap.ui.fl.Change
-	 * @private
-	 * @ui5-restricted
-	 * @experimental Since 1.25.0
-	 */
-	var Change = function (oFile) {
-		this._oDefinition = oFile;
-	};
-
-	/**
-	 * Returns the change type.
-	 *
-	 * @returns {String} Change type of the file, for example <code>LabelChange</code>
-	 * @public
-	 */
-	Change.prototype.getChangeType = function () {
-		if (this._oDefinition) {
-			return this._oDefinition.flexObjectMetadata
-				? this._oDefinition.flexObjectMetadata.changeType
-				: this._oDefinition.changeType
-		}
-	};
-
-	/**
-	 * Gets the layer type for the change.
-	 * @returns {string} Layer of the change file
-	 *
-	 * @public
-	 */
-	Change.prototype.getLayer = function () {
-		return this._oDefinition.layer;
-	};
-
-	/**
-	 * Returns the content section of the change.
-	 * @returns {string} Content of the change file. The content structure can be any JSON.
-	 *
-	 * @public
-	 */
-	Change.prototype.getContent = function () {
-		return this._oDefinition.content;
-	};
-
-	/**
-	 * Returns all texts.
-	 *
-	 * @returns {object} All texts
-	 *
-	 * @function
-	 */
-	Change.prototype.getTexts = function () {
-		return this._oDefinition.texts;
-	};
-
-	return Change;
-}, true);