[Gradle, JS] Use target disambiguation classifier for compilation name

libraries/tools/kotlin-gradle-plugin-api/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinCompilation.kt

@@ -82,6 +82,9 @@ interface KotlinCompilation<out T : KotlinCommonOptions> : Named, HasAttributes,
         get() = super.relatedConfigurationNames + compileDependencyConfigurationName
 
     val moduleName: String
+
+    val disambiguatedName
+        get() = target.disambiguationClassifier + name
 }
 
 interface KotlinCompilationToRunnableFiles<T : KotlinCommonOptions> : KotlinCompilation<T> {

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

@@ -27,7 +27,7 @@ internal class DukatCompilationResolverPlugin(
     val npmProject get() = resolver.npmProject
     val compilation get() = npmProject.compilation
     val compilationName by lazy {
-        compilation.name
+        compilation.disambiguatedName
     }
     val legacyTargetReuseIrTask by lazy {
         val target = compilation.target

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

@@ -23,7 +23,7 @@ abstract class DukatTask(
 
     @get:Internal
     val compilationName by lazy {
-        compilation.name
+        compilation.disambiguatedName
     }
 
     init {
@@ -96,7 +96,7 @@ abstract class DukatTask(
 
     @TaskAction
     open fun run() {
-//        nodeJs.npmResolutionManager.checkRequiredDependencies(this)
+        nodeJs.npmResolutionManager.checkRequiredDependencies(this, services, logger, projectPath)
 
         destinationDir.deleteRecursively()
 

libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/nodejs/TasksRequirements.kt

@@ -33,7 +33,7 @@ class TasksRequirements {
             .filterIsInstance<NpmDependency>()
             .toMutableSet()
 
-        val compilation = task.compilation.name
+        val compilation = task.compilation.disambiguatedName
         if (compilation in byCompilation) {
             byCompilation[compilation]!!.addAll(requiredNpmDependencies.map { it.toDeclaration() })
         } else {

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

@@ -25,7 +25,7 @@ val KotlinJsCompilation.npmProject: NpmProject
  * More info can be obtained from [KotlinCompilationNpmResolution], which is available after project resolution (after [KotlinNpmInstallTask] execution).
  */
 open class NpmProject(@Transient val compilation: KotlinJsCompilation) {
-    val compilationName = compilation.name
+    val compilationName = compilation.disambiguatedName
 
     val name: String by lazy {
         buildNpmProjectName()

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

@@ -28,7 +28,7 @@ constructor(
     private val npmProject = compilation.npmProject
     private val nodeJs = npmProject.nodeJs
 
-    private val compilationName = compilation.name
+    private val compilationName = compilation.disambiguatedName
     private val projectPath = project.path
 
     private val compilationResolution

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

@@ -15,7 +15,6 @@ class KotlinCompilationNpmResolution(
     @Transient
     private val _project: Project?,
     val npmProject: NpmProject,
-    val internalDependencies: Collection<KotlinCompilationNpmResolution>,
     val internalCompositeDependencies: Collection<GradleNodeModule>,
     val externalGradleDependencies: Collection<GradleNodeModule>,
     private val _externalNpmDependencies: Collection<NpmDependencyDeclaration>,

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

@@ -62,7 +62,7 @@ internal class KotlinCompilationNpmResolver(
 
     val npmProject = compilation.npmProject
 
-    val compilationName = compilation.name
+    val compilationDisambiguatedName = compilation.disambiguatedName
 
     val npmName by lazy {
         npmProject.name
@@ -435,7 +435,7 @@ internal class KotlinCompilationNpmResolver(
                 .filterNotNull()
 
             val toolsNpmDependencies = taskRequirements
-                .getCompilationNpmRequirements(compilationName)
+                .getCompilationNpmRequirements(compilationDisambiguatedName)
 
             val allNpmDependencies = externalNpmDependencyDeclarations + toolsNpmDependencies
 
@@ -469,7 +469,6 @@ internal class KotlinCompilationNpmResolver(
             return KotlinCompilationNpmResolution(
                 if (compilation != null) project else null,
                 npmProject,
-                resolvedInternalDependencies,
                 compositeDependencies,
                 importedExternalGradleDependencies,
                 allNpmDependencies,

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

@@ -37,7 +37,7 @@ internal class KotlinProjectNpmResolver(
 
     operator fun get(compilation: KotlinJsCompilation): KotlinCompilationNpmResolver {
         check(compilation.target.project == project)
-        return byCompilation[compilation.name] ?: error("$compilation was not registered in $this")
+        return byCompilation[compilation.disambiguatedName] ?: error("$compilation was not registered in $this")
     }
 
     operator fun get(compilationName: String): KotlinCompilationNpmResolver {
@@ -110,7 +110,7 @@ internal class KotlinProjectNpmResolver(
     private fun addCompilation(compilation: KotlinJsCompilation) {
         check(!closed) { resolver.alreadyResolvedMessage("add compilation $compilation") }
 
-        byCompilation[compilation.name] = KotlinCompilationNpmResolver(this, compilation)
+        byCompilation[compilation.disambiguatedName] = KotlinCompilationNpmResolver(this, compilation)
     }
 
     fun close(): KotlinProjectNpmResolution {

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

@@ -33,15 +33,15 @@ open class KotlinPackageJsonTask : DefaultTask() {
     @Transient
     private lateinit var compilation: KotlinJsCompilation
 
-    private val compilationName by lazy {
-        compilation.name
+    private val compilationDisambiguatedName by lazy {
+        compilation.disambiguatedName
     }
 
     @Input
     val projectPath = project.path
 
     private val compilationResolver
-        get() = nodeJs.npmResolutionManager.resolver[projectPath][compilationName]
+        get() = nodeJs.npmResolutionManager.resolver[projectPath][compilationDisambiguatedName]
 
     private val producer: KotlinCompilationNpmResolver.PackageJsonProducer
         get() = compilationResolver.packageJsonProducer
@@ -64,7 +64,7 @@ open class KotlinPackageJsonTask : DefaultTask() {
     @get:Input
     internal val toolsNpmDependencies: List<String> by lazy {
         nodeJs.taskRequirements
-            .getCompilationNpmRequirements(compilationName)
+            .getCompilationNpmRequirements(compilationDisambiguatedName)
             .map { it.toString() }
     }