@ui5/task-adaptation 1.6.5-rc.2 → 1.6.5-rc.3

package/CHANGELOG.md

@@ -2,7 +2,13 @@
 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.6.5-rc.2...HEAD).
+A list of unreleased changes can be found [here](https://github.com/SAP/ui5-task-adaptation/compare/v1.6.5-rc.3...HEAD).
+
+<a name="v1.6.5-rc.3"></a>
+## [v1.6.5-rc.3] - 2026-04-27
+### Reverts
+- Release 1.6.5-rc.0
+
 
 <a name="v1.6.5-rc.2"></a>
 ## [v1.6.5-rc.2] - 2026-04-14
@@ -188,6 +194,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.6.5-rc.3]: https://github.com/SAP/ui5-task-adaptation/compare/v1.6.5-rc.2...v1.6.5-rc.3
 [v1.6.5-rc.2]: https://github.com/SAP/ui5-task-adaptation/compare/v1.6.5-rc.1...v1.6.5-rc.2
 [v1.6.5-rc.1]: https://github.com/SAP/ui5-task-adaptation/compare/v1.6.4-rc.3...v1.6.5-rc.1
 [v1.6.4-rc.3]: https://github.com/SAP/ui5-task-adaptation/compare/v1.6.4-rc.2...v1.6.4-rc.3

package/REUSE.toml

@@ -7,4 +7,4 @@ SPDX-PackageDownloadLocation = "https://github.com/SAP/ui5-task-adaptation"
 path = "**.**"
 precedence = "aggregate"
 SPDX-FileCopyrightText = "2009-2025 SAP SE or an SAP affiliate company"
-SPDX-License-Identifier = "Apache-2.0"
+SPDX-License-Identifier = "Apache-2.0"

package/dist/cache/cacheHolder.js

@@ -68,17 +68,18 @@ export function cached() {
     return function (_target, _propertyKey, descriptor) {
         const originalValue = descriptor.value;
         descriptor.value = async function (...args) {
-            const repoName = args[0];
-            const cachebusterToken = args[1];
-            let files = await CacheHolder.read(repoName, cachebusterToken);
-            CacheHolder.clearOutdatedExcept(repoName);
+            const cachedResource = args[0];
+            const { appName, cacheBusterToken: cachebusterToken } = cachedResource;
+            const token = await cachebusterToken;
+            let files = await CacheHolder.read(appName, token);
+            CacheHolder.clearOutdatedExcept(appName);
             if (files.size === 0) {
-                log.verbose(`No cache for repo '${repoName}' with token '${cachebusterToken}'. Fetching from HTML5 Repository.`);
+                log.verbose(`No cache for repo '${appName}' with token '${token}'. Fetching from HTML5 Repository.`);
                 files = await originalValue.apply(this, args);
-                await CacheHolder.write(repoName, cachebusterToken, files);
+                await CacheHolder.write(appName, token, files);
             }
             else {
-                log.verbose(`Using cached files for repo '${repoName}' with token '${cachebusterToken}'.`);
+                log.verbose(`Using cached files for repo '${appName}' with token '${token}'.`);
             }
             return files;
         };

package/dist/cache/cachedResource.d.ts

@@ -0,0 +1,4 @@
+export default interface ICachedResource {
+    appName: string;
+    cacheBusterToken: Promise<string>;
+}

package/dist/cache/cachedResource.js

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=cachedResource.js.map

package/dist/index.js

@@ -24,7 +24,7 @@ export default ({ workspace, options, taskUtil }) => {
         // latest app variant on top. We reverse the list to process original
         // application first and then app variants in chronological order.
         const reversedHierarchy = appVariantIdHierarchy.toReversed();
-        const fetchFilesPromises = reversedHierarchy.map(({ repoName, cachebusterToken }) => repository.fetch(repoName, cachebusterToken));
+        const fetchFilesPromises = reversedHierarchy.map(variant => repository.fetch(variant));
         fetchFilesPromises.push(Promise.resolve(adaptationProject.files));
         const appVariants = new Array();
         const adapt = async (baseAppFiles, appVariantFiles) => {

package/dist/landscapeConfiguration.js

@@ -47,7 +47,7 @@ function getTypeByConfiguration(configuration) {
     }
 }
 function getAdapter(configuration, annotationManager) {
-    if (isPreview(configuration)) {
+    if (isPreview()) {
         return new PreviewAdapter(configuration);
     }
     switch (configuration.type) {
@@ -60,8 +60,8 @@ function getAdapter(configuration, annotationManager) {
     }
 }
 function getRepository(configuration) {
-    if (isLocal(configuration)) {
-        return new LocalRepository(configuration);
+    if (isLocal()) {
+        return new LocalRepository();
     }
     switch (configuration.type) {
         case "abap":
@@ -73,7 +73,7 @@ function getRepository(configuration) {
     }
 }
 function getAnnotationManager(configuration, repository) {
-    if (isLocal(configuration)) {
+    if (isLocal()) {
         return new LocalAnnotationManager();
     }
     switch (configuration.type) {
@@ -85,10 +85,10 @@ function getAnnotationManager(configuration, repository) {
             throw new Error(`No annotation manager found for the given configuration type '${configuration.type}'`);
     }
 }
-function isLocal(configuration) {
-    return process.env.ADP_BUILDER_MODE === "local" || configuration.mode === "local";
+function isLocal() {
+    return process.env.ADP_BUILDER_MODE === "local";
 }
-function isPreview(configuration) {
-    return process.env.ADP_BUILDER_MODE === "preview" || configuration.mode === "preview";
+function isPreview() {
+    return process.env.ADP_BUILDER_MODE === "preview";
 }
 //# sourceMappingURL=landscapeConfiguration.js.map

package/dist/model/configuration.d.ts

@@ -9,19 +9,15 @@ export interface IConfiguration {
     sapCloudService?: string;
     destination?: string;
     type?: LandscapeType;
-    mode?: LandscapeMode;
     languages?: any[] | undefined;
     enableAnnotationCache?: boolean;
     enableBetaFeatures?: boolean;
     writeTempFiles?: any;
     target?: AbapTarget & IAbapTargetMeta;
     serviceInstanceName?: string;
-    adpDir?: string;
 }
 export declare const LANDSCAPE_TYPES: readonly ["cf", "abap"];
 export type LandscapeType = typeof LANDSCAPE_TYPES[number];
-export declare const LANDSCAPE_MODES: readonly ["preview", "local", "default"];
-export type LandscapeMode = typeof LANDSCAPE_MODES[number];
 export interface IAbapTargetMeta {
     name?: string;
     ignoreCertErrors?: boolean;

package/dist/model/configuration.js

@@ -1,3 +1,2 @@
 export const LANDSCAPE_TYPES = ["cf", "abap"];
-export const LANDSCAPE_MODES = ["preview", "local", "default"];
 //# sourceMappingURL=configuration.js.map

package/dist/previewManager.js

@@ -93,8 +93,14 @@ export default class PreviewManager {
         const promises = new Map();
         reuseLibs.forEach(lib => {
             log.info(`Downloading reuse library '${lib.html5AppName}' version '${lib.html5AppVersion}'`);
+            const resource = {
+                appName: lib.html5AppName,
+                appVersion: lib.html5AppVersion,
+                appHostId: lib.html5AppHostId,
+                cacheBusterToken: Promise.resolve(lib.html5CacheBusterToken)
+            };
             const promise = repository
-                .fetchReuseLib(lib.html5AppName, lib.html5CacheBusterToken, lib)
+                .fetch(resource)
                 .then((libFiles) => PreviewManager.moveLibraryFiles(libFiles, lib.html5AppName, lib.name));
             promises.set(lib.html5AppName, promise);
         });

package/dist/repositories/abapRepository.d.ts

@@ -1,15 +1,16 @@
-import { IConfiguration, IMetadata, IReuseLibInfo } from "../model/types.js";
+import { IConfiguration, IMetadata } from "../model/types.js";
 import AbapProvider from "./abapProvider.js";
-import { IAppVariantIdHierarchyItem } from "../model/appVariantIdHierarchyItem.js";
 import IRepository from "./repository.js";
+import ICachedResource from "../cache/cachedResource.js";
+type IAbapResource = ICachedResource;
 export default class AbapRepository implements IRepository {
     private configuration;
     private abapProvider;
     constructor(configuration: IConfiguration, abapProvider?: AbapProvider);
-    fetchReuseLib(_libName: string, _cachebusterToken: string, _lib: IReuseLibInfo): Promise<Map<string, string>>;
-    getAppVariantIdHierarchy(id: string): Promise<IAppVariantIdHierarchyItem[]>;
+    getAppVariantIdHierarchy(id: string): Promise<IAbapResource[]>;
     getAnnotationMetadata(uri: string): Promise<IMetadata>;
     downloadAnnotationFile(uri: string): Promise<Map<string, any>>;
     getMetadata(id: string): Promise<IMetadata>;
-    fetch(repoName: string, _cachebusterToken: string): Promise<Map<string, string>>;
+    fetch(resource: IAbapResource): Promise<Map<string, string>>;
 }
+export {};

package/dist/repositories/abapRepository.js

@@ -27,9 +27,6 @@ export default class AbapRepository {
         this.configuration = configuration;
         this.abapProvider = abapProvider ? abapProvider : new AbapProvider();
     }
-    fetchReuseLib(_libName, _cachebusterToken, _lib) {
-        throw new Error("Preview is not available on SAP S/4HANA On-Premise or Cloud Systems. Please create a ticket on CA-UI5-FL-ADP-BAS component.");
-    }
     async getAppVariantIdHierarchy(id) {
         const provider = await this.abapProvider.get(this.configuration);
         const lrep = provider.getLayeredRepository();
@@ -37,15 +34,17 @@ export default class AbapRepository {
             params: { id }
         });
         if (response.status === 200) {
-            return JSON.parse(response.data)?.appVariantIdHierarchy;
+            const hierarchy = JSON.parse(response.data)?.appVariantIdHierarchy;
+            return hierarchy.map(item => ({
+                appName: item.repoName,
+                cacheBusterToken: Promise.resolve(item.cachebusterToken)
+            }));
         }
         else if (this.configuration.appName) {
             // Fallback to old API on old ABAP backend or CF for backward compatibility
-            const metadataResponse = await this.getMetadata(id);
             return [{
-                    repoName: this.configuration.appName,
-                    appVariantId: id,
-                    cachebusterToken: metadataResponse.changedOn
+                    appName: this.configuration.appName,
+                    cacheBusterToken: this.getMetadata(id).then(metadata => metadata.changedOn),
                 }];
         }
         throw new Error(`App variant id hierarchy for app id '${id}' is not provided`);
@@ -78,8 +77,8 @@ export default class AbapRepository {
             id
         };
     }
-    async fetch(repoName, _cachebusterToken) {
-        const encodedRepoName = encodeURIComponent(repoName);
+    async fetch(resource) {
+        const encodedRepoName = encodeURIComponent(resource.appName);
         const provider = await this.abapProvider.get(this.configuration);
         const ui5Repo = provider.getUi5AbapRepository();
         const response = await ui5Repo.get(`/Repositories('${encodedRepoName}')`, {
@@ -94,7 +93,7 @@ export default class AbapRepository {
             const buffer = Buffer.from(data.d.ZipArchive, "base64");
             return unzipZipEntries(buffer);
         }
-        throw new Error(`App '${repoName}' doesn't contain files`);
+        throw new Error(`App '${resource.appName}' doesn't contain files`);
     }
 }
 __decorate([

package/dist/repositories/html5Repository.d.ts

@@ -1,13 +1,16 @@
-import { IConfiguration, IReuseLibInfo } from "./../model/types.js";
+import { IConfiguration } from "./../model/types.js";
 import IRepository from "./repository.js";
-import { IAppVariantIdHierarchyItem } from "../model/appVariantIdHierarchyItem.js";
+import ICachedResource from "../cache/cachedResource.js";
+export interface IHtml5Resource extends ICachedResource {
+    appVersion: string;
+    appHostId: string;
+}
 export default class HTML5Repository implements IRepository {
     private configuration;
     private validator;
     constructor(configuration: IConfiguration);
-    getAppVariantIdHierarchy(appId: string): Promise<IAppVariantIdHierarchyItem[]>;
-    fetch(_repoName: string, _cachebusterToken: string): Promise<Map<string, string>>;
-    fetchReuseLib(_libName: string, _cachebusterToken: string, lib: IReuseLibInfo): Promise<Map<string, string>>;
+    getAppVariantIdHierarchy(_appId: string): Promise<IHtml5Resource[]>;
+    fetch(resource: IHtml5Resource): Promise<Map<string, string>>;
     getMetadata(): Promise<any>;
     private getHtml5RepoInfo;
     private getHTML5Credentials;

package/dist/repositories/html5Repository.js

@@ -18,31 +18,21 @@ export default class HTML5Repository {
         this.configuration = configuration;
         this.validator.validateConfiguration(configuration);
     }
-    async getAppVariantIdHierarchy(appId) {
-        const metadata = await this.getMetadata();
+    async getAppVariantIdHierarchy(_appId) {
+        const { appName, appVersion, appHostId } = this.configuration;
+        if (!appName || !appVersion || !appHostId) {
+            throw new Error("Missing required configuration properties appName, appVersion or appHostId");
+        }
         return [{
-                repoName: this.configuration.appName,
-                appVariantId: appId,
-                cachebusterToken: metadata.changedOn
+                appName,
+                cacheBusterToken: this.getMetadata().then(metadata => metadata.changedOn),
+                appVersion,
+                appHostId,
             }];
     }
-    async fetch(_repoName, _cachebusterToken) {
+    async fetch(resource) {
         const { token, baseUri } = await this.getHtml5RepoInfo();
-        const appData = {
-            appName: this.configuration.appName,
-            appVersion: this.configuration.appVersion,
-            appHostId: this.configuration.appHostId
-        };
-        return this.getAppZipEntries(appData, baseUri, token);
-    }
-    async fetchReuseLib(_libName, _cachebusterToken, lib) {
-        const { token, baseUri } = await this.getHtml5RepoInfo();
-        const libAppData = {
-            appName: lib.html5AppName,
-            appVersion: lib.html5AppVersion,
-            appHostId: lib.html5AppHostId
-        };
-        return this.getAppZipEntries(libAppData, baseUri, token);
+        return this.getAppZipEntries(resource, baseUri, token);
     }
     async getMetadata() {
         const { token, baseUri } = await this.getHtml5RepoInfo();
@@ -66,17 +56,17 @@ export default class HTML5Repository {
     async getHTML5Credentials(spaceGuid) {
         log.verbose("Getting HTML5 Repo Runtime credentials from space " + spaceGuid);
         const PLAN_NAME = "app-runtime";
-        const SERVIСE_INSTANCE_NAME = "html5-apps-repo-runtime";
+        const SERVICE_INSTANCE_NAME = "html5-apps-repo-runtime";
         const getParams = {
             spaceGuids: [spaceGuid],
             planNames: [PLAN_NAME],
-            names: [SERVIСE_INSTANCE_NAME]
+            names: [SERVICE_INSTANCE_NAME]
         };
         const createParams = {
             spaceGuid,
             planName: PLAN_NAME,
             serviceName: "html5-apps-repo",
-            serviceInstanceName: SERVIСE_INSTANCE_NAME,
+            serviceInstanceName: SERVICE_INSTANCE_NAME,
             tags: ["html5-apps-repo-rt"]
         };
         const serviceKeys = await CFUtil.getServiceInstanceKeys(getParams, createParams);
@@ -107,9 +97,10 @@ export default class HTML5Repository {
         const metadata = await RequestUtil.get(uri, requestOptions);
         return metadata.find((item) => item.appHostId === appHostId && item.applicationName === appName && item.applicationVersion === appVersion);
     }
-    async getAppZipEntries(app, html5RepoBaseUri, token) {
-        const uri = `${html5RepoBaseUri}/applications/content/${app.appName}-${app.appVersion}/`;
-        const zip = await this.download(token, app.appHostId, uri);
+    async getAppZipEntries(resource, html5RepoBaseUri, token) {
+        const { appName, appVersion, appHostId } = resource;
+        const uri = `${html5RepoBaseUri}/applications/content/${appName}-${appVersion}/`;
+        const zip = await this.download(token, appHostId, uri);
         return unzipZipEntries(zip);
     }
     async download(token, appHostId, uri) {
@@ -133,7 +124,4 @@ export default class HTML5Repository {
 __decorate([
     cached()
 ], HTML5Repository.prototype, "fetch", null);
-__decorate([
-    cached()
-], HTML5Repository.prototype, "fetchReuseLib", null);
 //# sourceMappingURL=html5Repository.js.map

package/dist/repositories/localRepository.d.ts

@@ -1,16 +1,13 @@
-import { IAppVariantIdHierarchyItem } from "../model/appVariantIdHierarchyItem.js";
-import { IConfiguration } from "../model/configuration.js";
-import { IReuseLibInfo } from "../model/types.js";
 import IRepository from "./repository.js";
+import ICachedResource from "../cache/cachedResource.js";
+export interface ILocalResource extends ICachedResource {
+    absolutePath: string;
+}
 export default class LocalRepository implements IRepository {
-    private configuration;
-    constructor(configuration: IConfiguration);
     downloadAnnotationFile(_uri: string): Promise<Map<string, string>>;
-    getAppVariantIdHierarchy(appId: string): Promise<IAppVariantIdHierarchyItem[]>;
-    fetch(appId: string, cachebusterToken: string): Promise<Map<string, string>>;
-    fetchReuseLib(libName: string, cachebusterToken: string, _lib: IReuseLibInfo): Promise<Map<string, string>>;
+    getAppVariantIdHierarchy(appId: string): Promise<ILocalResource[]>;
+    fetch(resource: ILocalResource): Promise<Map<string, string>>;
     private collectAppVariantIdHierarchyItems;
     private getExistingManifestPath;
-    private readFilesInBaseAppDir;
     private getLocalFilesDirectory;
 }

package/dist/repositories/localRepository.js

@@ -4,10 +4,6 @@ import fs from "node:fs/promises";
 import FsUtil from "../util/fsUtil.js";
 const log = getLogger("@ui5/task-adaptation::LocalRepository");
 export default class LocalRepository {
-    configuration;
-    constructor(configuration) {
-        this.configuration = configuration;
-    }
     async downloadAnnotationFile(_uri) {
         log.verbose("Downloading annotation files is not supported in LocalRepository.");
         return new Map();
@@ -17,26 +13,24 @@ export default class LocalRepository {
         await this.collectAppVariantIdHierarchyItems(appId, items);
         return items;
     }
-    fetch(appId, cachebusterToken) {
-        return this.readFilesInBaseAppDir(appId, cachebusterToken);
-    }
-    fetchReuseLib(libName, cachebusterToken, _lib) {
-        return this.readFilesInBaseAppDir(libName, cachebusterToken);
+    fetch(resource) {
+        log.verbose(`Fetching base app files from local directory: ${resource.absolutePath}`);
+        return FsUtil.readFilesRecursively(resource.absolutePath);
     }
     async collectAppVariantIdHierarchyItems(appId, items) {
         const appDir = this.getLocalFilesDirectory(appId);
         const filenames = [
-            ["manifest.json"],
-            ["manifest.appdescr_variant"],
-            ["webapp", "manifest.json"],
-            ["webapp", "manifest.appdescr_variant"],
+            { path: ["webapp", "manifest.json"], suffix: "" },
+            { path: ["webapp", "manifest.appdescr_variant"], suffix: "" },
+            { path: ["manifest.json"], suffix: "-opt-static-abap" },
+            { path: ["manifest.appdescr_variant"], suffix: "-opt-static-abap" },
         ];
-        const filepaths = filenames.map((filename) => path.join(appDir, ...filename));
+        const filepaths = filenames.map((filename) => path.join(appDir + filename.suffix, ...filename.path));
         const existingManifestPath = await this.getExistingManifestPath(filepaths);
         items.push({
-            appVariantId: appId,
-            repoName: appId,
-            cachebusterToken: path.dirname(existingManifestPath)
+            appName: appId,
+            cacheBusterToken: Promise.resolve("local"),
+            absolutePath: path.dirname(existingManifestPath),
         });
         if (existingManifestPath.endsWith("manifest.appdescr_variant")) {
             const manifestContent = await fs.readFile(existingManifestPath, "utf-8");
@@ -52,12 +46,8 @@ export default class LocalRepository {
         }
         throw new Error(`None of the paths exist: '${filePaths.join("', '")}'.`);
     }
-    readFilesInBaseAppDir(_appId, cachebusterToken) {
-        log.verbose(`Fetching base app files from local directory: ${cachebusterToken}`);
-        return FsUtil.readFilesRecursively(cachebusterToken);
-    }
     getLocalFilesDirectory(appId) {
-        const adpDirConfigured = process.env.ADP_BUILDER_DIR || this.configuration.adpDir;
+        const adpDirConfigured = process.env.ADP_BUILDER_DIR;
         const adpDir = adpDirConfigured
             ? path.normalize(adpDirConfigured).replace(/\\/g, "/").replace(/\/+$/, "").split("/")
             : [".."];

package/dist/repositories/repository.d.ts

@@ -1,8 +1,6 @@
-import { IAppVariantIdHierarchyItem } from "../model/appVariantIdHierarchyItem.js";
-import { IReuseLibInfo } from "../model/types.js";
+import ICachedResource from "../cache/cachedResource.js";
 export default interface IRepository {
-    getAppVariantIdHierarchy(appId: string): Promise<IAppVariantIdHierarchyItem[]>;
-    fetch(repoName: string, cachebusterToken: string): Promise<Map<string, string>>;
-    fetchReuseLib(libName: string, cachebusterToken: string, lib: IReuseLibInfo): Promise<Map<string, string>>;
+    getAppVariantIdHierarchy(appId: string): Promise<ICachedResource[]>;
+    fetch(resource: ICachedResource): Promise<Map<string, string>>;
     downloadAnnotationFile(uri: string): Promise<Map<string, string>>;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ui5/task-adaptation",
-    "version": "1.6.5-rc.2",
+    "version": "1.6.5-rc.3",
     "description": "Custom task for ui5-builder which allows building UI5 Flexibility Adaptation Projects for SAP BTP, Cloud Foundry environment",
     "main": "index.js",
     "scripts": {
@@ -35,8 +35,8 @@
     "dependencies": {
         "@sap-ux/axios-extension": "^1.22.9",
         "@sap-ux/btp-utils": "^1.1.3",
-        "@sap-ux/store": "^1.1.4",
-        "@sap-ux/system-access": "^0.6.18",
+        "@sap-ux/store": "^1.5.13",
+        "@sap-ux/system-access": "^0.7.5",
         "@sap/cf-tools": "^3.2.2",
         "@ui5/fs": "^4.0.1",
         "@ui5/logger": "^4.0.1",
@@ -112,7 +112,8 @@
             "src/adapters/adapter.ts",
             "src/adapters/previewAdapter.ts",
             "src/repositories/repository.ts",
-            "src/annotations/annotationManager.ts"
+            "src/annotations/annotationManager.ts",
+            "src/cache/cachedResource.ts"
         ],
         "check-coverage": true,
         "statements": 85,