azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[JS IR] Enable DTS generation in IC

Browse Source 
^KT-54398 Fixed
This commit is contained in:
Alexander Korepanov
2022-12-02 14:33:50 +01:00
committed by Space Team
parent d21cbfe02e
commit 9edaebf235
24 changed files with 231 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/ic/HashCalculatorForIC.kt
+7 -3
View File
@@ -95,10 +95,14 @@ internal fun File.fileHashForIC(): ICHash {
}
internal fun CompilerConfiguration.configHashForIC() = HashCalculatorForIC().apply {
val importantBooleanSettingKeys = listOf(JSConfigurationKeys.PROPERTY_LAZY_INITIALIZATION)
updateForEach(importantBooleanSettingKeys) { key ->
val importantSettings = listOf(
JSConfigurationKeys.GENERATE_DTS,
JSConfigurationKeys.MODULE_KIND,
JSConfigurationKeys.PROPERTY_LAZY_INITIALIZATION
)
updateForEach(importantSettings) { key ->
update(key.toString())
update(getBoolean(key).toString())
update(get(key).toString())
}
update(languageVersionSettings.toString())
compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/ic/JsMultiModuleCache.kt
+16 -10
View File
@@ -6,6 +6,7 @@
package org.jetbrains.kotlin.ir.backend.js.ic
import org.jetbrains.kotlin.ir.backend.js.CompilationOutputs
import org.jetbrains.kotlin.ir.backend.js.export.TypeScriptFragment
import org.jetbrains.kotlin.ir.backend.js.transformers.irToJs.CrossModuleReferences
import org.jetbrains.kotlin.ir.backend.js.transformers.irToJs.JsIrModuleHeader
import java.io.File
@@ -15,6 +16,7 @@ class JsMultiModuleCache(private val moduleArtifacts: List<ModuleArtifact>) {
private const val JS_MODULE_HEADER = "js.module.header.bin"
private const val CACHED_MODULE_JS = "module.js"
private const val CACHED_MODULE_JS_MAP = "module.js.map"
private const val CACHED_MODULE_D_TS = "module.d.ts"
}
private enum class NameType(val typeMask: Int) {
@@ -71,22 +73,26 @@ class JsMultiModuleCache(private val moduleArtifacts: List<ModuleArtifact>) {
}
}
private fun File.writeIfNotNull(data: String?) {
if (data != null) {
recreate()
writeText(data)
} else {
ifExists { delete() }
}
}
fun fetchCompiledJsCode(artifact: ModuleArtifact) = artifact.artifactsDir?.let { cacheDir ->
val jsCode = File(cacheDir, CACHED_MODULE_JS).ifExists { readText() }
val sourceMap = File(cacheDir, CACHED_MODULE_JS_MAP).ifExists { readText() }
jsCode?.let { CompilationOutputs(it, null, null, sourceMap) }
val tsDefinitions = File(cacheDir, CACHED_MODULE_D_TS).ifExists { TypeScriptFragment(readText()) }
jsCode?.let { CompilationOutputs(it, tsDefinitions, null, sourceMap) }
}
fun commitCompiledJsCode(artifact: ModuleArtifact, compilationOutputs: CompilationOutputs) = artifact.artifactsDir?.let { cacheDir ->
val jsCodeCache = File(cacheDir, CACHED_MODULE_JS).apply { recreate() }
jsCodeCache.writeText(compilationOutputs.jsCode)
val jsMapCache = File(cacheDir, CACHED_MODULE_JS_MAP)
if (compilationOutputs.sourceMap != null) {
jsMapCache.recreate()
jsMapCache.writeText(compilationOutputs.sourceMap)
} else {
jsMapCache.ifExists { delete() }
}
File(cacheDir, CACHED_MODULE_JS).writeIfNotNull(compilationOutputs.jsCode)
File(cacheDir, CACHED_MODULE_JS_MAP).writeIfNotNull(compilationOutputs.sourceMap)
File(cacheDir, CACHED_MODULE_D_TS).writeIfNotNull(compilationOutputs.tsDefinitions?.raw)
}
fun loadProgramHeadersFromCache(): List<CachedModuleInfo> {