refactor(node): Also track the package type via NodePackageManagerType

Signed-off-by: Sebastian Schuberth <sebastian@doubleopen.org>

Author: sschuberth

plugins/package-managers/node/src/main/kotlin/NodePackageManagerType.kt

@@ -32,12 +32,14 @@ import org.ossreviewtoolkit.utils.common.div
  */
 enum class NodePackageManagerType(
     internal val projectType: String,
+    internal val packageType: String,
     internal val lockfileName: String,
     internal val markerFileName: String? = null,
     internal val workspaceFileName: String = NodePackageManagerType.DEFINITION_FILE
 ) {
     NPM(
         projectType = "NPM",
+        packageType = "NPM",
         lockfileName = "package-lock.json", // See https://docs.npmjs.com/cli/v7/configuring-npm/package-lock-json.
         markerFileName = "npm-shrinkwrap.json" // See https://docs.npmjs.com/cli/v6/configuring-npm/shrinkwrap-json.
     ) {
@@ -47,6 +49,7 @@ enum class NodePackageManagerType(
 
     PNPM(
         projectType = "PNPM",
+        packageType = "NPM",
         lockfileName = "pnpm-lock.yaml", // See https://pnpm.io/git#lockfiles.
         workspaceFileName = "pnpm-workspace.yaml"
     ) {
@@ -66,6 +69,7 @@ enum class NodePackageManagerType(
 
     YARN(
         projectType = "Yarn",
+        packageType = "NPM",
         lockfileName = "yarn.lock" // See https://classic.yarnpkg.com/en/docs/yarn-lock.
     ) {
         private val lockfileMarker = "# yarn lockfile v1"
@@ -82,6 +86,7 @@ enum class NodePackageManagerType(
 
     YARN2(
         projectType = "Yarn2",
+        packageType = "NPM",
         lockfileName = "yarn.lock", // See https://classic.yarnpkg.com/en/docs/yarn-lock.
         markerFileName = ".yarnrc.yml"
     ) {

plugins/package-managers/node/src/main/kotlin/Utils.kt

@@ -169,7 +169,7 @@ internal fun parsePackage(packageJson: PackageJson, moduleInfoResolver: ModuleIn
 
     var vcsFromPackage = parseVcsInfo(packageJson)
 
-    val id = Identifier("NPM", namespace, name, version)
+    val id = Identifier(NodePackageManagerType.NPM.packageType, namespace, name, version)
 
     val hasIncompleteData = description.isEmpty() || homepageUrl.isEmpty() || downloadUrl.isEmpty()
         || hash == Hash.NONE || vcsFromPackage == VcsInfo.EMPTY

plugins/package-managers/node/src/main/kotlin/npm/NpmDependencyHandler.kt

@@ -40,7 +40,7 @@ internal class NpmDependencyHandler(
     private val packageJsonCache = mutableMapOf<File, PackageJson>()
 
     override fun identifierFor(dependency: ModuleInfo): Identifier {
-        val type = if (dependency.isProject) NodePackageManagerType.NPM.projectType else "NPM"
+        val type = with(NodePackageManagerType.NPM) { if (dependency.isProject) projectType else packageType }
         val (namespace, name) = splitNamespaceAndName(dependency.name.orEmpty())
         val version = if (dependency.isProject) {
             val packageJson = packageJsonCache.getOrPut(dependency.packageJsonFile.realFile) {

plugins/package-managers/node/src/main/kotlin/pnpm/PnpmDependencyHandler.kt

@@ -51,7 +51,7 @@ internal class PnpmDependencyHandler(
     }
 
     override fun identifierFor(dependency: Dependency): Identifier {
-        val type = if (dependency.isProject) NodePackageManagerType.PNPM.projectType else "NPM"
+        val type = with(NodePackageManagerType.PNPM) { if (dependency.isProject) projectType else packageType }
         val namespace = dependency.from.substringBeforeLast("/", "")
         val name = dependency.from.substringAfterLast("/")
         val version = if (dependency.isProject) {

plugins/package-managers/node/src/main/kotlin/yarn/YarnDependencyHandler.kt

@@ -61,7 +61,7 @@ internal class YarnDependencyHandler(
 
     override fun identifierFor(dependency: YarnListNode): Identifier =
         Identifier(
-            type = if (dependency.isProject) NodePackageManagerType.YARN.projectType else "NPM",
+            type = with(NodePackageManagerType.YARN) { if (dependency.isProject) projectType else packageType },
             namespace = dependency.moduleName.substringBefore("/", ""),
             name = dependency.moduleName.substringAfter("/"),
             version = dependency.moduleVersion

plugins/package-managers/node/src/main/kotlin/yarn2/Yarn2DependencyHandler.kt

@@ -58,7 +58,7 @@ internal class Yarn2DependencyHandler(
 
     override fun identifierFor(dependency: PackageInfo): Identifier =
         Identifier(
-            type = if (dependency.isProject) NodePackageManagerType.YARN2.projectType else "NPM",
+            type = with(NodePackageManagerType.YARN2) { if (dependency.isProject) projectType else packageType },
             namespace = dependency.moduleName.substringBefore("/", ""),
             name = dependency.moduleName.substringAfter("/"),
             version = dependency.children.version