@sap-ux/fiori-migration-writer 0.0.3 → 0.0.4

package/dist/utils/Project.js

@@ -330,9 +330,14 @@ export class ProjectAccess {
         const pomRoots = await findAllWebIDEProjectFolders(workspaceRoots);
         // find projects by manifest.json in the root
         let manifestRoots = await findProjectsByManifest(workspaceRoots);
-        const roots = [...packageRoots, ...pomRoots];
-        // filter projects with manifest.json at root, when the project is nested in another migratble project
-        manifestRoots = manifestRoots.filter((manifestRoot) => !roots.some((root) => manifestRoot.startsWith(root + sep)));
+        // A root can be discovered by more than one strategy (e.g. a project with both package.json
+        // and pom.xml), so deduplicate before building folders — otherwise getReuseLibs scans the
+        // same folder twice and returns duplicate library entries.
+        const roots = [...new Set([...packageRoots, ...pomRoots])];
+        // filter projects with manifest.json at root, when the project is nested in another migratble project.
+        // Reject exact matches too: a package/pom root that also has a root-level manifest.json would
+        // otherwise be re-appended here, defeating the dedup above and getting scanned twice again.
+        manifestRoots = manifestRoots.filter((manifestRoot) => !roots.some((root) => manifestRoot === root || manifestRoot.startsWith(root + sep)));
         roots.push(...manifestRoots);
         const rootFolders = roots.map((root, index) => {
             return {
@@ -343,27 +348,57 @@ export class ProjectAccess {
         });
         // find reuse libs
         let reuseLibsRoots = (await getReuseLibs(rootFolders)).filter((lib) => lib.value.type === ReuseLibType.LIBRARY);
+        // Roots that are themselves reuse libraries must be emitted only as libraries, never also as
+        // plain projects. getReuseLibs assigns a nested library to its nearest package/pom root, so a
+        // freestyle app that merely embeds a library shares that libRoot — suppressing by libRoot alone
+        // would wrongly drop the app. A root is library-only when it is itself a discovered library root
+        // AND getProjectInfo does not classify it as an application (no FE version, not an SAP app).
+        // getProjectInfo's own type is not sufficient on its own: a library whose manifest.json lives in
+        // a non-standard nested source path (e.g. src/.../lib/manifest.json) is not resolved as a library
+        // by the default webapp lookup, so the libRoot signal is needed to catch it.
+        const libraryOnlyRoots = new Set();
         if (reuseLibsRoots.length) {
-            // Process all roots in parallel
-            const results = await Promise.all(roots.map((root) => this.getProjectInfo(root)));
-            // Collect project roots
-            const temp = [];
-            results.forEach((result, index) => {
-                if (result.projectInfo.FEVersion || result.projectInfo.isSAPApp) {
-                    temp.push(roots[index]);
+            const reuseLibRootPaths = new Set(reuseLibsRoots.map((lib) => lib.value.libRoot));
+            const appRoots = [];
+            // Fetch all project info in parallel for performance
+            const projectInfoResults = await Promise.all(roots.map((root) => this.getProjectInfo(root)));
+            for (let i = 0; i < roots.length; i++) {
+                const root = roots[i];
+                const result = projectInfoResults[i];
+                const isApp = !!(result.projectInfo.FEVersion || result.projectInfo.isSAPApp);
+                if (isApp) {
+                    appRoots.push(root);
                 }
-            });
-            // Remove reuse libs that are within project roots
-            reuseLibsRoots = reuseLibsRoots.filter((lib) => !temp.some((tempRoot) => isSamePath(lib.value.libRoot, tempRoot)));
+                else if ([...reuseLibRootPaths].some((libRoot) => isSamePath(libRoot, root)) ||
+                    result.projectInfo.type === MigrationTypes.library) {
+                    libraryOnlyRoots.add(root);
+                }
+            }
+            // After classifying all roots, filter out reuse libs detected in application projects
+            reuseLibsRoots = reuseLibsRoots.filter((lib) => !appRoots.some((appRoot) => isSamePath(lib.value.libRoot, appRoot)));
         }
         // if workspace has multiple roots then make sure there are no similar projects
-        const projectsUnique = [...new Set(roots)].map((root) => {
+        const projectsUnique = [...new Set(roots)]
+            .filter((root) => !libraryOnlyRoots.has(root))
+            .map((root) => {
             return {
                 root: root,
                 type: MigrationTypes.project
             };
         });
-        const reuseLibsUnique = reuseLibsRoots.map((lib) => {
+        // A single library root can contain several nested manifest.json files (the library manifest
+        // plus per-component manifests), each of which getReuseLibs resolves back to the same libRoot.
+        // Emit one entry per library root so the webview does not list the same library multiple times.
+        const seenLibPaths = [];
+        const reuseLibsUnique = reuseLibsRoots
+            .filter((lib) => {
+            if (seenLibPaths.some((path) => isSamePath(path, lib.value.path))) {
+                return false;
+            }
+            seenLibPaths.push(lib.value.path);
+            return true;
+        })
+            .map((lib) => {
             return {
                 root: lib.value.libRoot,
                 type: MigrationTypes.library,

package/package.json

@@ -10,7 +10,7 @@
   "bugs": {
     "url": "https://github.com/SAP/open-ux-tools/issues?q=is%3Aopen+is%3Aissue+label%3Abug+label%3Afiori-migration-writer"
   },
-  "version": "0.0.3",
+  "version": "0.0.4",
   "license": "Apache-2.0",
   "main": "dist/index.js",
   "files": [
@@ -37,17 +37,17 @@
     "uuid": "11.1.1",
     "vscode-uri": "3.1.0",
     "yaml": "2.9.0",
+    "@sap-ux/adp-tooling": "1.0.65",
     "@sap-ux/axios-extension": "2.1.2",
     "@sap-ux/btp-utils": "2.0.7",
     "@sap-ux/i18n": "1.0.6",
+    "@sap-ux/launch-config": "1.0.25",
     "@sap-ux/nodejs-utils": "1.0.11",
-    "@sap-ux/adp-tooling": "1.0.65",
     "@sap-ux/project-access": "2.3.1",
     "@sap-ux/store": "2.0.7",
     "@sap-ux/ui5-application-writer": "2.1.6",
     "@sap-ux/ui5-config": "1.0.10",
-    "@sap-ux/ui5-info": "1.0.7",
-    "@sap-ux/launch-config": "1.0.25"
+    "@sap-ux/ui5-info": "1.0.7"
   },
   "devDependencies": {
     "@jest/globals": "30.4.1",