[JS IR] Move klib resolution from cli into compiler

Simplify CLI -> Compiler API
Clean up code

js/js.tests/test/org/jetbrains/kotlin/js/test/ApiTest.kt

@@ -7,8 +7,6 @@ package org.jetbrains.kotlin.js.test
 
 import junit.framework.TestCase
 import org.jetbrains.kotlin.cli.common.messages.AnalyzerWithCompilerReport
-import org.jetbrains.kotlin.cli.common.messages.MessageCollector
-import org.jetbrains.kotlin.cli.js.messageCollectorLogger
 import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles
 import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment
 import org.jetbrains.kotlin.config.CommonConfigurationKeys
@@ -16,7 +14,6 @@ import org.jetbrains.kotlin.config.CompilerConfiguration
 import org.jetbrains.kotlin.descriptors.*
 import org.jetbrains.kotlin.descriptors.impl.EnumEntrySyntheticClassDescriptor
 import org.jetbrains.kotlin.ir.backend.js.MainModule
-import org.jetbrains.kotlin.ir.backend.js.jsResolveLibraries
 import org.jetbrains.kotlin.ir.backend.js.loadIr
 import org.jetbrains.kotlin.ir.declarations.impl.IrFactoryImpl
 import org.jetbrains.kotlin.js.config.JSConfigurationKeys
@@ -72,19 +69,16 @@ class ApiTest : KotlinTestWithEnvironment() {
         get() {
             val fullRuntimeKlib: String = System.getProperty("kotlin.js.full.stdlib.path")
 
-            val resolvedLibraries =
-                jsResolveLibraries(listOf(File(fullRuntimeKlib).absolutePath), emptyList(), messageCollectorLogger(MessageCollector.NONE))
-
             val project = environment.project
             val configuration = environment.configuration
 
             return loadIr(
                 project,
-                MainModule.Klib(resolvedLibraries.getFullList().single()),
+                MainModule.Klib(File(fullRuntimeKlib).canonicalPath),
                 AnalyzerWithCompilerReport(configuration),
                 configuration,
-                resolvedLibraries,
-                listOf(),
+                listOf(fullRuntimeKlib),
+                emptyList(),
                 IrFactoryImpl,
                 verifySignatures = true
             ).module.descriptor.packagesSerialized()

js/js.tests/test/org/jetbrains/kotlin/js/test/BasicIrBoxTest.kt

@@ -9,8 +9,6 @@ import org.jetbrains.kotlin.backend.common.phaser.AnyNamedPhase
 import org.jetbrains.kotlin.backend.common.phaser.PhaseConfig
 import org.jetbrains.kotlin.backend.common.phaser.toPhaseMap
 import org.jetbrains.kotlin.cli.common.messages.AnalyzerWithCompilerReport
-import org.jetbrains.kotlin.cli.common.messages.MessageCollector
-import org.jetbrains.kotlin.cli.js.messageCollectorLogger
 import org.jetbrains.kotlin.ir.backend.js.*
 import org.jetbrains.kotlin.ir.declarations.impl.IrFactoryImpl
 import org.jetbrains.kotlin.ir.declarations.persistent.PersistentIrFactory
@@ -112,8 +110,6 @@ abstract class BasicIrBoxTest(
             compilationCache[it] ?: error("Can't find compiled module for dependency $it")
         }).map { File(it).absolutePath }
 
-        val resolvedLibraries = jsResolveLibraries(allKlibPaths, emptyList(), messageCollectorLogger(MessageCollector.NONE))
-
         val actualOutputFile = outputFile.absolutePath.let {
             if (!isMainModule) it.replace("_v5.js", "/") else it
         }
@@ -147,7 +143,7 @@ abstract class BasicIrBoxTest(
                     configuration = config.configuration,
                     phaseConfig = phaseConfig,
                     irFactory = irFactory,
-                    allDependencies = resolvedLibraries,
+                    dependencies = allKlibPaths,
                     friendDependencies = emptyList(),
                     mainArguments = mainCallParameters.run { if (shouldBeGenerated()) arguments() else null },
                     exportedDeclarations = setOf(FqName.fromSegments(listOfNotNull(testPackage, testFunction))),
@@ -181,7 +177,7 @@ abstract class BasicIrBoxTest(
                     configuration = config.configuration,
                     phaseConfig = phaseConfig,
                     irFactory = PersistentIrFactory(),
-                    allDependencies = resolvedLibraries,
+                    dependencies = allKlibPaths,
                     friendDependencies = emptyList(),
                     mainArguments = mainCallParameters.run { if (shouldBeGenerated()) arguments() else null },
                     exportedDeclarations = setOf(FqName.fromSegments(listOfNotNull(testPackage, testFunction))),
@@ -200,7 +196,7 @@ abstract class BasicIrBoxTest(
                 files = filesToCompile,
                 analyzer = AnalyzerWithCompilerReport(config.configuration),
                 configuration = config.configuration,
-                allDependencies = resolvedLibraries,
+                dependencies = allKlibPaths,
                 friendDependencies = emptyList(),
                 irFactory = IrFactoryImpl,
                 outputKlibPath = actualOutputFile,

js/js.tests/test/org/jetbrains/kotlin/js/test/BasicWasmBoxTest.kt

@@ -22,8 +22,6 @@ import org.jetbrains.kotlin.js.config.JsConfig
 import org.jetbrains.kotlin.js.facade.TranslationUnit
 import org.jetbrains.kotlin.js.test.engines.ExternalTool
 import org.jetbrains.kotlin.js.test.engines.SpiderMonkeyEngine
-import org.jetbrains.kotlin.library.resolver.impl.KotlinLibraryResolverResultImpl
-import org.jetbrains.kotlin.library.resolver.impl.KotlinResolvedLibraryImpl
 import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.psi.KtNamedFunction
 import org.jetbrains.kotlin.psi.KtPsiFactory
@@ -140,7 +138,7 @@ abstract class BasicWasmBoxTest(
             phaseConfig = phaseConfig,
             irFactory = IrFactoryImpl,
             // TODO: Bypass the resolver fow wasm.
-            allDependencies = KotlinLibraryResolverResultImpl(listOf(KotlinResolvedLibraryImpl(wasmRuntimeKlib))),
+            dependencies = listOf(System.getProperty("kotlin.wasm.stdlib.path")!!),
             friendDependencies = emptyList(),
             exportedDeclarations = setOf(FqName.fromSegments(listOfNotNull(testPackage, testFunction)))
         )