[Gradle, JS] Remove redundant fields inside NpmDependency

libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/nodejs/NodeJsRootExtension.kt

@@ -47,7 +47,7 @@ open class NodeJsRootExtension(
     }
 
     val rootProjectDir
-        get() = project.projectDir
+        get() = project.rootDir
 
     private val gradleHome = project.gradle.gradleUserHomeDir.also {
         project.logger.kotlinInfo("Storing cached files in $it")

libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/NpmDependency.kt

@@ -38,11 +38,6 @@ data class NpmDependency(
 
     override fun getVersion() = version
 
-    internal var parent: NpmDependency? = null
-    internal val dependencies = mutableSetOf<NpmDependency>()
-    internal var resolvedVersion: String? = null
-    internal var integrity: String? = null
-
     override fun resolve(transitive: Boolean): Set<File> =
         resolve()
 

libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/PublicPackageJsonTask.kt

@@ -50,7 +50,7 @@ abstract class PublicPackageJsonTask :
 
     private val compilationResolution
         get() = npmResolutionManager.get().resolution.get()[projectPath][compilationDisambiguatedName.get()]
-            .getResolutionOrResolve(
+            .getResolutionOrPrepare(
                 npmResolutionManager.get(),
                 logger
             )

libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/resolver/KotlinCompilationNpmResolution.kt

@@ -61,7 +61,7 @@ class KotlinCompilationNpmResolution(
     }
 
     @Synchronized
-    fun getResolutionOrResolve(
+    fun getResolutionOrPrepare(
         npmResolutionManager: KotlinNpmResolutionManager,
         logger: Logger,
     ): PreparedKotlinCompilationNpmResolution {
@@ -80,7 +80,7 @@ class KotlinCompilationNpmResolution(
     ): PreparedKotlinCompilationNpmResolution {
         check(!closed) { "$this already closed" }
         closed = true
-        return getResolutionOrResolve(npmResolutionManager, logger)
+        return getResolutionOrPrepare(npmResolutionManager, logger)
     }
 
     fun createPreparedResolution(
@@ -92,7 +92,7 @@ class KotlinCompilationNpmResolution(
 
         internalDependencies.map {
             val compilationNpmResolution: KotlinCompilationNpmResolution = rootResolver[it.projectPath][it.compilationName]
-            compilationNpmResolution.getResolutionOrResolve(
+            compilationNpmResolution.getResolutionOrPrepare(
                 npmResolutionManager,
                 logger
             )

libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/resolver/KotlinCompilationNpmResolver.kt

@@ -109,7 +109,7 @@ class KotlinCompilationNpmResolver(
         return _compilationNpmResolution
     }
 
-    fun createAggregatedConfiguration(): Configuration {
+    private fun createAggregatedConfiguration(): Configuration {
         val all = project.configurations.create(compilation.disambiguateName("npm"))
 
         all.usesPlatformOf(target)

libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/js/yarn/YarnSetupTask.kt

@@ -29,14 +29,13 @@ abstract class YarnSetupTask : DefaultTask() {
     private val shouldDownload = settings.download
 
     @get:Inject
-    abstract internal val archiveOperations: ArchiveOperations
+    internal abstract val archiveOperations: ArchiveOperations
 
     @get:Inject
-    abstract internal val fileHasher: FileHasher
+    internal abstract val fileHasher: FileHasher
 
     @get:Inject
-    internal open val fs: FileSystemOperations
+    internal abstract val fs: FileSystemOperations
-        get() = error("Should be injected")
 
     @Suppress("MemberVisibilityCanBePrivate")
     val downloadUrl