feat(node): Further improve parsing repository node in package.json

Improve algorithm for selecting the VCS info properties as follows: 1. Use `VcsHost.parse()` to also obtain the `type` and revision from textual repository nodes. 2. Use only revision strings which are sha1. This avoids having 'master' as revision. In such case using "" as revision to rely on the tag matching seems to be better. 3. Improve the fallback for the VCS path by deriving the path either from the URL or from the dedicated `directory` property. Signed-off-by: Frank Viernau <[email protected]>
oss-review-toolkit · Feb 23, 2024 · 5669cc1 · 5669cc1
1 parent 5dd100a
commit 5669cc1
Show file tree

Hide file tree

Showing 9 changed files with 73 additions and 61 deletions.
diff --git a/...package-managers/node/src/funTest/assets/projects/synthetic/npm-babel-expected-output.yml b/...package-managers/node/src/funTest/assets/projects/synthetic/npm-babel-expected-output.yml
@@ -2552,13 +2552,13 @@ packages:
       algorithm: "SHA-1"
   vcs:
     type: "Git"
-    url: "https://github.com/babel/babel/tree/master/packages/babel-cli"
+    url: "https://github.com/babel/babel.git"
     revision: ""
-    path: ""
+    path: "packages/babel-cli"
   vcs_processed:
     type: "Git"
     url: "https://github.com/babel/babel.git"
-    revision: "master"
+    revision: ""
     path: "packages/babel-cli"
 - id: "NPM::babel-code-frame:6.26.0"
   purl: "pkg:npm/[email protected]"
@@ -2582,13 +2582,13 @@ packages:
       algorithm: "SHA-1"
   vcs:
     type: "Git"
-    url: "https://github.com/babel/babel/tree/master/packages/babel-code-frame"
+    url: "https://github.com/babel/babel.git"
     revision: ""
-    path: ""
+    path: "packages/babel-code-frame"
   vcs_processed:
     type: "Git"
     url: "https://github.com/babel/babel.git"
-    revision: "master"
+    revision: ""
     path: "packages/babel-code-frame"
 - id: "NPM::babel-core:6.26.3"
   purl: "pkg:npm/[email protected]"
@@ -2612,13 +2612,13 @@ packages:
       algorithm: "SHA-1"
   vcs:
     type: "Git"
-    url: "https://github.com/babel/babel/tree/master/packages/babel-core"
+    url: "https://github.com/babel/babel.git"
     revision: ""
-    path: ""
+    path: "packages/babel-core"
   vcs_processed:
     type: "Git"
     url: "https://github.com/babel/babel.git"
-    revision: "master"
+    revision: ""
     path: "packages/babel-core"
 - id: "NPM::babel-generator:6.26.1"
   purl: "pkg:npm/[email protected]"
@@ -2642,13 +2642,13 @@ packages:
       algorithm: "SHA-1"
   vcs:
     type: "Git"
-    url: "https://github.com/babel/babel/tree/master/packages/babel-generator"
+    url: "https://github.com/babel/babel.git"
     revision: ""
-    path: ""
+    path: "packages/babel-generator"
   vcs_processed:
     type: "Git"
     url: "https://github.com/babel/babel.git"
-    revision: "master"
+    revision: ""
     path: "packages/babel-generator"
 - id: "NPM::babel-helpers:6.24.1"
   purl: "pkg:npm/[email protected]"
@@ -2672,13 +2672,13 @@ packages:
       algorithm: "SHA-1"
   vcs:
     type: "Git"
-    url: "https://github.com/babel/babel/tree/master/packages/babel-helpers"
+    url: "https://github.com/babel/babel.git"
     revision: ""
-    path: ""
+    path: "packages/babel-helpers"
   vcs_processed:
     type: "Git"
     url: "https://github.com/babel/babel.git"
-    revision: "master"
+    revision: ""
     path: "packages/babel-helpers"
 - id: "NPM::babel-messages:6.23.0"
   purl: "pkg:npm/[email protected]"
@@ -2702,13 +2702,13 @@ packages:
       algorithm: "SHA-1"
   vcs:
     type: "Git"
-    url: "https://github.com/babel/babel/tree/master/packages/babel-messages"
+    url: "https://github.com/babel/babel.git"
     revision: ""
-    path: ""
+    path: "packages/babel-messages"
   vcs_processed:
     type: "Git"
     url: "https://github.com/babel/babel.git"
-    revision: "master"
+    revision: ""
     path: "packages/babel-messages"
 - id: "NPM::babel-polyfill:6.26.0"
   purl: "pkg:npm/[email protected]"
@@ -2732,13 +2732,13 @@ packages:
       algorithm: "SHA-1"
   vcs:
     type: "Git"
-    url: "https://github.com/babel/babel/tree/master/packages/babel-polyfill"
+    url: "https://github.com/babel/babel.git"
     revision: ""
-    path: ""
+    path: "packages/babel-polyfill"
   vcs_processed:
     type: "Git"
     url: "https://github.com/babel/babel.git"
-    revision: "master"
+    revision: ""
     path: "packages/babel-polyfill"
 - id: "NPM::babel-register:6.26.0"
   purl: "pkg:npm/[email protected]"
@@ -2762,13 +2762,13 @@ packages:
       algorithm: "SHA-1"
   vcs:
     type: "Git"
-    url: "https://github.com/babel/babel/tree/master/packages/babel-register"
+    url: "https://github.com/babel/babel.git"
     revision: ""
-    path: ""
+    path: "packages/babel-register"
   vcs_processed:
     type: "Git"
     url: "https://github.com/babel/babel.git"
-    revision: "master"
+    revision: ""
     path: "packages/babel-register"
 - id: "NPM::babel-runtime:6.26.0"
   purl: "pkg:npm/[email protected]"
@@ -2792,13 +2792,13 @@ packages:
       algorithm: "SHA-1"
   vcs:
     type: "Git"
-    url: "https://github.com/babel/babel/tree/master/packages/babel-runtime"
+    url: "https://github.com/babel/babel.git"
     revision: ""
-    path: ""
+    path: "packages/babel-runtime"
   vcs_processed:
     type: "Git"
     url: "https://github.com/babel/babel.git"
-    revision: "master"
+    revision: ""
     path: "packages/babel-runtime"
 - id: "NPM::babel-template:6.26.0"
   purl: "pkg:npm/[email protected]"
@@ -2822,13 +2822,13 @@ packages:
       algorithm: "SHA-1"
   vcs:
     type: "Git"
-    url: "https://github.com/babel/babel/tree/master/packages/babel-template"
+    url: "https://github.com/babel/babel.git"
     revision: ""
-    path: ""
+    path: "packages/babel-template"
   vcs_processed:
     type: "Git"
     url: "https://github.com/babel/babel.git"
-    revision: "master"
+    revision: ""
     path: "packages/babel-template"
 - id: "NPM::babel-traverse:6.26.0"
   purl: "pkg:npm/[email protected]"
@@ -2853,13 +2853,13 @@ packages:
       algorithm: "SHA-1"
   vcs:
     type: "Git"
-    url: "https://github.com/babel/babel/tree/master/packages/babel-traverse"
+    url: "https://github.com/babel/babel.git"
     revision: ""
-    path: ""
+    path: "packages/babel-traverse"
   vcs_processed:
     type: "Git"
     url: "https://github.com/babel/babel.git"
-    revision: "master"
+    revision: ""
     path: "packages/babel-traverse"
 - id: "NPM::babel-types:6.26.0"
   purl: "pkg:npm/[email protected]"
@@ -2883,13 +2883,13 @@ packages:
       algorithm: "SHA-1"
   vcs:
     type: "Git"
-    url: "https://github.com/babel/babel/tree/master/packages/babel-types"
+    url: "https://github.com/babel/babel.git"
     revision: ""
-    path: ""
+    path: "packages/babel-types"
   vcs_processed:
     type: "Git"
     url: "https://github.com/babel/babel.git"
-    revision: "master"
+    revision: ""
     path: "packages/babel-types"
 - id: "NPM::babylon:6.18.0"
   purl: "pkg:npm/[email protected]"
@@ -2913,7 +2913,7 @@ packages:
       algorithm: "SHA-1"
   vcs:
     type: "Git"
-    url: "https://github.com/babel/babylon"
+    url: "https://github.com/babel/babylon.git"
     revision: "da66d3f65b0d305c0bb042873d57f26f0c0b0538"
     path: ""
   vcs_processed:
@@ -4577,7 +4577,7 @@ packages:
       algorithm: "SHA-1"
   vcs:
     type: "Git"
-    url: "git://github.com/isaacs/inherits"
+    url: "git://github.com/isaacs/inherits.git"
     revision: "9a2c29400c6d491e0b7beefe0c32efa3b462545d"
     path: ""
   vcs_processed:
@@ -4607,7 +4607,7 @@ packages:
       algorithm: "SHA-1"
   vcs:
     type: "Git"
-    url: "https://github.com/zertosh/invariant"
+    url: "https://github.com/zertosh/invariant.git"
     revision: "ce95a9badeee1c97daff1bca0d1f6cec5dda4fe8"
     path: ""
   vcs_processed:
@@ -6615,7 +6615,7 @@ packages:
     type: "Git"
     url: "https://github.com/facebook/regenerator/tree/master/packages/regenerator-runtime"
     revision: ""
-    path: ""
+    path: "packages/regenerator-runtime"
   vcs_processed:
     type: "Git"
     url: "https://github.com/facebook/regenerator.git"
@@ -6645,7 +6645,7 @@ packages:
     type: "Git"
     url: "https://github.com/facebook/regenerator/tree/master/packages/regenerator-runtime"
     revision: ""
-    path: ""
+    path: "packages/regenerator-runtime"
   vcs_processed:
     type: "Git"
     url: "https://github.com/facebook/regenerator.git"

diff --git a/...anagers/node/src/funTest/assets/projects/synthetic/npm-expected-output-scope-excludes.yml b/...anagers/node/src/funTest/assets/projects/synthetic/npm-expected-output-scope-excludes.yml
@@ -308,7 +308,7 @@ packages:
       value: "a6d7604573365fe74686c3f311c56513d88285f2"
       algorithm: "SHA-1"
   vcs:
-    type: ""
+    type: "Git"
     url: "https://github.com/fb55/css-what"
     revision: "2db00ca221922c5b5131d798614aa043f2f6f80e"
     path: ""
@@ -699,7 +699,7 @@ packages:
       algorithm: "SHA-1"
   vcs:
     type: "Git"
-    url: "git://github.com/isaacs/inherits"
+    url: "git://github.com/isaacs/inherits.git"
     revision: "9a2c29400c6d491e0b7beefe0c32efa3b462545d"
     path: ""
   vcs_processed:
@@ -997,7 +997,7 @@ packages:
       algorithm: "SHA-1"
   vcs:
     type: "Git"
-    url: "https://github.com/npm/node-semver"
+    url: "https://github.com/npm/node-semver.git"
     revision: "8055dda0aee91372e3bfc47754a62f40e8a63b98"
     path: ""
   vcs_processed:

diff --git a/plugins/package-managers/node/src/funTest/assets/projects/synthetic/npm-expected-output.yml b/plugins/package-managers/node/src/funTest/assets/projects/synthetic/npm-expected-output.yml
@@ -344,7 +344,7 @@ packages:
       value: "a6d7604573365fe74686c3f311c56513d88285f2"
       algorithm: "SHA-1"
   vcs:
-    type: ""
+    type: "Git"
     url: "https://github.com/fb55/css-what"
     revision: "2db00ca221922c5b5131d798614aa043f2f6f80e"
     path: ""
@@ -735,7 +735,7 @@ packages:
       algorithm: "SHA-1"
   vcs:
     type: "Git"
-    url: "git://github.com/isaacs/inherits"
+    url: "git://github.com/isaacs/inherits.git"
     revision: "9a2c29400c6d491e0b7beefe0c32efa3b462545d"
     path: ""
   vcs_processed:
@@ -1033,7 +1033,7 @@ packages:
       algorithm: "SHA-1"
   vcs:
     type: "Git"
-    url: "https://github.com/npm/node-semver"
+    url: "https://github.com/npm/node-semver.git"
     revision: "8055dda0aee91372e3bfc47754a62f40e8a63b98"
     path: ""
   vcs_processed:

diff --git a/...-managers/node/src/funTest/assets/projects/synthetic/npm-version-urls-expected-output.yml b/...-managers/node/src/funTest/assets/projects/synthetic/npm-version-urls-expected-output.yml
@@ -2388,7 +2388,7 @@ packages:
       algorithm: "SHA-1"
   vcs:
     type: "Git"
-    url: "git://github.com/isaacs/inherits"
+    url: "git://github.com/isaacs/inherits.git"
     revision: "9a2c29400c6d491e0b7beefe0c32efa3b462545d"
     path: ""
   vcs_processed:

diff --git a/plugins/package-managers/node/src/funTest/assets/projects/synthetic/pnpm-expected-output.yml b/plugins/package-managers/node/src/funTest/assets/projects/synthetic/pnpm-expected-output.yml
@@ -350,7 +350,7 @@ packages:
       value: "a6d7604573365fe74686c3f311c56513d88285f2"
       algorithm: "SHA-1"
   vcs:
-    type: ""
+    type: "Git"
     url: "https://github.com/fb55/css-what"
     revision: "2db00ca221922c5b5131d798614aa043f2f6f80e"
     path: ""
@@ -710,7 +710,7 @@ packages:
       algorithm: "SHA-1"
   vcs:
     type: "Git"
-    url: "git://github.com/isaacs/inherits"
+    url: "git://github.com/isaacs/inherits.git"
     revision: "9a2c29400c6d491e0b7beefe0c32efa3b462545d"
     path: ""
   vcs_processed:
@@ -1008,7 +1008,7 @@ packages:
       algorithm: "SHA-1"
   vcs:
     type: "Git"
-    url: "https://github.com/npm/node-semver"
+    url: "https://github.com/npm/node-semver.git"
     revision: "0eeceecfba490d136eb3ccae3a8dc118a28565a0"
     path: ""
   vcs_processed:

diff --git a/plugins/package-managers/node/src/funTest/assets/projects/synthetic/yarn-expected-output.yml b/plugins/package-managers/node/src/funTest/assets/projects/synthetic/yarn-expected-output.yml
@@ -341,7 +341,7 @@ packages:
       value: "a6d7604573365fe74686c3f311c56513d88285f2"
       algorithm: "SHA-1"
   vcs:
-    type: ""
+    type: "Git"
     url: "https://github.com/fb55/css-what"
     revision: "2db00ca221922c5b5131d798614aa043f2f6f80e"
     path: ""
@@ -732,7 +732,7 @@ packages:
       algorithm: "SHA-1"
   vcs:
     type: "Git"
-    url: "git://github.com/isaacs/inherits"
+    url: "git://github.com/isaacs/inherits.git"
     revision: "9a2c29400c6d491e0b7beefe0c32efa3b462545d"
     path: ""
   vcs_processed:
@@ -1030,7 +1030,7 @@ packages:
       algorithm: "SHA-1"
   vcs:
     type: "Git"
-    url: "https://github.com/npm/node-semver"
+    url: "https://github.com/npm/node-semver.git"
     revision: "8055dda0aee91372e3bfc47754a62f40e8a63b98"
     path: ""
   vcs_processed:

diff --git a/...agers/node/src/funTest/assets/projects/synthetic/yarn2-expected-output-scope-excludes.yml b/...agers/node/src/funTest/assets/projects/synthetic/yarn2-expected-output-scope-excludes.yml
@@ -214,7 +214,7 @@ packages:
       value: "a6d7604573365fe74686c3f311c56513d88285f2"
       algorithm: "SHA-1"
   vcs:
-    type: ""
+    type: "Git"
     url: "git+https://github.com/fb55/css-what.git"
     revision: "2db00ca221922c5b5131d798614aa043f2f6f80e"
     path: ""

diff --git a/...ins/package-managers/node/src/funTest/assets/projects/synthetic/yarn2-expected-output.yml b/...ins/package-managers/node/src/funTest/assets/projects/synthetic/yarn2-expected-output.yml
@@ -341,7 +341,7 @@ packages:
       value: "a6d7604573365fe74686c3f311c56513d88285f2"
       algorithm: "SHA-1"
   vcs:
-    type: ""
+    type: "Git"
     url: "git+https://github.com/fb55/css-what.git"
     revision: "2db00ca221922c5b5131d798614aa043f2f6f80e"
     path: ""