@ui5/task-adaptation 1.0.18 → 1.0.19

package/CHANGELOG.md

@@ -2,7 +2,10 @@
 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.0.18...HEAD).
+A list of unreleased changes can be found [here](https://github.com/SAP/ui5-task-adaptation/compare/v1.0.19...HEAD).
+
+<a name="v1.0.19"></a>
+## [v1.0.19] - 2023-11-16
 
 <a name="v1.0.18"></a>
 ## [v1.0.18] - 2023-11-10
@@ -52,6 +55,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.0.19]: https://github.com/SAP/ui5-task-adaptation/compare/v1.0.18...v1.0.19
 [v1.0.18]: https://github.com/SAP/ui5-task-adaptation/compare/v1.0.17...v1.0.18
 [v1.0.17]: https://github.com/SAP/ui5-task-adaptation/compare/v1.0.16...v1.0.17
 [v1.0.16]: https://github.com/SAP/ui5-task-adaptation/compare/v1.0.11...v1.0.16

package/dist/appVariantManager.d.ts

@@ -3,6 +3,8 @@ export default class AppVariantManager {
     static process(appVariantResources: any[], projectNamespace: string, taskUtil: any): Promise<IAppVariantInfo>;
     static getAppVariantResources(workspace: any): Promise<any[]>;
     static renameChanges(appVariantResources: any[], projectNamespace: string, appVariantInfo: IAppVariantInfo): Promise<void>;
+    private static isManifestChange;
+    private static isManifestAppVariant;
     static getAppVariantInfo(appVariantResources: any[]): Promise<IAppVariantInfo>;
     static writeI18nToModule(resource: any, projectNamespace: string, i18nBundleName: string): void;
     private static omitFiles;

package/dist/appVariantManager.js

@@ -4,10 +4,7 @@ const commonUtil_1 = require("./util/commonUtil");
 const resourceUtil_1 = require("./util/resourceUtil");
 const path_1 = require("path");
 const log = require("@ui5/logger").getLogger("@ui5/task-adaptation::AppVariantManager");
-const OMIT_FILES = ["manifest.appdescr_variant"];
-const OMIT_FOLDERS = [];
 const EXTENSIONS = "js,json,xml,html,properties,change,appdescr_variant";
-const MANIFEST_APP_VARIANT = "manifest.appdescr_variant";
 class AppVariantManager {
     static async process(appVariantResources, projectNamespace, taskUtil) {
         const appVariantInfo = await this.getAppVariantInfo(appVariantResources);
@@ -41,20 +38,26 @@ class AppVariantManager {
             resourceUtil_1.default.setString(resource, renamedContent);
         });
     }
-    static async getAppVariantInfo(appVariantResources) {
+    static isManifestChange(resource) {
         const changesManifestFolder = path_1.posix.join("changes", "manifest");
+        const dirname = path_1.posix.dirname(resource.getPath());
+        return dirname.endsWith(changesManifestFolder);
+    }
+    static isManifestAppVariant(resource) {
+        const MANIFEST_APP_VARIANT = "manifest.appdescr_variant";
+        const basename = path_1.posix.basename(resource.getPath());
+        return basename === MANIFEST_APP_VARIANT;
+    }
+    static async getAppVariantInfo(appVariantResources) {
         let manifest;
         const manifestChanges = [];
         for (const resource of appVariantResources) {
-            const resourcePath = resource.getPath();
-            const dirname = path_1.posix.dirname(resource.getPath());
-            const basename = path_1.posix.basename(resourcePath);
-            if (basename === MANIFEST_APP_VARIANT) {
+            if (this.isManifestAppVariant(resource)) {
                 manifest = await resourceUtil_1.default.getString(resource).then(JSON.parse);
             }
-            else if (dirname.endsWith(changesManifestFolder)) {
-                const str = await resourceUtil_1.default.getString(resource);
-                manifestChanges.push(JSON.parse(str));
+            else if (this.isManifestChange(resource)) {
+                const content = await resourceUtil_1.default.getString(resource);
+                manifestChanges.push(JSON.parse(content));
             }
         }
         if (manifest) {
@@ -74,10 +77,7 @@ class AppVariantManager {
         }
     }
     static omitFiles(resource, taskUtil) {
-        const dirname = path_1.posix.dirname(resource.getPath());
-        const filename = path_1.posix.basename(resource.getPath());
-        if (OMIT_FILES.includes(filename) ||
-            OMIT_FOLDERS.some(folder => dirname.endsWith(folder))) {
+        if (this.isManifestAppVariant(resource) || this.isManifestChange(resource)) {
             taskUtil.setTag(resource, taskUtil.STANDARD_TAGS.OmitFromBuildResult, true);
         }
     }

package/dist/util/commonUtil.js

@@ -18,29 +18,34 @@ function renameResources(files, search, replacement) {
     // The current regex works if the old Id is contained in the new Id, given
     // that they do not have the same beginning.
     // more complete alternative: /((?<!newIdStart)|(?!newIdEnd))oldId/g
+    let escapedSearch;
     if (replacement.includes(search)) {
         const [before, _] = replacement.split(search);
         // Matches a position in the string that is not immediately preceded by
         // the string "before".
-        search = `(?<!${escapeRegexSpecialChars(before)})${escapeRegexSpecialChars(search)}`;
+        escapedSearch = `(?<!${escapeRegexSpecialChars(before)})${escapeRegexSpecialChars(search)}`;
     }
     else {
-        search = escapeRegexSpecialChars(search);
+        escapedSearch = escapeRegexSpecialChars(search);
     }
     const dotToSlash = (update) => update.replaceAll(".", "\/");
-    const replaces = [
-        {
-            regexp: new RegExp(search, "g"),
-            replacement
-        },
-        {
-            regexp: new RegExp(dotToSlash(search), "g"),
-            replacement: dotToSlash(replacement)
+    const replace = (content) => content.replace(new RegExp(escapedSearch, "g"), replacement);
+    const replaceWithSlashesOnly = (content) => {
+        if (!search.includes(".")) {
+            return content;
         }
-    ];
+        let searchWithSlashes = dotToSlash(escapedSearch);
+        return content.replace(new RegExp(searchWithSlashes, "g"), dotToSlash(replacement));
+    };
     const renamed = new Map();
     files.forEach((content, filepath) => {
-        renamed.set(filepath, replaces.reduce((p, c) => p.replace(c.regexp, c.replacement), content));
+        // Finds the id with dots (test.id) or without dots (id) and replaces it
+        content = replace(content);
+        // Only if the id has dots, these dots will be replaced with slashes
+        // first, and then it will search for the id with slashes and replace
+        // with the appVariantId also with slashes
+        content = replaceWithSlashesOnly(content);
+        renamed.set(filepath, content);
     });
     return renamed;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ui5/task-adaptation",
-    "version": "1.0.18",
+    "version": "1.0.19",
     "description": "Custom task for ui5-builder which allows building UI5 Flexibility Adaptation Projects for SAP BTP, Cloud Foundry environment",
     "main": "index.js",
     "scripts": {