refactor(node): Consistently make isProject extension properties

This aligns PNPM / Yarn with NPM / Yarn2. While at it, inline the
`isProject(moduleId: String)` function.

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

Author: sschuberth

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

@@ -40,7 +40,8 @@ internal class PnpmDependencyHandler(
     private val workspaceModuleDirs = mutableSetOf<File>()
     private val packageJsonCache = mutableMapOf<File, PackageJson>()
 
-    private fun Dependency.isProject(): Boolean = isInstalled && workingDir.realFile in workspaceModuleDirs
+    private val Dependency.isProject: Boolean
+        get() = isInstalled && workingDir.realFile in workspaceModuleDirs
 
     fun setWorkspaceModuleDirs(dirs: Collection<File>) {
         workspaceModuleDirs.apply {
@@ -50,10 +51,10 @@ internal class PnpmDependencyHandler(
     }
 
     override fun identifierFor(dependency: Dependency): Identifier {
-        val type = if (dependency.isProject()) NodePackageManagerType.PNPM.projectType else "NPM"
+        val type = if (dependency.isProject) NodePackageManagerType.PNPM.projectType else "NPM"
         val namespace = dependency.from.substringBeforeLast("/", "")
         val name = dependency.from.substringAfterLast("/")
-        val version = if (dependency.isProject()) {
+        val version = if (dependency.isProject) {
             readPackageJson(dependency.packageJsonFile).version.orEmpty()
         } else {
             dependency.version.takeUnless { it.startsWith("link:") || it.startsWith("file:") }.orEmpty()
@@ -66,10 +67,10 @@ internal class PnpmDependencyHandler(
         (dependency.dependencies + dependency.optionalDependencies).values.filter { it.isInstalled }
 
     override fun linkageFor(dependency: Dependency): PackageLinkage =
-        PackageLinkage.DYNAMIC.takeUnless { dependency.isProject() } ?: PackageLinkage.PROJECT_DYNAMIC
+        PackageLinkage.DYNAMIC.takeUnless { dependency.isProject } ?: PackageLinkage.PROJECT_DYNAMIC
 
     override fun createPackage(dependency: Dependency, issues: MutableCollection<Issue>): Package? =
-        dependency.takeUnless { it.isProject() || !it.isInstalled }?.let {
+        dependency.takeUnless { it.isProject || !it.isInstalled }?.let {
             parsePackage(it.packageJsonFile, moduleInfoResolver)
         }
 

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 = if (dependency.isProject) NodePackageManagerType.YARN.projectType else "NPM",
             namespace = dependency.moduleName.substringBefore("/", ""),
             name = dependency.moduleName.substringAfter("/"),
             version = dependency.moduleVersion
@@ -71,15 +71,14 @@ internal class YarnDependencyHandler(
         dependency.children.orEmpty().filter { it.name in packageJsonForModuleId }
 
     override fun linkageFor(dependency: YarnListNode): PackageLinkage =
-        PackageLinkage.DYNAMIC.takeUnless { dependency.isProject() } ?: PackageLinkage.PROJECT_DYNAMIC
+        PackageLinkage.DYNAMIC.takeUnless { dependency.isProject } ?: PackageLinkage.PROJECT_DYNAMIC
 
     override fun createPackage(dependency: YarnListNode, issues: MutableCollection<Issue>): Package? {
-        val packageJson = packageJsonForModuleId[dependency.name]?.takeUnless { dependency.isProject() } ?: return null
+        val packageJson = packageJsonForModuleId[dependency.name]?.takeUnless { dependency.isProject } ?: return null
 
         return parsePackage(packageJson, moduleInfoResolver)
     }
 
-    private fun YarnListNode.isProject(): Boolean = isProject(name)
-
-    private fun isProject(moduleId: String) = moduleDirForModuleId[moduleId] in projectDirs
+    private val YarnListNode.isProject: Boolean
+        get() = moduleDirForModuleId[name] in projectDirs
 }