feat(node): Handle textual repository nodes in package.json

The repository nodes can be textual, see [1] [1]: https://docs.npmjs.com/cli/v10/configuring-npm/package-json#repository Signed-off-by: Frank Viernau <[email protected]>
oss-review-toolkit · Apr 12, 2024 · cb39f8c · cb39f8c
1 parent a9bcec8
commit cb39f8c
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 11 deletions.
diff --git a/plugins/package-managers/node/src/main/kotlin/utils/NpmSupport.kt b/plugins/package-managers/node/src/main/kotlin/utils/NpmSupport.kt
@@ -153,16 +153,25 @@ internal fun parseNpmVcsInfo(node: JsonNode): VcsInfo {
         revision = head
     )
 
-    val type = repository["type"].textValueOrEmpty()
-    val url = repository.textValue() ?: repository["url"].textValueOrEmpty()
-    val path = repository["directory"].textValueOrEmpty()
-
-    return VcsInfo(
-        type = VcsType.forName(type),
-        url = expandNpmShortcutUrl(url),
-        revision = head,
-        path = path
-    )
+    return if (repository.isTextual) {
+        VcsInfo(
+            type = VcsType.UNKNOWN,
+            url = expandNpmShortcutUrl(repository.textValue()),
+            path = "",
+            revision = head
+        )
+    } else {
+        val type = repository["type"].textValueOrEmpty()
+        val url = repository.textValue() ?: repository["url"].textValueOrEmpty()
+        val path = repository["directory"].textValueOrEmpty()
+
+        VcsInfo(
+            type = VcsType.forName(type),
+            url = expandNpmShortcutUrl(url),
+            revision = head,
+            path = path
+        )
+    }
 }
 
 /**

diff --git a/plugins/package-managers/node/src/test/kotlin/utils/NpmSupportTest.kt b/plugins/package-managers/node/src/test/kotlin/utils/NpmSupportTest.kt
@@ -192,7 +192,7 @@ class NpmSupportTest : WordSpec({
     }
 
     "parseNpmVcsInfo()" should {
-        "get VCS information from an object node" {
+        "get VCS information from an object node containing a repository node which is an object" {
             val node = """
             {    
                 "gitHead": "bar",
@@ -211,6 +211,21 @@ class NpmSupportTest : WordSpec({
                 "foo"
             )
         }
+
+        "get VCS information from an object node containing a repository node which is textual" {
+            val node = """
+            {    
+                "gitHead": "bar",
+                "repository": "git+ssh://example.com/a/b.git" 
+            }
+            """.readJsonTree()
+
+            parseNpmVcsInfo(node) shouldBe VcsInfo(
+                VcsType.UNKNOWN,
+                "git+ssh://example.com/a/b.git",
+                "bar"
+            )
+        }
     }
 
     "splitNpmNamespaceAndName()" should {