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

[K/JS] Add serialization/deserialization for JsImport/JsExport nodes

Browse Source
This commit is contained in:
Artem Kobzar
2023-04-13 12:58:46 +00:00
committed by Space Team
parent 85644bbbf6
commit 5dc6da2b33
19 changed files with 196 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/utils/serialization/Constants.kt
+13
View File
@@ -29,6 +29,19 @@ object StatementIds {
const val EMPTY = 17
const val SINGLE_LINE_COMMENT = 18
const val MULTI_LINE_COMMENT = 19
const val IMPORT = 20
const val EXPORT = 21
}
object ImportType {
const val ALL = 0
const val ITEMS = 1
const val DEFAULT = 2
}
object ExportType {
const val ALL = 0
const val ITEMS = 1
}
object ExpressionIds {
compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/utils/serialization/JsIrAstDeserializer.kt
+32 -4
View File
@@ -10,13 +10,9 @@ import org.jetbrains.kotlin.ir.backend.js.transformers.irToJs.JsIrIcClassModel
import org.jetbrains.kotlin.ir.backend.js.transformers.irToJs.JsIrProgramFragment
import org.jetbrains.kotlin.ir.backend.js.utils.emptyScope
import org.jetbrains.kotlin.js.backend.ast.*
import org.jetbrains.kotlin.js.backend.ast.JsImportedModule
import org.jetbrains.kotlin.js.backend.ast.metadata.*
import org.jetbrains.kotlin.js.backend.ast.metadata.LocalAlias
import org.jetbrains.kotlin.js.backend.ast.metadata.SpecialFunction
import java.nio.ByteBuffer
import java.util.*
import java.util.ArrayDeque
fun deserializeJsIrProgramFragment(input: ByteArray): JsIrProgramFragment {
return JsIrAstDeserializer(input).readFragment()
@@ -219,6 +215,38 @@ private class JsIrAstDeserializer(private val source: ByteArray) {
ifTrue { readBlock() }
)
}
EXPORT -> {
JsExport(
when (val type = readByte().toInt()) {
ExportType.ALL -> JsExport.Subject.All
ExportType.ITEMS -> JsExport.Subject.Elements(readList {
JsExport.Element(
nameTable[readInt()].makeRef(),
ifTrue { nameTable[readInt()] }
)
})
else -> error("Unknown JsExport type $type")
},
ifTrue { readString() }
)
}
IMPORT -> {
JsImport(
readString(),
when (val type = readByte().toInt()) {
ImportType.ALL -> JsImport.Target.All(nameTable[readInt()].makeRef())
ImportType.DEFAULT -> JsImport.Target.Default(nameTable[readInt()].makeRef())
ImportType.ITEMS -> JsImport.Target.Elements(readList {
JsImport.Element(
nameTable[readInt()],
ifTrue { nameTable[readInt()].makeRef() }
)
}.toMutableList())
else -> error("Unknown JsImport type $type")
}
)
}
EMPTY -> {
JsEmpty
}
compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/utils/serialization/JsIrAstSerializer.kt
+40 -2
View File
@@ -8,14 +8,12 @@ package org.jetbrains.kotlin.ir.backend.js.utils.serialization
import org.jetbrains.kotlin.ir.backend.js.transformers.irToJs.JsIrIcClassModel
import org.jetbrains.kotlin.ir.backend.js.transformers.irToJs.JsIrProgramFragment
import org.jetbrains.kotlin.js.backend.ast.*
import org.jetbrains.kotlin.js.backend.ast.JsImportedModule
import org.jetbrains.kotlin.js.backend.ast.metadata.*
import org.jetbrains.kotlin.utils.addToStdlib.safeAs
import java.io.ByteArrayOutputStream
import java.io.DataOutputStream
import java.io.OutputStream
import java.util.*
import java.util.ArrayDeque
fun JsIrProgramFragment.serializeTo(output: OutputStream) {
JsIrAstSerializer().append(this).saveTo(output)
@@ -301,6 +299,46 @@ private class JsIrAstSerializer {
ifNotNull(x.finallyBlock) { writeBlock(it) }
}
override fun visitExport(export: JsExport) {
writeByte(StatementIds.EXPORT)
when (val subject = export.subject) {
is JsExport.Subject.All -> writeByte(ExportType.ALL)
is JsExport.Subject.Elements -> {
writeByte(ExportType.ITEMS)
writeCollection(subject.elements) {
writeInt(internalizeName(it.name.name!!))
ifNotNull(it.alias) { writeInt(internalizeName(it)) }
}
}
}
ifNotNull(export.fromModule) { writeString(it) }
}
override fun visitImport(import: JsImport) {
writeByte(StatementIds.IMPORT)
writeString(import.module)
when (val target = import.target) {
is JsImport.Target.All -> {
writeByte(ImportType.ALL)
writeInt(internalizeName(target.alias.name!!))
}
is JsImport.Target.Default -> {
writeByte(ImportType.DEFAULT)
writeInt(internalizeName(target.name.name!!))
}
is JsImport.Target.Elements -> {
writeByte(ImportType.ITEMS)
writeCollection(target.elements) {
writeInt(internalizeName(it.name))
ifNotNull(it.alias) { writeInt(internalizeName(it.name!!)) }
}
}
}
}
override fun visitEmpty(x: JsEmpty) {
writeByte(StatementIds.EMPTY)
}
compiler/tests-compiler-utils/tests/org/jetbrains/kotlin/codegen/TestModel.kt
+15 -3
View File
@@ -6,10 +6,11 @@
package org.jetbrains.kotlin.codegen
import org.jetbrains.kotlin.ir.backend.js.ic.DirtyFileState
import org.jetbrains.kotlin.serialization.js.ModuleKind
import java.io.File
import java.util.regex.Pattern
class ProjectInfo(val name: String, val modules: List<String>, val steps: List<ProjectBuildStep>, val muted: Boolean) {
class ProjectInfo(val name: String, val modules: List<String>, val steps: List<ProjectBuildStep>, val muted: Boolean, val moduleKind: ModuleKind) {
class ProjectBuildStep(val id: Int, val order: List<String>, val dirtyJS: List<String>, val language: List<String>)
}
@@ -57,6 +58,7 @@ class ModuleInfo(val moduleName: String) {
const val PROJECT_INFO_FILE = "project.info"
private const val MODULES_LIST = "MODULES"
private const val MODULES_KIND = "MODULE_KIND"
private const val LIBS_LIST = "libs"
private const val DIRTY_JS_MODULES_LIST = "dirty js"
private const val LANGUAGE = "language"
@@ -107,7 +109,13 @@ abstract class InfoParser<Info>(protected val infoFile: File) {
private fun String.splitAndTrim() = split(",").map { it.trim() }.filter { it.isNotBlank() }
class ProjectInfoParser(infoFile: File) : InfoParser<ProjectInfo>(infoFile) {
private val moduleKindMap = mapOf(
"plain" to ModuleKind.PLAIN,
"commonjs" to ModuleKind.COMMON_JS,
"amd" to ModuleKind.AMD,
"umd" to ModuleKind.UMD,
"es" to ModuleKind.ES,
)
private fun parseSteps(firstId: Int, lastId: Int): List<ProjectInfo.ProjectBuildStep> {
val order = mutableListOf<String>()
@@ -145,6 +153,7 @@ class ProjectInfoParser(infoFile: File) : InfoParser<ProjectInfo>(infoFile) {
val libraries = mutableListOf<String>()
val steps = mutableListOf<ProjectInfo.ProjectBuildStep>()
var muted = false
var moduleKind = ModuleKind.COMMON_JS
loop { line ->
lineCounter++
@@ -162,6 +171,9 @@ class ProjectInfoParser(infoFile: File) : InfoParser<ProjectInfo>(infoFile) {
when {
op == MODULES_LIST -> libraries += split[1].splitAndTrim()
op == MODULES_KIND -> moduleKind = split[1].trim()
.ifEmpty { error("Module kind value should be provided if MODULE_KIND pragma was specified") }
.let { moduleKindMap[it] ?: error("Unknown MODULE_KIND value '$it'") }
op.matches(STEP_PATTERN.toRegex()) -> {
val m = STEP_PATTERN.matcher(op)
if (!m.matches()) throwSyntaxError(line)
@@ -188,7 +200,7 @@ class ProjectInfoParser(infoFile: File) : InfoParser<ProjectInfo>(infoFile) {
false
}
return ProjectInfo(entryName, libraries, steps, muted)
return ProjectInfo(entryName, libraries, steps, muted, moduleKind)
}
}