@ui5/task-adaptation 1.4.3 → 1.5.0

package/dist/util/renamingHandlers/manifestHandler.js

@@ -0,0 +1,20 @@
+export default class ManifestHandler {
+    appVariantIdHierarchy = [];
+    before(files) {
+        const manifest = files.get("manifest.json");
+        if (manifest) {
+            const manifestJson = JSON.parse(manifest);
+            this.appVariantIdHierarchy = manifestJson["sap.ui5"].appVariantIdHierarchy;
+        }
+    }
+    after(files) {
+        const manifest = files.get("manifest.json");
+        if (manifest) {
+            const manifestJson = JSON.parse(manifest);
+            manifestJson["sap.ui5"].appVariantIdHierarchy = this.appVariantIdHierarchy;
+            files.set("manifest.json", JSON.stringify(manifestJson));
+        }
+    }
+    ;
+}
+//# sourceMappingURL=manifestHandler.js.map

package/dist/util/renamingHandlers/renamingHandler.d.ts

@@ -0,0 +1,4 @@
+export interface IRenamingHandler {
+    before(files: ReadonlyMap<string, string>): void;
+    after(files: Map<string, string>): void;
+}

package/dist/util/renamingHandlers/renamingHandler.js

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

package/dist/util/resourceUtil.d.ts

@@ -3,9 +3,11 @@ export default class ResourceUtil {
     static relativeToRoot(resourcePath: string, projectNamespace?: string): string;
     static getResourcePath(projectNamespace?: string, ...paths: string[]): string;
     static write(dir: string, files: Map<string, string>): Promise<void[]>;
-    static read(rootFolder: string, folder: string, files: Map<string, string>, exclude?: string[]): void;
+    private static _read;
+    static read(folder: string): Map<string, string>;
     static getString(resource: any): Promise<string>;
     static getJson(resource: any): Promise<any>;
     static setString(resource: any, str: string): void;
     static createResource(filename: string, projectNamespace: string, content: string): any;
+    static toFileMap(resources: ReadonlyArray<Resource>, projectNamespace: string): Promise<Map<string, string>>;
 }

package/dist/util/resourceUtil.js

@@ -29,7 +29,7 @@ export default class ResourceUtil {
         });
         return Promise.all(promises);
     }
-    static read(rootFolder, folder, files, exclude = []) {
+    static _read(rootFolder, folder, files, exclude = []) {
         const entries = fs.readdirSync(folder);
         for (let entry of entries) {
             const entryPath = path.join(folder, entry);
@@ -39,10 +39,15 @@ export default class ResourceUtil {
                 files.set(normalized, fs.readFileSync(entryPath, { encoding: "utf-8" }));
             }
             else if (stats.isDirectory()) {
-                this.read(rootFolder, entryPath, files, exclude);
+                this._read(rootFolder, entryPath, files, exclude);
             }
         }
     }
+    static read(folder) {
+        const files = new Map();
+        this._read(folder, folder, files);
+        return files;
+    }
     static getString(resource) {
         return resource.getBuffer().then((buffer) => buffer.toString(UTF8));
     }
@@ -58,5 +63,13 @@ export default class ResourceUtil {
             string: content
         });
     }
+    static async toFileMap(resources, projectNamespace) {
+        const files = new Map();
+        const rootFolderLength = ResourceUtil.getRootFolder(projectNamespace).length;
+        for (const resource of resources) {
+            files.set(resource.getPath().substring(rootFolderLength + 1), await ResourceUtil.getString(resource));
+        }
+        return files;
+    }
 }
 //# sourceMappingURL=resourceUtil.js.map

package/eslint.config.js

@@ -11,7 +11,7 @@ export default tseslint.config(
             parserOptions: {
                 project: [
                     "./tsconfig.json",
-                    "./test/tsconfig.json",
+                    "./test/lib/tsconfig.json",
                     "./scripts/tsconfig.json"
                 ],
                 tsconfigRootDir: import.meta.dirname,
@@ -64,8 +64,5 @@ export default tseslint.config(
         rules: {
             "@typescript-eslint/no-unused-expressions": "off"
         },
-    },
-    {
-        ignores: ["test/resources/**"]
     }
-);
+);

package/package.json

@@ -1,12 +1,14 @@
 {
     "name": "@ui5/task-adaptation",
-    "version": "1.4.3",
+    "version": "1.5.0",
     "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": "eslint ./src ./test",
-        "dev": "UI5_LOG_LVL=error mocha --no-timeouts --no-warnings --import=tsx --loader=esmock 'test/**/*.spec.ts'",
+        "lint": "eslint ./src ./test/lib",
+        "dev": "UI5_LOG_LVL=error mocha --no-timeouts --no-warnings --import=tsx --loader=esmock 'test/lib/**/*.spec.ts'",
+        "perf": "UI5_LOG_LVL=error mocha --no-timeouts --no-warnings --import=tsx --loader=esmock 'test/lib/**/*.perf.ts'",
+        "integration": "UI5_LOG_LVL=error mocha --reporter-option maxDiffSize=0 --no-timeouts --no-warnings --import=tsx --loader=esmock 'test/lib/**/*.int.ts'",
         "coverage": "c8 npm run dev",
         "preversion": "npm test",
         "version": "git-chglog --next-tag v$npm_package_version -o CHANGELOG.md && git add CHANGELOG.md",
@@ -14,7 +16,8 @@
         "release-note": "git-chglog -c .chglog/release-config.yml v$npm_package_version",
         "rollup": "tsx scripts/rollup.ts",
         "build": "npm run rollup && tsc -p ./",
-        "download-metadata": "tsx scripts/metadataDownloadHelper.ts"
+        "download-metadata": "tsx scripts/metadataDownloadHelper.ts",
+        "integration-setup": "scripts/test-integration-prep.sh"
     },
     "repository": {
         "type": "git",
@@ -43,9 +46,10 @@
         "axios": "^1.8.3",
         "crc": "^4.3.2",
         "dotenv": "^16.0.3",
+        "filenamify": "^6.0.0",
         "jsdom": "^23.0.1",
-        "meriyah": "^6.0.3",
         "temp-dir": "^2.0.0",
+        "transliteration": "^2.3.5",
         "xml-js": "^1.6.11"
     },
     "devDependencies": {
@@ -60,19 +64,19 @@
         "@types/mocha": "^9.1.0",
         "@types/semver": "^7.3.8",
         "@types/sinon": "^10.0.16",
+        "@ui5/builder": "^4.0.3",
         "@ui5/project": "^4.0.3",
         "amdextract": "^3.0.0",
         "builtin-modules": "^3.2.0",
         "c8": "^10.1.3",
         "chai": "^4.3.4",
         "chai-as-promised": "^7.1.1",
-        "chalk": "^4.1.2",
         "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",
+        "meriyah": "^6.0.3",
         "minimatch": "^9.0.3",
         "mocha": "^11.1.0",
         "mock-require": "^3.0.3",
@@ -84,9 +88,6 @@
         "typescript": "^5.4.2",
         "typescript-eslint": "^8.26.1"
     },
-    "optionalDependencies": {
-        "@rollup/rollup-linux-x64-gnu": "4.39.0"
-    },
     "c8": {
         "src": "./src",
         "all": true,
@@ -110,7 +111,8 @@
             "*/**/*.d.ts",
             "src/annotations/comparator/diffCase.ts",
             "src/annotations/transformers/transformer.ts",
-            "src/model/configuration.ts"
+            "src/model/configuration.ts",
+            "src/model/appVariantIdHierarchyItem.ts"
         ],
         "check-coverage": true,
         "statements": 85,
@@ -119,5 +121,9 @@
         "lines": 85
     },
     "types": "dist/index.d.ts",
-    "type": "module"
+    "type": "module",
+    "optionalDependencies": {
+        "@rollup/rollup-linux-x64-gnu": "^4.28.1",
+        "@rollup/rollup-linux-x64-musl": "^4.28.1"
+    }
 }

package/scripts/test-integration-prep.sh

@@ -0,0 +1,4 @@
+for d in test/fixtures/*/ ; do
+    echo "$d"
+    npm --prefix $d i
+done

package/types/ui5.d.ts

@@ -18,6 +18,11 @@ declare class Resource {
     setString(string: string): void;
 }
 
+declare interface IWorkspace {
+    write(resource: Resource): Promise<void>;
+    byGlob(pattern: string): Promise<Resource[]>;
+}
+
 declare module "@ui5/fs/Resource" {
     export function getPath(): string;
     export function clone(): Resource;
@@ -39,6 +44,11 @@ declare module "@ui5/project/build/helpers/BuildContext" {
 
 declare module "@ui5/project/build/helpers/TaskUtil" {
     export default class TaskUtil {
+        STANDARD_TAGS: any;
+        setTag(resource: Resource, OmitFromBuildResult: any, omit: boolean);
         constructor(options: any);
     }
 }
+
+declare module "@ui5/builder/internal/taskRepository" {
+}

package/dist/cache/annotationsCacheManager.d.ts

@@ -1,8 +0,0 @@
-import CacheManager from "./cacheManager.js";
-import { IConfiguration } from "../model/types.js";
-export default class AnnotationsCacheManager extends CacheManager {
-    private tempSubFolder;
-    constructor(configuration: IConfiguration, tempSubFolder: string);
-    protected getTempId(): string;
-    getMetadataFilename(): string;
-}

package/dist/cache/annotationsCacheManager.js

@@ -1,16 +0,0 @@
-import CacheManager from "./cacheManager.js";
-export default class AnnotationsCacheManager extends CacheManager {
-    tempSubFolder;
-    constructor(configuration, tempSubFolder) {
-        super(configuration);
-        this.tempSubFolder = tempSubFolder;
-    }
-    getTempId() {
-        const { destination, appName } = this.configuration;
-        return super.normalizeId(`ui5-${destination}-${appName}-${this.tempSubFolder}`);
-    }
-    getMetadataFilename() {
-        return "annotationsmetadata.json";
-    }
-}
-//# sourceMappingURL=annotationsCacheManager.js.map

package/dist/cache/baseAppFilesCacheManager.d.ts

@@ -1,6 +0,0 @@
-import CacheManager from "./cacheManager.js";
-export default class BaseAppFilesCacheManager extends CacheManager {
-    static METADATA_FILENAME: string;
-    protected getTempId(): string;
-    getMetadataFilename(): string;
-}

package/dist/cache/baseAppFilesCacheManager.js

@@ -1,12 +0,0 @@
-import CacheManager from "./cacheManager.js";
-export default class BaseAppFilesCacheManager extends CacheManager {
-    static METADATA_FILENAME = "html5metadata.json";
-    getTempId() {
-        const { appHostId, appName, appVersion } = this.configuration;
-        return super.normalizeId(`ui5-${appHostId}-${appName}-${appVersion}`);
-    }
-    getMetadataFilename() {
-        return BaseAppFilesCacheManager.METADATA_FILENAME;
-    }
-}
-//# sourceMappingURL=baseAppFilesCacheManager.js.map

package/dist/cache/cacheManager.d.ts

@@ -1,16 +0,0 @@
-import { IConfiguration, IMetadata } from "../model/types.js";
-export default abstract class CacheManager {
-    protected configuration: IConfiguration;
-    constructor(configuration: IConfiguration);
-    protected abstract getMetadataFilename(): string;
-    protected abstract getTempId(): string;
-    protected getTempFolder(): string;
-    getFiles(fetchMetadata: () => Promise<IMetadata>, fetchFiles: () => Promise<Map<string, string>>): Promise<Map<string, string>>;
-    isMetadataSame(tempMetadata: IMetadata, metadata: IMetadata): boolean;
-    readTempMetadata(): any;
-    writeTemp(files: Map<string, string>, metadata: any): Promise<void[]>;
-    readTemp(): Promise<Map<string, string>>;
-    deleteTemp(): void;
-    protected normalizeId(id: string): string;
-    private getFilesToCache;
-}

package/dist/cache/cacheManager.js

@@ -1,65 +0,0 @@
-import * as fs from "fs";
-import * as path from "path";
-import ResourceUtil from "../util/resourceUtil.js";
-import tempFolder from "temp-dir";
-export default class CacheManager {
-    configuration;
-    constructor(configuration) {
-        this.configuration = configuration;
-    }
-    getTempFolder() {
-        return path.join(tempFolder, this.getTempId());
-    }
-    async getFiles(fetchMetadata, fetchFiles) {
-        const tempMetadata = this.readTempMetadata();
-        const metadata = await fetchMetadata();
-        if (this.isMetadataSame(tempMetadata, metadata)) {
-            return this.readTemp();
-        }
-        else {
-            const files = await fetchFiles();
-            if (files?.size > 0) {
-                await this.writeTemp(files, metadata);
-            }
-            return files;
-        }
-    }
-    isMetadataSame(tempMetadata, metadata) {
-        // TODO: Implement correct metadata comparision.
-        return tempMetadata && metadata && tempMetadata.changedOn === metadata.changedOn;
-    }
-    readTempMetadata() {
-        const tempFolder = this.getTempFolder();
-        const filename = this.getMetadataFilename();
-        const metadataPath = path.resolve(tempFolder, filename);
-        if (fs.existsSync(metadataPath)) {
-            return JSON.parse(fs.readFileSync(metadataPath, { encoding: "utf-8" }));
-        }
-    }
-    writeTemp(files, metadata) {
-        this.deleteTemp();
-        const filesToCache = this.getFilesToCache(files, metadata);
-        return ResourceUtil.write(this.getTempFolder(), filesToCache);
-    }
-    async readTemp() {
-        const files = new Map();
-        const tempFolder = this.getTempFolder();
-        if (fs.existsSync(tempFolder)) {
-            ResourceUtil.read(tempFolder, tempFolder, files, [this.getMetadataFilename()]);
-        }
-        return files;
-    }
-    deleteTemp() {
-        fs.rmSync(this.getTempFolder(), { recursive: true, force: true });
-    }
-    normalizeId(id) {
-        return id.replace(/\/\\/g, "_");
-    }
-    getFilesToCache(files, metadata) {
-        const filename = this.getMetadataFilename();
-        const filesClone = new Map([...files]);
-        filesClone.set(filename, JSON.stringify(metadata));
-        return filesClone;
-    }
-}
-//# sourceMappingURL=cacheManager.js.map