55
66package org.jetbrains.kotlin.js.test.converters
77
8+ import org.jetbrains.kotlin.backend.common.reportLoadingProblemsIfAny
89import org.jetbrains.kotlin.config.moduleName
910import org.jetbrains.kotlin.ir.backend.js.jsOutputName
1011import org.jetbrains.kotlin.js.config.*
1112import org.jetbrains.kotlin.js.tsexport.TypeScriptExportConfig
1213import org.jetbrains.kotlin.js.tsexport.TypeScriptModuleConfig
1314import org.jetbrains.kotlin.js.tsexport.runTypeScriptExport
14- import org.jetbrains.kotlin.library.impl.KLIB_DEFAULT_COMPONENT_NAME
15- import org.jetbrains.kotlin.library.impl.createKotlinLibrary
15+ import org.jetbrains.kotlin.library.loader.KlibLoader
1616import org.jetbrains.kotlin.library.metadata.KlibInputModule
1717import org.jetbrains.kotlin.library.uniqueName
1818import org.jetbrains.kotlin.test.directives.JsEnvironmentConfigurationDirectives
@@ -21,7 +21,6 @@ import org.jetbrains.kotlin.test.services.*
2121import org.jetbrains.kotlin.test.services.configuration.JsEnvironmentConfigurator
2222import java.io.File
2323import kotlin.io.path.Path
24- import org.jetbrains.kotlin.konan.file.File as KonanFile
2524
2625class AnalysisApiBasedDtsGeneratorFacade (
2726 private val testServices : TestServices ,
@@ -74,7 +73,9 @@ class AnalysisApiBasedDtsGeneratorFacade(
7473 }
7574
7675 private fun createInputModule (libraryPath : String ): KlibInputModule <TypeScriptModuleConfig > {
77- val library = createKotlinLibrary(KonanFile (libraryPath), KLIB_DEFAULT_COMPONENT_NAME )
76+ val result = KlibLoader { libraryPaths(libraryPath) }.load()
77+ result.reportLoadingProblemsIfAny { _, message -> testServices.assertions.fail { message } }
78+ val library = result.librariesStdlibFirst[0 ]
7879 return KlibInputModule (library.uniqueName, Path (libraryPath), TypeScriptModuleConfig (outputName = library.jsOutputName))
7980 }
8081
0 commit comments