refactor(node)!: Move Yarn into its own dedicated directory

Align with `pnpm` and `yarn2`. Signed-off-by: Frank Viernau <[email protected]>
oss-review-toolkit · Nov 6, 2024 · 538b025 · 538b025
1 parent 6795c92
commit 538b025
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 8 deletions.
diff --git a/...rs/node/src/funTest/kotlin/YarnFunTest.kt → ...de/src/funTest/kotlin/yarn/YarnFunTest.kt b/...rs/node/src/funTest/kotlin/YarnFunTest.kt → ...de/src/funTest/kotlin/yarn/YarnFunTest.kt
@@ -17,7 +17,7 @@
  * License-Filename: LICENSE
  */
 
-package org.ossreviewtoolkit.plugins.packagemanagers.node
+package org.ossreviewtoolkit.plugins.packagemanagers.node.yarn
 
 import io.kotest.core.spec.style.WordSpec
 import io.kotest.matchers.should

diff --git a/plugins/package-managers/node/src/main/kotlin/Npm.kt b/plugins/package-managers/node/src/main/kotlin/Npm.kt
@@ -31,6 +31,7 @@ import org.ossreviewtoolkit.model.config.PackageManagerConfiguration
 import org.ossreviewtoolkit.model.config.RepositoryConfiguration
 import org.ossreviewtoolkit.plugins.packagemanagers.node.utils.NodePackageManager
 import org.ossreviewtoolkit.plugins.packagemanagers.node.utils.NpmDetection
+import org.ossreviewtoolkit.plugins.packagemanagers.node.yarn.Yarn
 import org.ossreviewtoolkit.utils.common.Os
 import org.ossreviewtoolkit.utils.common.ProcessCapture
 import org.ossreviewtoolkit.utils.common.withoutPrefix

diff --git a/...age-managers/node/src/main/kotlin/Yarn.kt → ...anagers/node/src/main/kotlin/yarn/Yarn.kt b/...age-managers/node/src/main/kotlin/Yarn.kt → ...anagers/node/src/main/kotlin/yarn/Yarn.kt
@@ -17,7 +17,7 @@
  * License-Filename: LICENSE
  */
 
-package org.ossreviewtoolkit.plugins.packagemanagers.node
+package org.ossreviewtoolkit.plugins.packagemanagers.node.yarn
 
 import java.io.File
 import java.lang.invoke.MethodHandles
@@ -50,10 +50,11 @@ import org.ossreviewtoolkit.model.config.RepositoryConfiguration
 import org.ossreviewtoolkit.model.createAndLogIssue
 import org.ossreviewtoolkit.model.readTree
 import org.ossreviewtoolkit.model.utils.DependencyGraphBuilder
+import org.ossreviewtoolkit.plugins.packagemanagers.node.PackageJson
+import org.ossreviewtoolkit.plugins.packagemanagers.node.groupLines
+import org.ossreviewtoolkit.plugins.packagemanagers.node.parsePackageJson
 import org.ossreviewtoolkit.plugins.packagemanagers.node.utils.NodePackageManager
 import org.ossreviewtoolkit.plugins.packagemanagers.node.utils.NpmDetection
-import org.ossreviewtoolkit.plugins.packagemanagers.node.utils.NpmModuleInfo
-import org.ossreviewtoolkit.plugins.packagemanagers.node.utils.YarnDependencyHandler
 import org.ossreviewtoolkit.plugins.packagemanagers.node.utils.parseProject
 import org.ossreviewtoolkit.plugins.packagemanagers.node.utils.splitNpmNamespaceAndName
 import org.ossreviewtoolkit.utils.common.CommandLineTool

diff --git a/...ain/kotlin/utils/YarnDependencyHandler.kt → ...main/kotlin/yarn/YarnDependencyHandler.kt b/...ain/kotlin/utils/YarnDependencyHandler.kt → ...main/kotlin/yarn/YarnDependencyHandler.kt
@@ -17,7 +17,7 @@
  * License-Filename: LICENSE
  */
 
-package org.ossreviewtoolkit.plugins.packagemanagers.node.utils
+package org.ossreviewtoolkit.plugins.packagemanagers.node.yarn
 
 import java.io.File
 
@@ -27,7 +27,7 @@ import org.ossreviewtoolkit.model.Package
 import org.ossreviewtoolkit.model.PackageLinkage
 import org.ossreviewtoolkit.model.Project
 import org.ossreviewtoolkit.model.utils.DependencyHandler
-import org.ossreviewtoolkit.plugins.packagemanagers.node.Yarn
+import org.ossreviewtoolkit.plugins.packagemanagers.node.utils.parsePackage
 
 /**
  * A data class storing information about a specific NPM module and its dependencies.

diff --git a/.../src/main/resources/META-INF/services/org.ossreviewtoolkit.analyzer.PackageManagerFactory b/.../src/main/resources/META-INF/services/org.ossreviewtoolkit.analyzer.PackageManagerFactory
@@ -1,4 +1,4 @@
 org.ossreviewtoolkit.plugins.packagemanagers.node.Npm$Factory
 org.ossreviewtoolkit.plugins.packagemanagers.node.pnpm.Pnpm$Factory
-org.ossreviewtoolkit.plugins.packagemanagers.node.Yarn$Factory
+org.ossreviewtoolkit.plugins.packagemanagers.node.yarn.Yarn$Factory
 org.ossreviewtoolkit.plugins.packagemanagers.node.yarn2.Yarn2$Factory
diff --git a/plugins/package-managers/node/src/test/kotlin/utils/NpmDependencyHandlerTest.kt b/plugins/package-managers/node/src/test/kotlin/utils/NpmDependencyHandlerTest.kt
@@ -32,6 +32,8 @@ import org.ossreviewtoolkit.model.PackageLinkage
 import org.ossreviewtoolkit.model.config.AnalyzerConfiguration
 import org.ossreviewtoolkit.model.config.RepositoryConfiguration
 import org.ossreviewtoolkit.plugins.packagemanagers.node.Npm
+import org.ossreviewtoolkit.plugins.packagemanagers.node.yarn.NpmModuleInfo
+import org.ossreviewtoolkit.plugins.packagemanagers.node.yarn.YarnDependencyHandler
 import org.ossreviewtoolkit.utils.test.USER_DIR
 
 class NpmDependencyHandlerTest : StringSpec({

diff --git a/...managers/node/src/test/kotlin/YarnTest.kt → ...ers/node/src/test/kotlin/yarn/YarnTest.kt b/...managers/node/src/test/kotlin/YarnTest.kt → ...ers/node/src/test/kotlin/yarn/YarnTest.kt
@@ -17,7 +17,7 @@
  * License-Filename: LICENSE
  */
 
-package org.ossreviewtoolkit.plugins.packagemanagers.node
+package org.ossreviewtoolkit.plugins.packagemanagers.node.yarn
 
 import io.kotest.core.spec.style.WordSpec
 import io.kotest.matchers.nulls.beNull