@ui5/task-adaptation 1.4.3 → 1.5.0

package/dist/bundle.js

@@ -99,7 +99,13 @@ var AddLibrary = {
 };
 
 var CondenserClassification = {
-  LastOneWins: "lastOneWins"};
+  LastOneWins: "lastOneWins",
+  Reverse: "reverse",
+  Move: "move",
+  Create: "create",
+  Destroy: "destroy",
+  Update: "update"
+};
 
 var SetTitle = {
   applyChange(oManifest) {
@@ -959,10 +965,14 @@ var mergerUtil = {
 };
 
 var Layer = {
+  USER: "USER",
+  PUBLIC: "PUBLIC",
   CUSTOMER: "CUSTOMER",
   CUSTOMER_BASE: "CUSTOMER_BASE",
   PARTNER: "PARTNER",
-  VENDOR: "VENDOR"};
+  VENDOR: "VENDOR",
+  BASE: "BASE"
+};
 
 function checkObjectProperties(oChangeObject, aObjects, aMandatoryProperties, aSupportedProperties, oSupportedPropertyPattern, oSupportedPropertyTypes) {
   aObjects.forEach(function (sObject) {
@@ -1183,6 +1193,8 @@ var addNewObjectPage = {
     mergerUtil.consistencyCheck(oChangeContent, "ADD", aSupportedProperties);
     var sParentEntitySet = oChangeContent.parentPage.entitySet;
     var sParentComponent = oChangeContent.parentPage.component;
+    var pages = oManifest["sap.ui.generic.app"]["pages"];
+    oManifest["sap.ui.generic.app"]["pages"] = mergerUtil.transformPagesToMapStructure(pages);
     var oPageStructure = mergerUtil.iterateAndFind(oManifest["sap.ui.generic.app"], sParentEntitySet, sParentComponent, sChildPageId);
     var oComponentContent = {
       "name": "sap.suite.ui.generic.template.ObjectPage"
@@ -1454,15 +1466,23 @@ var FlexCustomData = {
 
 function AnnotationChange () {}
 
-var ChangeHandlerStorage = {
-  getAnnotationChangeHandler: function () {},
-  getChangeHandler: function () {}
+function VariantChange () {}
+
+function VariantManagementChange () {}
+
+var VariantManagementState = {
+  getChangeInformationProvider: function () {}
 };
 
-var ChangeHandlerRegistration731747ee8b925499a260b98af83836c7 = {
+var ChangeHandlerRegistration = {
   waitForChangeHandlerRegistration: function () {}
 };
 
+var ChangeHandlerStorage = {
+  getAnnotationChangeHandler: function () {},
+  getChangeHandler: function () {}
+};
+
 var FlUtils = {
   getChangeFromChangesMap: function () {}
 };
@@ -1473,6 +1493,9 @@ function isDependencyStillValid(oChange, bHasChangeApplyFinishedCustomData) {
   }
   return true;
 }
+function isVariantRelated(mPropertyBag) {
+  return mPropertyBag.flexObject instanceof VariantChange || mPropertyBag.flexObject instanceof VariantManagementChange;
+}
 const Utils = {
   getControlIfTemplateAffected(oChange, oControl, mPropertyBag) {
     const oModifier = mPropertyBag.modifier;
@@ -1505,9 +1528,10 @@ const Utils = {
       return ChangeHandlerStorage.getAnnotationChangeHandler({
         changeType: sChangeType
       });
+    } else if (isVariantRelated(mPropertyBag)) {
+      return VariantManagementState.getChangeInformationProvider(mPropertyBag.flexObject);
     } else if (mPropertyBag.control) {
       const sLibraryName = await mPropertyBag.modifier.getLibraryName(mPropertyBag.control);
-      const ChangeHandlerRegistration = await ChangeHandlerRegistration731747ee8b925499a260b98af83836c7;
       await ChangeHandlerRegistration.waitForChangeHandlerRegistration(sLibraryName);
       const sLayer = mPropertyBag.layer || mPropertyBag.flexObject?.getLayer();
       return ChangeHandlerStorage.getChangeHandler(sChangeType, mPropertyBag.controlType, mPropertyBag.control, mPropertyBag.modifier, sLayer);
@@ -1560,16 +1584,7 @@ const Utils = {
   }
 };
 
-var FlexObjectFactory = function () {};
-
-var CHANGES_NAMESPACE = "$sap.ui.fl.changes";
-function getDescriptorChanges(oManifest) {
-  var aAppDescriptorChangesRaw = oManifest && oManifest.getEntry && oManifest.getEntry(CHANGES_NAMESPACE) && oManifest.getEntry(CHANGES_NAMESPACE).descriptor || [];
-  return aAppDescriptorChangesRaw.map(function (oChange) {
-    return FlexObjectFactory.createAppDescriptorChange(oChange);
-  });
-}
-var Applier = {
+const Applier = {
   async applyChanges(oUpdatedManifest, aAppDescriptorChanges, mStrategy) {
     const aChangeHandlers = [];
     for (const oAppDescriptorChange of aAppDescriptorChanges) {
@@ -1590,17 +1605,6 @@ var Applier = {
       }
     });
     return oUpdatedManifest;
-  },
-  applyChangesIncludedInManifest(oManifest, mStrategy) {
-    var aDescriptorChanges = getDescriptorChanges(oManifest);
-    var oManifestJSON = oManifest.getJson();
-    delete oManifestJSON[CHANGES_NAMESPACE];
-    if (aDescriptorChanges.length > 0) {
-      return this.applyChanges(oManifestJSON, aDescriptorChanges, mStrategy).then(function () {
-        return;
-      });
-    }
-    return Promise.resolve();
   }
 };
 
@@ -3978,10 +3982,10 @@ const PROPERTIES_PATTERNS = {
   customType: "^false$"
 };
 const SUPPORTED_TYPES = {
-  uri: "string",
-  type: "string",
+  uri: typeof "string",
+  type: typeof "string",
   settings: typeof ({}),
-  dataSourceCustom: "boolean",
+  dataSourceCustom: typeof false,
   annotations: typeof []
 };
 function isDataSourceIdExistingInManifest(oManifestDataSources, sDataSourceId) {
@@ -5592,7 +5596,7 @@ function getDesigntimePropertyAsArray(sValue) {
   const m = (/\$([-a-z0-9A-Z._]+)(?::([^$]*))?\$/).exec(sValue);
   return m && m[2] ? m[2].split(/,/) : null;
 }
-const A_RTL_LOCALES = getDesigntimePropertyAsArray("$cldr-rtl-locales:ar,fa,he$") || [];
+const A_RTL_LOCALES = ["ar", "ar_EG", "ar_SA", "fa", "he"];
 const _coreI18nLocales = getDesigntimePropertyAsArray("$core-i18n-locales:,ar,bg,ca,cnr,cs,cy,da,de,el,en,en_GB,es,es_MX,et,fi,fr,fr_CA,hi,hr,hu,id,it,iw,ja,kk,ko,lt,lv,mk,ms,nl,no,pl,pt,pt_PT,ro,ru,sh,sk,sl,sr,sv,th,tr,uk,vi,zh_CN,zh_TW$");
 function fromSAPLogonLanguage(sSAPLogonLanguage) {
   let oLanguageTag;
@@ -5931,7 +5935,9 @@ var Type = {
   Reference: "Reference",
   Literal: "Literal",
   Variable: "Variable",
-  Call: "Call"};
+  Call: "Call",
+  Custom: "Custom"
+};
 var Op = {
   Equal: "==",
   NotEqual: "!=",
@@ -6453,6 +6459,7 @@ _Helper = {
         }
         return sContentID === oRequest.$ContentID;
       }
+      oClone.decomposed = true;
       oClone.error = _Helper.clone(oError.error);
       oClone.requestUrl = sServiceUrl + oRequest.url;
       oClone.resourcePath = oRequest.$resourcePath;
@@ -6596,13 +6603,22 @@ _Helper = {
       });
     });
   },
-  fireChange: function (mChangeListeners, sPropertyPath, vValue, bForceUpdate) {
-    var aListeners = mChangeListeners[sPropertyPath], i;
-    if (aListeners) {
-      for (i = 0; i < aListeners.length; i += 1) {
-        aListeners[i].onChange(vValue, bForceUpdate);
+  fireChange: function (mChangeListeners, sPropertyPath, vValue, bForceUpdate, bInArray) {
+    function inform(aChangeListeners, vValue0) {
+      for (let i = 0; i < aChangeListeners.length; i += 1) {
+        aChangeListeners[i].onChange(vValue0, bForceUpdate);
       }
     }
+    if (!mChangeListeners) {
+      return;
+    }
+    if ((sPropertyPath in mChangeListeners)) {
+      inform(mChangeListeners[sPropertyPath], vValue);
+    }
+    if (bInArray) {
+      sPropertyPath += "/";
+      Object.keys(mChangeListeners).filter(sPath => sPath.startsWith(sPropertyPath)).forEach(sPathInArray => inform(mChangeListeners[sPathInArray]));
+    }
   },
   fireChanges: function (mChangeListeners, sPath, oValue, bRemoved) {
     Object.keys(oValue).forEach(function (sProperty) {
@@ -7228,7 +7244,7 @@ _Helper = {
         _Helper.setPrivateAnnotation(oTarget, "predicate", _Helper.getPrivateAnnotation(oSource, "predicate"));
       } else if (Array.isArray(vSourceProperty)) {
         oTarget[sProperty] = vSourceProperty;
-        _Helper.fireChange(mChangeListeners, sPropertyPath, vSourceProperty);
+        _Helper.fireChange(mChangeListeners, sPropertyPath, vSourceProperty, false, true);
       } else if (vSourceProperty && typeof vSourceProperty === "object") {
         vTargetProperty = oTarget[sProperty] = _Helper.updateAll(mChangeListeners, sPropertyPath, vTargetProperty || ({}), vSourceProperty);
         _Helper.fireChange(mChangeListeners, sPropertyPath, vTargetProperty);
@@ -7252,7 +7268,7 @@ _Helper = {
       if ((sProperty in oNewObject) || sProperty[0] === "#") {
         if (Array.isArray(vNewProperty)) {
           oOldObject[sProperty] = vNewProperty;
-          _Helper.fireChange(mChangeListeners, sPropertyPath, vNewProperty);
+          _Helper.fireChange(mChangeListeners, sPropertyPath, vNewProperty, false, true);
         } else if (vNewProperty && typeof vNewProperty === "object") {
           if (vOldProperty) {
             _Helper.updateExisting(mChangeListeners, sPropertyPath, vOldProperty, vNewProperty);
@@ -7373,9 +7389,9 @@ _Helper = {
             _Helper.setPrivateAnnotation(oTarget, "predicate", sSourcePredicate);
           }
         } else if (Array.isArray(vSourceProperty)) {
-          if (!(vTargetProperty && vTargetProperty.$postBodyCollection)) {
+          if (!vTargetProperty?.$postBodyCollection) {
             oTarget[sProperty] = vSourceProperty;
-            _Helper.fireChange(mChangeListeners, sPropertyPath, vSourceProperty);
+            _Helper.fireChange(mChangeListeners, sPropertyPath, vSourceProperty, false, true);
           }
         } else if (vSourceProperty && typeof vSourceProperty === "object" && !sProperty.includes("@")) {
           oTarget[sProperty] = update(sPropertyPath, vSelected, vTargetProperty || ({}), vSourceProperty);

package/dist/cache/cacheHolder.d.ts

@@ -0,0 +1,18 @@
+export default class CacheHolder {
+    private static TEMP_TASK_DIR;
+    private static getTempDir;
+    static read(repoName: string, token: string): Map<string, string> | undefined;
+    static write(repoName: string, token: string, files: Map<string, string>): Promise<void>;
+    private static isValid;
+    /**
+     * Clears cached files by repo name and token
+     */
+    static delete(...paths: string[]): void;
+    /**
+     * Clears all cached files
+     */
+    static clear(): void;
+    private static deleteDir;
+    static clearOutdatedExcept(repoName?: string, maxAgeMs?: number): Promise<void>;
+}
+export declare function cached(): (_target: any, _propertyKey: string, descriptor: PropertyDescriptor) => void;

package/dist/cache/cacheHolder.js

@@ -0,0 +1,80 @@
+import * as fs from "fs";
+import * as fsPromises from "fs/promises";
+import * as path from "path";
+import ResourceUtil from "../util/resourceUtil.js";
+import encodeFilename from "filenamify";
+import { getLogger } from "@ui5/logger";
+import tempDir from "temp-dir";
+const log = getLogger("@ui5/task-adaptation::CacheHolder");
+export default class CacheHolder {
+    static TEMP_TASK_DIR = "ui5-task-adaptation";
+    static getTempDir(...paths) {
+        return path.join(tempDir, this.TEMP_TASK_DIR, ...paths.map(part => encodeFilename(part, { replacement: "_" })));
+    }
+    static read(repoName, token) {
+        const directory = this.getTempDir(repoName, token);
+        if (this.isValid(repoName, "repoName") && this.isValid(token, "token") && fs.existsSync(directory)) {
+            return ResourceUtil.read(directory);
+        }
+    }
+    static async write(repoName, token, files) {
+        this.delete(repoName);
+        if (this.isValid(repoName, "repoName") && this.isValid(token, "token")) {
+            await ResourceUtil.write(this.getTempDir(repoName, token), files);
+        }
+    }
+    static isValid(value, name) {
+        if (value == null || value === "") {
+            log.warn(`No '${name}' provided, skipping cache write`);
+            return false;
+        }
+        return true;
+    }
+    /**
+     * Clears cached files by repo name and token
+     */
+    static delete(...paths) {
+        this.deleteDir(this.getTempDir(...paths));
+    }
+    /**
+     * Clears all cached files
+     */
+    static clear() {
+        this.deleteDir(path.join(tempDir, this.TEMP_TASK_DIR));
+    }
+    static deleteDir(directory) {
+        if (fs.existsSync(directory)) {
+            fs.rmSync(directory, { recursive: true, force: true });
+        }
+    }
+    static async clearOutdatedExcept(repoName, maxAgeMs = 1000 * 60 * 60 * 24 * 30) {
+        const MAX_AGE = Date.now() - maxAgeMs; // 30 days by default
+        const directory = this.getTempDir();
+        if (!fs.existsSync(directory)) {
+            return;
+        }
+        const entries = await fsPromises.readdir(directory);
+        for (let entry of entries) {
+            const repoCacheDirectory = path.join(directory, entry);
+            const stats = await fsPromises.lstat(repoCacheDirectory);
+            if (stats.isDirectory() && stats.ctimeMs < MAX_AGE && (!repoName || entry !== encodeFilename(repoName))) {
+                await fsPromises.rm(repoCacheDirectory, { recursive: true, force: true });
+            }
+        }
+    }
+}
+export function cached() {
+    return function (_target, _propertyKey, descriptor) {
+        const originalValue = descriptor.value;
+        descriptor.value = async function (...args) {
+            let files = CacheHolder.read(args[0], args[1]);
+            CacheHolder.clearOutdatedExcept(args[0]);
+            if (files == null) {
+                files = await originalValue.apply(this, args);
+                await CacheHolder.write(args[0], args[1], files);
+            }
+            return files;
+        };
+    };
+}
+//# sourceMappingURL=cacheHolder.js.map

package/dist/i18nManager.js

@@ -2,6 +2,7 @@ import Comparator from "./annotations/comparator/comparator.js";
 import AnnotationDiffStructureError from "./model/annotationDiffStructureError.js";
 import { getUniqueName } from "./util/commonUtil.js";
 import { join } from "path/posix"; // Ensure standardized dir separators to ensure Windows compatibility
+import { slugify } from "transliteration";
 // To generate keys, english language is more common, so compare all other
 // languages with it
 export class PropertyValue {
@@ -69,15 +70,17 @@ export class I18nFileContent {
         const files = new Map();
         if (this.hasTranslations()) {
             this.properties.forEach((i18nLines, language) => {
-                let filename = "i18n";
-                if (language.i18n) {
-                    filename += "_" + language.i18n;
+                if (language.isDefault) {
+                    createI18nFile("i18n", i18nLines);
                 }
-                const filepath = join(i18nPathName, filename + ".properties");
-                files.set(filepath, [...i18nLines].map(([key, value]) => `${key}=${value}`).join("\n"));
+                createI18nFile("i18n_" + language.i18n, i18nLines);
             });
         }
         return files;
+        function createI18nFile(filename, i18nLines) {
+            const filepath = join(i18nPathName, filename + ".properties");
+            files.set(filepath, [...i18nLines].map(([key, value]) => `${key}=${value}`).toSorted().join("\n"));
+        }
     }
 }
 export default class I18nManager {
@@ -128,7 +131,7 @@ export default class I18nManager {
         properties file again. And then compare with the next language and so on
         and so on */
         let defaultAnnotation = I18nManager.extractDefaultLanguageAnnotation(annotationJsons);
-        if (annotationJsons.size > 0 && defaultAnnotation) {
+        if (defaultAnnotation && annotationJsons.size > 0) {
             defaultAnnotation = await this.populate([...annotationJsons], defaultAnnotation);
         }
         return defaultAnnotation;
@@ -152,7 +155,6 @@ export default class I18nManager {
         return p;
     }
     static extractDefaultLanguageAnnotation(annotationJsons) {
-        let json = null;
         for (const [language, json] of annotationJsons) {
             if (language.isDefault) {
                 annotationJsons.delete(language);
@@ -160,7 +162,7 @@ export default class I18nManager {
             }
         }
         const language = [...annotationJsons.keys()][0];
-        json = annotationJsons.get(language);
+        let json = annotationJsons.get(language);
         annotationJsons.delete(language);
         return { json, language };
     }
@@ -188,7 +190,7 @@ export default class I18nManager {
         if (typeof value !== "string") {
             throw new Error("Failed to create unique key from: " + JSON.stringify(value));
         }
-        const propertyName = value.replace(/\W/gi, "_").toUpperCase();
+        const propertyName = slugify(value, { separator: "_", uppercase: true }).replace(/\W/gi, "_");
         const key = getUniqueName([...this.existingKeys.keys()], propertyName);
         this.existingKeys.add(key);
         return key;

package/dist/index.js

@@ -1,9 +1,11 @@
 import * as dotenv from "dotenv";
 import { logBetaUsage, logBuilderVersion } from "./util/commonUtil.js";
-import AppVariantManager from "./appVariantManager.js";
-import BaseAppManager from "./baseAppManager.js";
-import I18NMerger from "./util/i18nMerger.js";
+import AppVariant from "./appVariantManager.js";
+import BaseApp from "./baseAppManager.js";
+import I18nMerger from "./util/i18nMerger.js";
+import ResourceUtil from "./util/resourceUtil.js";
 import { determineProcessor } from "./processors/processor.js";
+import FilesUtil from "./util/filesUtil.js";
 /**
  * Creates an appVariant bundle from the provided resources.
  */
@@ -13,12 +15,35 @@ export default ({ workspace, options, taskUtil }) => {
         logBuilderVersion();
         logBetaUsage();
         const processor = determineProcessor(options.configuration);
-        const appVariantResources = await AppVariantManager.getAppVariantResourcesToProcess(workspace);
-        const appVariantInfo = await AppVariantManager.process(appVariantResources, options.projectNamespace, taskUtil);
-        const baseAppFiles = await processor.getBaseAppFiles(appVariantInfo.reference);
-        const { resources, manifestInfo } = await BaseAppManager.process(baseAppFiles, appVariantInfo, options, processor);
-        const mergedResources = await I18NMerger.mergeI18NFiles(resources, appVariantResources, options.projectNamespace, manifestInfo.i18nPath, appVariantInfo, taskUtil);
-        await Promise.all(mergedResources.map(resource => workspace.write(resource)));
+        const adaptationProject = await AppVariant.fromWorkspace(workspace, options.projectNamespace);
+        const appVariantIdHierarchy = await processor.getAppVariantIdHierarchy(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 }) => processor.fetch(repoName, cachebusterToken));
+        fetchFilesPromises.push(Promise.resolve(adaptationProject.files));
+        const adapt = async (baseAppFiles, appVariantFiles) => {
+            const baseApp = BaseApp.fromFiles(baseAppFiles);
+            const appVariant = AppVariant.fromFiles(appVariantFiles);
+            const adaptedFiles = await baseApp.adapt(appVariant, processor);
+            return I18nMerger.merge(adaptedFiles, baseApp.i18nPath, appVariant);
+        };
+        let files = await fetchFilesPromises.reduce(async (previousFiles, currentFiles) => {
+            return adapt(await previousFiles, await currentFiles);
+        }, fetchFilesPromises.shift());
+        if (files) {
+            const references = appVariantIdHierarchy.map(item => item.appVariantId);
+            files = FilesUtil.filter(files);
+            files = FilesUtil.rename(files, references, adaptationProject.id);
+            adaptationProject.omitDeletedResources(files, options.projectNamespace, taskUtil);
+            const writePromises = new Array();
+            files.forEach((content, filename) => {
+                const resource = ResourceUtil.createResource(filename, options.projectNamespace, content);
+                writePromises.push(workspace.write(resource));
+            });
+            await Promise.all(writePromises);
+        }
     }
     return process(workspace, taskUtil);
 };

package/dist/model/appVariantIdHierarchyItem.d.ts

@@ -0,0 +1,5 @@
+export default interface IAppVariantIdHierarchyItem {
+    appVariantId: string;
+    repoName: string;
+    cachebusterToken: string;
+}

package/dist/model/appVariantIdHierarchyItem.js

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

package/dist/model/language.d.ts

@@ -1,8 +1,8 @@
 export default class Language {
-    sap: string;
-    i18n: string;
+    readonly sap: string;
+    readonly i18n: string;
     isDefault: boolean;
-    constructor(sap: string, i18n: string);
+    constructor(sap: string, i18n: string, isDefault?: boolean);
     /**
      * Create a language array from languages in configuration and default language.
      * @param languages Typically an array of objects. Probably could be undefined.

package/dist/model/language.js

@@ -1,11 +1,12 @@
+const DEFAULT_LANGUAGE = "en";
 export default class Language {
     sap;
     i18n;
     isDefault;
-    constructor(sap, i18n) {
+    constructor(sap, i18n, isDefault = false) {
         this.sap = sap;
         this.i18n = i18n;
-        this.isDefault = sap === "";
+        this.isDefault = isDefault;
     }
     /**
      * Create a language array from languages in configuration and default language.
@@ -14,7 +15,6 @@ export default class Language {
      * followed by the passed config languages.
      */
     static create(languages) {
-        const defaultLanguage = new Language("", "");
         let configLanguages = [];
         if (languages !== undefined) {
             configLanguages = languages.map(item => {
@@ -30,7 +30,14 @@ export default class Language {
                 }
             });
         }
-        return [defaultLanguage, ...configLanguages];
+        let defaultLanguage = configLanguages.find(language => language.sap.toLowerCase() === DEFAULT_LANGUAGE) ?? configLanguages[0];
+        if (defaultLanguage) {
+            defaultLanguage.isDefault = true;
+        }
+        else {
+            return [new Language(DEFAULT_LANGUAGE.toUpperCase(), DEFAULT_LANGUAGE, true), ...configLanguages];
+        }
+        return configLanguages;
     }
     ;
 }

package/dist/model/types.d.ts

@@ -60,11 +60,13 @@ export interface IChange {
     texts?: IChangeText;
     layer?: string;
     content?: IChangeContent;
+    filename: string;
 }
 export interface IChangeText {
     i18n: string;
 }
 export interface IChangeContent {
+    dataSource?: any;
     bundleUrl?: string;
     fallbackLocale?: string;
     modelId?: string;

package/dist/processors/abapProcessor.d.ts

@@ -1,17 +1,17 @@
 import AbapRepoManager from "../repositories/abapRepoManager.js";
 import AnnotationManager from "../annotationManager.js";
-import BaseAppFilesCacheManager from "../cache/baseAppFilesCacheManager.js";
+import IAppVariantIdHierarchyItem from "../model/appVariantIdHierarchyItem.js";
 import { IConfiguration } from "../model/types.js";
 import IProcessor from "./processor.js";
 export default class AbapProcessor implements IProcessor {
     private abapRepoManager;
     private configuration;
-    private cacheManager;
     private annotationManager;
-    constructor(configuration: IConfiguration, cacheManager: BaseAppFilesCacheManager, abapRepoManager: AbapRepoManager, annotationManager: AnnotationManager);
-    getBaseAppFiles(baseAppId: string): Promise<Map<string, string>>;
+    constructor(configuration: IConfiguration, abapRepoManager: AbapRepoManager, annotationManager: AnnotationManager);
+    getAppVariantIdHierarchy(appId: string): Promise<IAppVariantIdHierarchyItem[]>;
+    fetch(repoName: string, _cachebusterToken: string): Promise<Map<string, string>>;
     validateConfiguration(): void;
-    updateLandscapeSpecificContent(renamedBaseAppManifest: any, baseAppFiles?: Map<string, string>): Promise<void>;
+    updateLandscapeSpecificContent(baseAppManifest: any, baseAppFiles: Map<string, string>, appVariantId: string): Promise<void>;
     getConfigurationType(): string;
     createAppVariantHierarchyItem(appVariantId: string, version: string): {
         appVariantId: string;

package/dist/processors/abapProcessor.js

@@ -1,26 +1,35 @@
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
 import Language from "../model/language.js";
+import { cached } from "../cache/cacheHolder.js";
 import { validateObject } from "../util/commonUtil.js";
 export default class AbapProcessor {
     abapRepoManager;
     configuration;
-    cacheManager;
     annotationManager;
-    constructor(configuration, cacheManager, abapRepoManager, annotationManager) {
+    constructor(configuration, abapRepoManager, annotationManager) {
         this.configuration = configuration;
         this.abapRepoManager = abapRepoManager;
-        this.cacheManager = cacheManager;
         this.annotationManager = annotationManager;
     }
-    getBaseAppFiles(baseAppId) {
-        return this.cacheManager.getFiles(() => this.abapRepoManager.getMetadata(baseAppId), () => this.abapRepoManager.downloadBaseAppFiles());
+    getAppVariantIdHierarchy(appId) {
+        return this.abapRepoManager.getAppVariantIdHierarchy(appId);
+    }
+    fetch(repoName, _cachebusterToken) {
+        return this.abapRepoManager.fetch(repoName);
     }
     validateConfiguration() {
         // validate general app config
         const properties = ["appName"];
         validateObject(this.configuration, properties, "should be specified in ui5.yaml configuration");
     }
-    async updateLandscapeSpecificContent(renamedBaseAppManifest, baseAppFiles) {
-        const files = await this.annotationManager.process(renamedBaseAppManifest, (Language.create(this.configuration.languages)));
+    async updateLandscapeSpecificContent(baseAppManifest, baseAppFiles, appVariantId) {
+        const languages = Language.create(this.configuration.languages);
+        const files = await this.annotationManager.process(baseAppManifest, languages, appVariantId);
         if (baseAppFiles) {
             files.forEach((value, key) => baseAppFiles.set(key, value));
         }
@@ -36,4 +45,7 @@ export default class AbapProcessor {
         };
     }
 }
+__decorate([
+    cached()
+], AbapProcessor.prototype, "fetch", null);
 //# sourceMappingURL=abapProcessor.js.map

package/dist/processors/cfProcessor.d.ts

@@ -1,11 +1,11 @@
-import BaseAppFilesCacheManager from "../cache/baseAppFilesCacheManager.js";
+import IAppInfo from "../model/appVariantIdHierarchyItem.js";
 import { IConfiguration } from "../model/types.js";
 import IProcessor from "./processor.js";
 export default class CFProcessor implements IProcessor {
     private configuration;
-    private cacheManager;
-    constructor(configuration: IConfiguration, cacheManager: BaseAppFilesCacheManager);
-    getBaseAppFiles(): Promise<Map<string, string>>;
+    constructor(configuration: IConfiguration);
+    getAppVariantIdHierarchy(appId: string): Promise<IAppInfo[]>;
+    fetch(_repoName: string, _cachebusterToken: string): Promise<Map<string, string>>;
     validateConfiguration(): void;
     updateLandscapeSpecificContent(renamedBaseAppManifest: any): Promise<void>;
     private updateCloudPlatform;