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

package/dist/bundle.js

@@ -6301,7 +6301,7 @@ class _URL extends URL {
 		}
 	}
 
-var rAmpersand = /&/g, rApplicationGroupID = /^\w+$/, sClassName$2 = "sap.ui.model.odata.v4.lib._Helper", rEquals = /\=/g, rGroupID = /^(\$auto(\.\w+)?|\$direct|\w+)$/, rHash = /#/g, rNotMetaContext = /\([^/]*|\/-?\d+/g, rPlus = /\+/g, rSingleQuote = /'/g, rSingleQuoteTwice = /''/g, rWhitespace = /\s+/g, _Helper;
+var rAmpersand = /&/g, rApplicationGroupID = /^\w+$/, sClassName$2 = "sap.ui.model.odata.v4.lib._Helper", rEndsWithTransientPredicate = /\(\$uid=[-\w]+\)$/, rEquals = /\=/g, rGroupID = /^(\$auto(\.\w+)?|\$direct|\w+)$/, rHash = /#/g, rNotMetaContext = /\([^/]*|\/-?\d+/g, rPlus = /\+/g, rSingleQuote = /'/g, rSingleQuoteTwice = /''/g, rWhitespace = /\s+/g, _Helper;
 _Helper = {
   addByPath: function (mMap, sPath, oItem) {
     if (oItem) {
@@ -6495,6 +6495,19 @@ _Helper = {
     convert(mQueryOptions, "");
     return aPaths;
   },
+  copyETags: function (oSource, oTarget) {
+    if (_Helper.getPrivateAnnotation(oSource, "predicate") !== _Helper.getPrivateAnnotation(oTarget, "predicate")) {
+      return;
+    }
+    oTarget["@odata.etag"] = oSource["@odata.etag"];
+    for (const sKey in oSource) {
+      const vSourceProperty = oSource[sKey];
+      const vTargetProperty = oTarget[sKey];
+      if (vSourceProperty && vTargetProperty && typeof vSourceProperty === "object" && !Array.isArray(vSourceProperty)) {
+        _Helper.copyETags(vSourceProperty, vTargetProperty);
+      }
+    }
+  },
   copyPrivateAnnotation: function (oSource, sAnnotation, oTarget, bAllowSame) {
     if (_Helper.hasPrivateAnnotation(oSource, sAnnotation)) {
       if (_Helper.hasPrivateAnnotation(oTarget, sAnnotation)) {
@@ -6540,6 +6553,10 @@ _Helper = {
         if (typeof oResult.message === "object") {
           oResult.message = oResult.error.message.value;
         }
+        const oClone = oResult.error["@$ui5.originalMessage"] = _Helper.clone(oResult.error);
+        oResult.error.details?.forEach(function (oDetail, i) {
+          oDetail["@$ui5.originalMessage"] = oClone.details[i];
+        });
       } catch (e) {
         Log.warning(e.toString(), sBody, sClassName$2);
       }
@@ -6583,7 +6600,7 @@ _Helper = {
     };
   },
   createTechnicalDetails: function (oMessage) {
-    var oClonedMessage, oError = oMessage["@$ui5.error"], oOriginalMessage = oMessage["@$ui5.originalMessage"] || oMessage, oTechnicalDetails = {};
+    var oClonedMessage, oError = oMessage["@$ui5.error"], oOriginalMessage = oMessage["@$ui5.originalMessage"], oTechnicalDetails = {};
     if (oError && (oError.status || oError.cause)) {
       oError = oError.cause || oError;
       oTechnicalDetails.httpStatus = oError.status;
@@ -6594,7 +6611,7 @@ _Helper = {
         oTechnicalDetails.retryAfter = oError.retryAfter;
       }
     }
-    if (!(oOriginalMessage instanceof Error)) {
+    if (oOriginalMessage) {
       Object.defineProperty(oTechnicalDetails, "originalMessage", {
         enumerable: true,
         get: function () {
@@ -6709,9 +6726,11 @@ _Helper = {
         message: oMessage.message,
         numericSeverity: iNumericSeverity,
         technical: bTechnical || oMessage.technical,
-        "@$ui5.error": oError,
-        "@$ui5.originalMessage": oMessage
+        "@$ui5.error": oError
       };
+      if (!(oMessage instanceof Error)) {
+        oRawMessage["@$ui5.originalMessage"] = oMessage["@$ui5.originalMessage"] ?? oMessage;
+      }
       Object.keys(oMessage).forEach(function (sProperty) {
         if (sProperty[0] === "@") {
           if (sProperty.endsWith(".numericSeverity")) {
@@ -7016,6 +7035,28 @@ _Helper = {
     }
     return mURLParameters;
   },
+  getUsedPaths: function (aPaths, mQueryOptions) {
+    function isRelated(sPath0, sPath1) {
+      return _Helper.hasPathPrefix(sPath0, sPath1) || _Helper.hasPathPrefix(sPath1, sPath0);
+    }
+    function isUsed(sPath, mQueryOptionsForPath) {
+      let bPathMatchedExpand = false;
+      const aSelect = mQueryOptionsForPath.$select || ["*"];
+      const mExpand = mQueryOptionsForPath.$expand || ({});
+      return sPath === "*" || (sPath in mExpand) || aSelect.includes(sPath) || aSelect.some(sSelect => isRelated(sPath, sSelect)) || Object.keys(mExpand).some(sExpand => {
+        if (_Helper.hasPathPrefix(sPath, sExpand)) {
+          bPathMatchedExpand = true;
+          return isUsed(sPath.slice(sExpand.length + 1), mExpand[sExpand]);
+        }
+        if (_Helper.hasPathPrefix(sExpand, sPath)) {
+          bPathMatchedExpand = true;
+          return true;
+        }
+        return false;
+      }) || !bPathMatchedExpand && aSelect.includes("*");
+    }
+    return aPaths.filter(sPath => isUsed(sPath, mQueryOptions));
+  },
   hasPathPrefix: function (sPath, sBasePath) {
     return _Helper.getRelativePath(sPath, sBasePath) !== undefined;
   },
@@ -7134,6 +7175,9 @@ _Helper = {
     }
     return mResult;
   },
+  isAffectedBy: function (sPropertyPath, sSideEffectsPath) {
+    return _Helper.hasPathPrefix(sPropertyPath, sSideEffectsPath.endsWith("/*") ? sSideEffectsPath.slice(0, -2) : sSideEffectsPath);
+  },
   isDataAggregation: function (mParameters) {
     return mParameters && mParameters.$$aggregation && !mParameters.$$aggregation.hierarchyQualifier;
   },
@@ -7190,13 +7234,7 @@ _Helper = {
     return oURL.origin === new URL(document.baseURI).origin ? oURL.toString().slice(oURL.origin.length) : oURL.toString();
   },
   makeAbsoluteLongtextUrl: function (oMessage, sBase) {
-    if (oMessage.longtextUrl) {
-      const sAbsoluteLongtextURL = _Helper.makeAbsolute(oMessage.longtextUrl, sBase);
-      if (oMessage.longtextUrl !== sAbsoluteLongtextURL) {
-        oMessage["@$ui5.originalMessage"] ??= _Helper.clone(oMessage);
-        oMessage.longtextUrl = sAbsoluteLongtextURL;
-      }
-    }
+    oMessage.longtextUrl &&= _Helper.makeAbsolute(oMessage.longtextUrl, sBase);
   },
   makeRelativePath: function (sPath, sBase) {
     return new _URL(sPath).relativeTo(new _URL(sBase));
@@ -7212,6 +7250,9 @@ _Helper = {
       return oResult;
     }, vValue);
   },
+  matchEndsWithTransientPredicate: function (sPath) {
+    return rEndsWithTransientPredicate.exec(sPath);
+  },
   merge: fnMerge,
   mergeQueryOptions: function (mQueryOptions, sOrderby, aFilters) {
     var mResult;

package/dist/cache/cacheHolder.d.ts

@@ -1,8 +1,8 @@
 export default class CacheHolder {
     private static TEMP_TASK_DIR;
-    private static getTempDir;
-    static read(repoName: string, token: string): Promise<Map<string, string>>;
-    static write(repoName: string, token: string, files: Map<string, string>): Promise<void>;
+    static getTempDir(...paths: string[]): string;
+    static read(repoName: string, token: string): Promise<Map<string, Buffer>>;
+    static write(repoName: string, token: string, files: Map<string, Buffer>): Promise<void>;
     private static isValid;
     /**
      * Clears cached files by repo name and token

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

@@ -2,5 +2,5 @@ import { ITaskParameters } from "./model/types.js";
 /**
  * Creates an appVariant bundle from the provided resources.
  */
-declare const _default: ({ workspace, options, taskUtil }: ITaskParameters) => Promise<void>;
+declare const _default: ({ workspace, options, taskUtil }: ITaskParameters) => Promise<ReadonlyMap<string, string>>;
 export default _default;

package/dist/index.js

@@ -1,79 +1,54 @@
 import * as dotenv from "dotenv";
-import { logBuilderVersion } from "./util/commonUtil.js";
-import AppVariant from "./appVariantManager.js";
-import BaseApp from "./baseAppManager.js";
-import ResourceUtil from "./util/resourceUtil.js";
-import FilesUtil from "./util/filesUtil.js";
-import PreviewManager from "./previewManager.js";
+import { getReferences, logBuilderVersion } from "./util/commonUtil.js";
+import AppVariant from "./appVariant.js";
+import BaseApp from "./baseApp.js";
 import { initialize } from "./landscapeConfiguration.js";
+import WorkspaceManager from "./util/workspaceManager.js";
 /**
  * Creates an appVariant bundle from the provided resources.
  */
-export default ({ workspace, options, taskUtil }) => {
+export default async ({ workspace, options, taskUtil }) => {
+    const ui5BuilderTools = {
+        workspace,
+        projectNamespace: options.projectNamespace,
+        taskUtil,
+    };
     dotenv.config();
-    async function process(workspace, taskUtil) {
-        logBuilderVersion();
-        const { repository, adapter } = initialize(options.configuration);
-        const adaptationProject = await AppVariant.fromWorkspace(workspace, options.projectNamespace);
-        const previewManagerPromise = PreviewManager.createFromRoot(adaptationProject.reference, repository, options.configuration);
-        const appVariantIdHierarchy = await repository.getAppVariantIdHierarchy(adaptationProject.reference);
-        if (appVariantIdHierarchy.length === 0) {
-            throw new Error(`No app variant found for reference ${adaptationProject.reference}`);
-        }
-        // appVariantIdHierarchy contains original application on bottom and the
-        // 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));
-        fetchFilesPromises.push(Promise.resolve(adaptationProject.files));
-        const appVariants = new Array();
-        const adapt = async (baseAppFiles, appVariantFiles) => {
-            let baseApp = BaseApp.fromFiles(baseAppFiles);
-            let appVariant = AppVariant.fromFiles(appVariantFiles);
-            // If the app variant is the same as the adaptation project, we use the
-            // adaptation project because it contains resources that should be updated.
-            if (appVariant.id === adaptationProject.id) {
-                appVariant = adaptationProject;
-            }
-            appVariants.push(appVariant);
-            const adaptCommandChain = adapter.createAdaptCommandChain(baseApp, appVariant);
-            const mergeCommandChain = adapter.createMergeCommandChain(baseApp, appVariant);
-            const adaptedFiles = await adaptCommandChain.execute();
-            const mergedFiles = await mergeCommandChain.execute(adaptedFiles);
-            return mergedFiles;
-        };
-        let files = await fetchFilesPromises.reduce(async (previousFiles, currentFiles) => adapt(await previousFiles, await currentFiles), fetchFilesPromises.shift());
-        files = await adapter.createPostCommandChain().execute(files);
-        const references = getReferences(appVariants, adaptationProject.id);
-        files = FilesUtil.filter(files);
-        files = FilesUtil.rename(files, references);
-        adaptationProject.omitDeletedResources(files, options.projectNamespace, taskUtil);
-        // Read libs for preview
-        const previewManager = await previewManagerPromise;
-        const writePromises = new Array(previewManager.processPreviewResources(files));
-        files.forEach((content, filename) => {
-            const resource = ResourceUtil.createResource(filename, options.projectNamespace, content);
-            writePromises.push(workspace.write(resource));
-        });
-        await Promise.all(writePromises);
+    logBuilderVersion();
+    // We write original app files and appVariant files to workspace as they
+    // fetched, in this case these files will overwrite the adaptation project
+    // files, so we create a snapshot to later on overwrite the workspace files
+    // with adapatation project files again to make sure they are on top
+    const workspaceManager = new WorkspaceManager(workspace, options.projectNamespace);
+    await workspaceManager.createSnapshot();
+    const { repository, adapter } = await initialize(options.configuration);
+    const adaptationProject = await AppVariant.fromWorkspace(workspace, options.projectNamespace);
+    const setupCommandChain = adapter.createSetupCommandChain(adaptationProject.reference, repository);
+    await setupCommandChain.execute();
+    const appVariantIdHierarchy = await repository.getAppVariantIdHierarchy(adaptationProject.reference);
+    if (appVariantIdHierarchy.length === 0) {
+        throw new Error(`No app variant found for reference ${adaptationProject.reference}`);
     }
-    return process(workspace, taskUtil);
-    /**
-     * 4p. Reference map contains searchTerm as key and replacement as value. Base
-     * id and app variant ids are renamed to adaptation project id.
-     */
-    function getReferences(appVariants, adaptationProjectId) {
-        const references = new Map();
-        appVariants.forEach((variant, i) => {
-            if (i === 0) {
-                references.set(variant.reference, adaptationProjectId);
-            }
-            if (variant.id !== adaptationProjectId) {
-                references.set(variant.id, adaptationProjectId);
-            }
-            variant.getRenamingForMovedFiles().forEach((value, key) => references.set(key, value));
-        });
-        return references;
+    // appVariantIdHierarchy contains original application on bottom and the
+    // 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(variant => repository.fetch(variant));
+    const appVariants = new Array();
+    const adapt = async (baseFiles, appVariant) => {
+        appVariants.push(appVariant);
+        const baseApp = BaseApp.fromFiles(baseFiles);
+        return adapter.createAdaptCommandChain(baseApp, appVariant).execute();
+    };
+    let files = await workspaceManager.saveAndConvert(fetchFilesPromises.shift()); // original app files
+    for (const appVariantFilesPromise of fetchFilesPromises) {
+        const appVariantFiles = await workspaceManager.saveAndConvert(appVariantFilesPromise);
+        files = await adapt(files, AppVariant.fromFiles(appVariantFiles));
     }
+    // We need to overwrite base files with the adaptation project files
+    await workspaceManager.restoreSnapshot();
+    files = await adapt(files, adaptationProject);
+    const references = getReferences(appVariants, adaptationProject.id);
+    return adapter.createPostCommandChain(references, adaptationProject, ui5BuilderTools).execute(files);
 };
 //# sourceMappingURL=index.js.map

package/dist/landscapeConfiguration.d.ts

@@ -2,8 +2,8 @@ import { IConfiguration } from "./model/types.js";
 import { IAdapter } from "./adapters/adapter.js";
 import IRepository from "./repositories/repository.js";
 import IAnnotationManager from "./annotations/annotationManager.js";
-export declare function initialize(configuration: IConfiguration): {
+export declare function initialize(configuration: IConfiguration): Promise<{
     adapter: IAdapter;
     repository: IRepository;
     annotationManager: IAnnotationManager;
-};
+}>;

package/dist/landscapeConfiguration.js

@@ -1,39 +1,31 @@
-import AbapAdapter from "./adapters/abapAdapter.js";
-import CFAdapter from "./adapters/cfAdapter.js";
-import PreviewAdapter from "./adapters/previewAdapter.js";
-import AbapRepository from "./repositories/abapRepository.js";
-import HTML5Repository from "./repositories/html5Repository.js";
-import LocalRepository from "./repositories/localRepository.js";
-import AbapAnnotationManager from "./annotations/abapAnnotationManager.js";
-import CFAnnotationManager from "./annotations/cfAnnotationManager.js";
 import CFValidator from "./util/validator/cfValidator.js";
-import AbapValidator from "./util/validator/abapValidator.js";
 import { isOneOf } from "./util/validator/validator.js";
 import { LANDSCAPE_TYPES } from "./model/configuration.js";
 import { getLogger } from "@ui5/logger";
+import AbapValidator from "./util/validator/abapValidator.js";
 import LocalAnnotationManager from "./annotations/localAnnotationManager.js";
 const log = getLogger("@ui5/task-adaptation::LandscapeConfiguration");
-export function initialize(configuration) {
-    const type = getTypeByConfiguration(configuration);
+export async function initialize(configuration) {
+    const type = await getTypeByConfiguration(configuration);
     const enhancedConfig = { ...configuration, type };
-    const repository = getRepository(enhancedConfig);
-    const annotationManager = getAnnotationManager(enhancedConfig, repository);
+    const repository = await getRepository(enhancedConfig);
+    const annotationManager = await getAnnotationManager(enhancedConfig, repository);
     return {
-        adapter: getAdapter(enhancedConfig, annotationManager),
+        adapter: await getAdapter(enhancedConfig, annotationManager),
         repository,
         annotationManager
     };
 }
-function getTypeByConfiguration(configuration) {
-    const validators = [
-        new CFValidator(),
-        new AbapValidator(),
-    ];
+async function getTypeByConfiguration(configuration) {
     if (isOneOf(LANDSCAPE_TYPES, configuration.type)) {
         return configuration.type;
     }
     else {
         log.warn("Deprecated behavior: type is not specified or invalid. Should be either 'cf' or 'abap'. Trying to detect the type based on provided configuration");
+        const validators = [
+            new CFValidator(),
+            new AbapValidator(),
+        ];
         for (const validator of validators) {
             try {
                 validator.validateConfiguration(configuration);
@@ -46,49 +38,59 @@ function getTypeByConfiguration(configuration) {
         throw new Error("'type' should be specified in ui5.yaml configuration: 'cf' or 'abap'");
     }
 }
-function getAdapter(configuration, annotationManager) {
-    if (isPreview(configuration)) {
+async function getAdapter(configuration, annotationManager) {
+    if (isPreview()) {
+        const { default: PreviewAdapter } = await import("./adapters/previewAdapter.js");
         return new PreviewAdapter(configuration);
     }
     switch (configuration.type) {
-        case "abap":
+        case "abap": {
+            const { default: AbapAdapter } = await import("./adapters/abapAdapter.js");
             return new AbapAdapter(annotationManager);
-        case "cf":
+        }
+        case "cf": {
+            const { default: CFAdapter } = await import("./adapters/cfAdapter.js");
             return new CFAdapter(configuration);
+        }
         default:
             throw new Error(`No adapter found for the given configuration type '${configuration.type}'`);
     }
 }
-function getRepository(configuration) {
-    if (isLocal(configuration)) {
-        return new LocalRepository(configuration);
-    }
+async function getRepository(configuration) {
     switch (configuration.type) {
-        case "abap":
+        case "abap": {
+            const { default: AbapRepository } = await import("./repositories/abapRepository.js");
             return new AbapRepository(configuration);
-        case "cf":
+        }
+        case "cf": {
+            const { default: HTML5Repository } = await import("./repositories/html5Repository.js");
             return new HTML5Repository(configuration);
+        }
         default:
             throw new Error(`No repository found for the given configuration type '${configuration.type}'`);
     }
 }
-function getAnnotationManager(configuration, repository) {
-    if (isLocal(configuration)) {
+async function getAnnotationManager(configuration, repository) {
+    if (isLocal()) {
         return new LocalAnnotationManager();
     }
     switch (configuration.type) {
-        case "abap":
+        case "abap": {
+            const { default: AbapAnnotationManager } = await import("./annotations/abapAnnotationManager.js");
             return new AbapAnnotationManager(configuration, repository);
-        case "cf":
+        }
+        case "cf": {
+            const { default: CFAnnotationManager } = await import("./annotations/cfAnnotationManager.js");
             return new CFAnnotationManager();
+        }
         default:
             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,20 +9,17 @@ 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;
 }
+export declare const REUSE_DIR = ".adp/reuse";

package/dist/model/configuration.js

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

package/dist/model/types.d.ts

@@ -1,3 +1,4 @@
+import TaskUtil from "@ui5/project/build/helpers/TaskUtil";
 import { IConfiguration } from "./configuration.js";
 import Language from "./language.js";
 export interface IProjectOptions {
@@ -74,9 +75,14 @@ export interface IChangeContent {
     supportedLocales?: string[];
 }
 export interface ITaskParameters {
-    workspace: any;
+    workspace: IWorkspace;
     options: IProjectOptions;
-    taskUtil: any;
+    taskUtil: TaskUtil;
+}
+export interface UI5BuilderTools {
+    workspace: IWorkspace;
+    projectNamespace: string;
+    taskUtil: TaskUtil;
 }
 export interface IBaseAppInfo {
     filepath: string;
@@ -123,4 +129,5 @@ export type ServiceCredentials = {
     } | string>;
     "sap.cloud.service"?: string;
 };
+export type FetchFilesPromise = Map<string, Promise<ReadonlyMap<string, Buffer>>>;
 export { IConfiguration };

package/dist/repositories/abapProvider.js

@@ -1,11 +1,11 @@
 import { createAbapServiceProvider } from "@sap-ux/system-access";
 import { getLogger } from "@ui5/logger";
-import AbapValidator from "../util/validator/abapValidator.js";
+import AbapConnectionValidator from "../util/validator/abapConnectionValidator.js";
 const log = getLogger("@ui5/task-adaptation::AbapProvider");
 log.debug = (message) => log.verbose(message);
 export default class AbapProvider {
     provider = null;
-    abapValidator = new AbapValidator();
+    abapValidator = new AbapConnectionValidator();
     async get({ target, destination }) {
         if (!this.provider) {
             const abapTarget = this.abapValidator.validateAndGetAbapTarget(target, destination);

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, Buffer>>;
 }
+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, Buffer>>;
     getMetadata(): Promise<any>;
     private getHtml5RepoInfo;
     private getHTML5Credentials;