From 4a574b8e009b95bcfbe9a555dad3dd6f233dd384 Mon Sep 17 00:00:00 2001
From: Ilya Goncharov <ilya.goncharov@jetbrains.com>
Date: Fri, 8 May 2020 15:09:36 +0300
Subject: [PATCH] [Gradle, JS] Not input transitive dependencies to dukat

KT-38331
---
 .../gradle/targets/js/dukat/DtsResolver.kt       |  5 +++--
 .../gradle/targets/js/npm/NpmDependency.kt       | 16 ----------------
 2 files changed, 3 insertions(+), 18 deletions(-)

diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/dukat/DtsResolver.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/dukat/DtsResolver.kt
index e556d920e4a..8763da09f89 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/dukat/DtsResolver.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/dukat/DtsResolver.kt
@@ -6,6 +6,8 @@
 package org.jetbrains.kotlin.gradle.targets.js.dukat
 
 import org.jetbrains.kotlin.gradle.targets.js.npm.NpmDependency
+import org.jetbrains.kotlin.gradle.targets.js.npm.NpmDependency.Scope.NORMAL
+import org.jetbrains.kotlin.gradle.targets.js.npm.NpmDependency.Scope.OPTIONAL
 import org.jetbrains.kotlin.gradle.targets.js.npm.NpmProject
 import java.io.File
 
@@ -20,8 +22,7 @@ class DtsResolver(val npmProject: NpmProject) {
         return externalNpmDependencies
             .asSequence()
             .filter { it.generateKotlinExternals }
-            .filter { it.scope != NpmDependency.Scope.DEV }
-            .flatMap { it.getDependenciesRecursively().asSequence() }
+            .filter { it.scope == NORMAL || it.scope == OPTIONAL }
             .mapNotNullTo(mutableSetOf()) { typeModules.resolve(it.key)?.let { file -> Dts(file.canonicalFile, it) } }
             .sortedBy { it.inputKey }
             .toList()
diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/NpmDependency.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/NpmDependency.kt
index e9778042c30..5121df33a59 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/NpmDependency.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/NpmDependency.kt
@@ -45,22 +45,6 @@ data class NpmDependency(
     internal var resolvedVersion: String? = null
     internal var integrity: String? = null
 
-    fun getDependenciesRecursively(): Set<NpmDependency> {
-        val visited = mutableSetOf<NpmDependency>()
-
-        fun visit(it: NpmDependency) {
-            if (!visited.add(it)) return
-
-            it.dependencies.forEach { child ->
-                visit(child)
-            }
-        }
-
-        visit(this)
-
-        return visited
-    }
-
     override fun resolve(transitive: Boolean): Set<File> =
         resolveProject()
             ?.let {