[Gradle, JS] Add new state for npm resolution

#KT-34832 fixed

libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/dukat/PackageJsonDukatTask.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
@@ -17,7 +17,7 @@ open class PackageJsonDukatTask : AbstractDukatTask() {
 
     @get:Internal
     val dts by lazy {
-        val resolvedCompilation = nodeJs.npmResolutionManager.requireInstalled()[project][compilation]
+        val resolvedCompilation = nodeJs.npmResolutionManager.requireResolved()[project][compilation]
         val dtsResolver = DtsResolver(resolvedCompilation.npmProject)
         dtsResolver.getAllDts(resolvedCompilation.externalNpmDependencies)
     }

libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/KotlinNpmResolutionManager.kt

@@ -53,14 +53,14 @@ import java.io.File
  * All created package.json files will be gathered and package manager will be executed.
  * Package manager will create lock file, that will be parsed for transitive npm dependencies
  * that will be added to the root [NpmDependency] objects. `kotlinNpmInstall` task may be up-to-date.
- * In this case, installed state will be reached by first call of [installIfNeeded] without executing
+ * In this case, installed state will be reached by first call of [prepareIfNeeded] without executing
  * package manager.
  *
  * Resolution will be used from [NpmDependency] by calling [getNpmDependencyResolvedCompilation].
  * Also resolution will be checked before calling [NpmProject.require] and executing any task
  * that requires npm dependencies or node_modules.
  *
- * User can call [requireInstalled] to get resolution info.
+ * User can call [requirePrepared] to get resolution info.
  *
  * ## Resolving process during Idea import
  *
@@ -94,23 +94,31 @@ class KotlinNpmResolutionManager(private val nodeJsSettings: NodeJsRootExtension
 
         }
 
-        class Prepared(val resolved: KotlinRootNpmResolution) : ResolutionState() {
+        open class Prepared(val resolved: KotlinRootNpmResolution) : ResolutionState() {
             override val npmProjects: List<NpmProject>
                 get() = resolved.projects.values.flatMap { it.npmProjects.map { it.npmProject } }
-
         }
+
+        class Resolved(resolved: KotlinRootNpmResolution) : Prepared(resolved)
     }
 
     @Incubating
-    internal fun requireInstalled() = installIfNeeded(requireUpToDateReason = "")
+    internal fun requirePrepared() = prepareIfNeeded(requireUpToDateReason = "")
 
     internal fun requireConfiguringState(): KotlinRootNpmResolver =
         (this.state as? ResolutionState.Configuring ?: error("NPM Dependencies already resolved and installed")).resolver
 
-    internal fun install() = installIfNeeded(requireNotInstalled = true)
+    internal fun prepare() = prepareIfNeeded(requireNotInstalled = true)
 
-    internal fun resolve(args: List<String> = emptyList()) {
-        val npmResolution = requireInstalled()
+    internal fun requireResolved(
+        reason: String = "",
+        args: List<String> = emptyList()
+    ): KotlinRootNpmResolution {
+        if (state is ResolutionState.Resolved) {
+            return (state as ResolutionState.Resolved).resolved
+        }
+
+        val npmResolution = prepareIfNeeded(requireUpToDateReason = reason)
         val npmResolutions = npmResolution
             .projects
             .values
@@ -122,12 +130,16 @@ class KotlinNpmResolutionManager(private val nodeJsSettings: NodeJsRootExtension
             args
         )
 
-        npmResolution.plugins
-            .forEach { it.resolve(npmResolution) }
+        return ResolutionState.Resolved((state as ResolutionState.Prepared).resolved)
+            .apply {
+                state = this
+                npmResolution.plugins
+                    .forEach { it.resolve(npmResolution) }
+            }.resolved
     }
 
-    internal fun requireAlreadyInstalled(project: Project, reason: String = ""): KotlinProjectNpmResolution =
-        installIfNeeded(requireUpToDateReason = reason)[project]
+    internal fun requireAlreadyResolved(project: Project, reason: String = ""): KotlinProjectNpmResolution =
+        requireResolved(reason = reason)[project]
 
     internal val packageJsonFiles: Collection<File>
         get() = state.npmProjects.map { it.packageJsonFile }
@@ -137,7 +149,7 @@ class KotlinNpmResolutionManager(private val nodeJsSettings: NodeJsRootExtension
      * or it is up-to-date but just not closed. Show given message if it is not.
      * @param requireNotInstalled Check that project is not resolved
      */
-    private fun installIfNeeded(
+    private fun prepareIfNeeded(
         requireUpToDateReason: String? = null,
         requireNotInstalled: Boolean = false
     ): KotlinRootNpmResolution {
@@ -177,7 +189,7 @@ class KotlinNpmResolutionManager(private val nodeJsSettings: NodeJsRootExtension
 
         val resolvedProject =
             if (forceFullResolve) {
-                installIfNeeded()[project]
+                prepareIfNeeded()[project]
             } else {
                 // may return null only during npm resolution
                 // (it can be called since NpmDependency added to configuration that
@@ -192,7 +204,7 @@ class KotlinNpmResolutionManager(private val nodeJsSettings: NodeJsRootExtension
                 }
             }
 
-        resolve()
+        requireResolved()
 
         return resolvedProject.npmProjectsByNpmDependency[npmDependency] ?: error("NPM project resolved without $this")
     }
@@ -201,7 +213,7 @@ class KotlinNpmResolutionManager(private val nodeJsSettings: NodeJsRootExtension
             where T : RequiresNpmDependencies,
                   T : Task {
         val project = task.project
-        val requestedTaskDependencies = requireAlreadyInstalled(project, "before $task execution").taskRequirements
+        val requestedTaskDependencies = requireAlreadyResolved(project, "before $task execution").taskRequirements
         val targetRequired = requestedTaskDependencies[task]?.toSet() ?: setOf()
 
         task.requiredNpmDependencies.forEach {

libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/NpmProject.kt

@@ -1,6 +1,6 @@
 /*
- * Copyright 2010-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license
- * that can be found in the license/LICENSE.txt file.
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
 package org.jetbrains.kotlin.gradle.targets.js.npm
@@ -79,7 +79,7 @@ open class NpmProject(val compilation: KotlinJsCompilation) {
      * Require [request] nodejs module and return canonical path to it's main js file.
      */
     fun require(request: String): String {
-        nodeJs.npmResolutionManager.requireAlreadyInstalled(project)
+        nodeJs.npmResolutionManager.requireAlreadyResolved(project)
         return modules.require(request)
     }
 

libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/tasks/KotlinNpmInstallTask.kt

@@ -45,7 +45,7 @@ open class KotlinNpmInstallTask : DefaultTask() {
 
     @TaskAction
     fun resolve() {
-        resolutionManager.resolve(args)
+        resolutionManager.requireResolved(args = args)
     }
 
     companion object {

libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/tasks/RootPackageJsonTask.kt

@@ -29,7 +29,7 @@ open class RootPackageJsonTask : DefaultTask() {
 
     @TaskAction
     fun resolve() {
-        resolutionManager.install()
+        resolutionManager.prepare()
     }
 
     companion object {