fix(node): Strip a trailing "/" before creating globs

Otherwise paths will not be matched correctly. This fixes a regression from f99e2ed which did contain the `removeSuffix("/")` call, at least for PNPM. Signed-off-by: Sebastian Schuberth <[email protected]>
oss-review-toolkit · Jan 9, 2024 · bd836a3 · bd836a3
1 parent e1c0651
commit bd836a3
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/...e-managers/node/src/funTest/assets/projects/synthetic/pnpm-workspaces/pnpm-workspace.yaml b/...e-managers/node/src/funTest/assets/projects/synthetic/pnpm-workspaces/pnpm-workspace.yaml
@@ -1,3 +1,3 @@
 packages:
+  - 'src/app/'
   - 'src/packages/**'
-  - 'src/app/**'
diff --git a/plugins/package-managers/node/src/main/kotlin/utils/NpmDetection.kt b/plugins/package-managers/node/src/main/kotlin/utils/NpmDetection.kt
@@ -51,7 +51,9 @@ class NpmDetection(private val definitionFiles: Collection<File>) {
         definitionFiles.associate { file ->
             val projectDir = file.parentFile
             val patterns = NodePackageManager.entries.mapNotNull { it.getWorkspaces(projectDir) }.flatten()
-            projectDir to patterns.map { FileSystems.getDefault().getPathMatcher("glob:$it") }
+            projectDir to patterns.map {
+                FileSystems.getDefault().getPathMatcher("glob:${it.removeSuffix("/")}")
+            }
         }
     }
 

diff --git a/plugins/package-managers/node/src/test/kotlin/utils/NpmDetectionTest.kt b/plugins/package-managers/node/src/test/kotlin/utils/NpmDetectionTest.kt
@@ -184,7 +184,7 @@ class NpmDetectionTest : WordSpec({
             PNPM.getWorkspaces(projectDir) shouldNotBeNull {
                 mapNotNull {
                     it.withoutPrefix(projectDir.path)
-                }.shouldContainExactly("/src/packages/**", "/src/app/**")
+                }.shouldContainExactly("/src/app/", "/src/packages/**")
             }
         }