[K/JS] Implement an incremental compilation for the per-file granularity

2023-07-19 15:57:56 +00:00
parent fd07f7f43c
commit 044c0adae7
185 changed files with 3530 additions and 513 deletions
@@ -7,7 +7,7 @@ package org.jetbrains.kotlin.ir.backend.js.ic
 import org.jetbrains.kotlin.backend.common.CommonKLibResolver
 import org.jetbrains.kotlin.backend.common.phaser.PhaseConfig
 import org.jetbrains.kotlin.backend.common.serialization.IrInterningService
-import org.jetbrains.kotlin.backend.common.serialization.cityHash64
+import org.jetbrains.kotlin.backend.common.serialization.cityHash64String
 import org.jetbrains.kotlin.config.CompilerConfiguration
 import org.jetbrains.kotlin.ir.backend.js.*
 import org.jetbrains.kotlin.ir.backend.js.transformers.irToJs.JsGenerationGranularity
@@ -128,7 +128,7 @@ class CacheUpdater(
        private val incrementalCaches = libraryDependencies.keys.associate { lib ->
            val libFile = KotlinLibraryFile(lib)
            val file = File(libFile.path)
-            val pathHash = file.absolutePath.cityHash64().toULong().toString(Character.MAX_RADIX)
+            val pathHash = file.absolutePath.cityHash64String()
            val libraryCacheDir = File(cacheRootDir, "${file.name}.$pathHash")
            libFile to IncrementalCache(KotlinLoadedLibraryHeader(lib, internationService), libraryCacheDir)
        }
@@ -5,8 +5,8 @@

 package org.jetbrains.kotlin.ir.backend.js.ic

-import org.jetbrains.kotlin.backend.common.serialization.cityHash64
 import org.jetbrains.kotlin.backend.common.serialization.FingerprintHash
+import org.jetbrains.kotlin.backend.common.serialization.cityHash64String
 import org.jetbrains.kotlin.ir.util.IdSignature
 import org.jetbrains.kotlin.protobuf.CodedInputStream
 import org.jetbrains.kotlin.protobuf.CodedOutputStream
@@ -85,7 +85,7 @@ internal class IncrementalCache(private val library: KotlinLibraryHeader, val ca
    ) : KotlinSourceFileMetadata()

    private fun KotlinSourceFile.getCacheFile(suffix: String): File {
-        val pathHash = path.cityHash64().toULong().toString(Character.MAX_RADIX)
+        val pathHash = path.cityHash64String()
        return File(cacheDir, "${File(path).name}.$pathHash.$suffix")
    }

@@ -29,7 +29,8 @@ class JsExecutableProducer(
    fun buildExecutable(granularity: JsGenerationGranularity, outJsProgram: Boolean) =
        when (granularity) {
            JsGenerationGranularity.WHOLE_PROGRAM -> buildSingleModuleExecutable(outJsProgram)
-            JsGenerationGranularity.PER_MODULE, JsGenerationGranularity.PER_FILE -> buildMultiModuleExecutable(outJsProgram)
+            JsGenerationGranularity.PER_MODULE -> buildMultiArtifactExecutable(outJsProgram, JsPerModuleCache(caches))
+            JsGenerationGranularity.PER_FILE -> buildMultiArtifactExecutable(outJsProgram, JsPerFileCache(caches))
        }

    private fun buildSingleModuleExecutable(outJsProgram: Boolean): BuildResult {
@@ -45,29 +46,33 @@ class JsExecutableProducer(
        return BuildResult(out, listOf(mainModuleName))
    }

-    private fun buildMultiModuleExecutable(outJsProgram: Boolean): BuildResult {
+    private fun <CacheInfo : JsMultiArtifactCache.CacheInfo> buildMultiArtifactExecutable(
+        outJsProgram: Boolean,
+        jsMultiArtifactCache: JsMultiArtifactCache<CacheInfo>
+    ): BuildResult {
        val rebuildModules = mutableListOf<String>()
        stopwatch.startNext("JS code cache loading")
-        val jsMultiModuleCache = JsMultiModuleCache(caches)
-        val cachedProgram = jsMultiModuleCache.loadProgramHeadersFromCache()
+        val cachedProgram = jsMultiArtifactCache.loadProgramHeadersFromCache()

        stopwatch.startNext("Cross module references resolving")
        val resolver = CrossModuleDependenciesResolver(moduleKind, cachedProgram.map { it.jsIrHeader })
        val crossModuleReferences = resolver.resolveCrossModuleDependencies(relativeRequirePath)

        stopwatch.startNext("Loading JS IR modules with updated cross module references")
-        jsMultiModuleCache.loadRequiredJsIrModules(crossModuleReferences)
+        jsMultiArtifactCache.loadRequiredJsIrModules(crossModuleReferences)
+
+        fun CacheInfo?.compileModule(moduleName: String, generateCallToMain: Boolean): CompilationOutputs {
+            if (this == null) return jsMultiArtifactCache.fetchCompiledJsCodeForNullCacheInfo()

-        fun JsMultiModuleCache.CachedModuleInfo.compileModule(moduleName: String, generateCallToMain: Boolean): CompilationOutputs {
            if (jsIrHeader.associatedModule == null) {
                stopwatch.startNext("Fetching cached JS code")
-                val compilationOutputs = jsMultiModuleCache.fetchCompiledJsCode(artifact)
+                val compilationOutputs = jsMultiArtifactCache.fetchCompiledJsCode(this)
                if (compilationOutputs != null) {
                    return compilationOutputs
                }
                // theoretically should never happen
                stopwatch.startNext("Loading JS IR modules")
-                jsIrHeader.associatedModule = artifact.loadJsIrModule()
+                jsIrHeader.associatedModule = jsMultiArtifactCache.loadJsIrModule(this)
            }
            stopwatch.startNext("Initializing JS imports")
            val associatedModule = jsIrHeader.associatedModule ?: icError("can not load module $moduleName")
@@ -87,17 +92,20 @@ class JsExecutableProducer(

            stopwatch.startNext("Committing compiled JS code")
            rebuildModules += moduleName
-            return jsMultiModuleCache.commitCompiledJsCode(artifact, compiledModule)
+            return jsMultiArtifactCache.commitCompiledJsCode(this, compiledModule)
        }

-        val cachedMainModule = cachedProgram.last()
-        val mainModule = cachedMainModule.compileModule(mainModuleName, true)
+        val (cachedMainModule, cachedOtherModules) = jsMultiArtifactCache.getMainModuleAndDependencies(cachedProgram)
+
+        val mainModuleCompilationOutput = cachedMainModule
+            .compileModule(mainModuleName, true)
+            .apply {
+                dependencies = cachedOtherModules.map {
+                    it.jsIrHeader.externalModuleName to it.compileModule(it.jsIrHeader.externalModuleName, false)
+                }
+            }

-        val cachedOtherModules = cachedProgram.dropLast(1)
-        mainModule.dependencies = cachedOtherModules.map {
-            it.jsIrHeader.externalModuleName to it.compileModule(it.jsIrHeader.externalModuleName, false)
-        }
        stopwatch.stop()
-        return BuildResult(mainModule, rebuildModules)
+        return BuildResult(mainModuleCompilationOutput, rebuildModules)
    }
 }
@@ -0,0 +1,94 @@
+/*
+ * Copyright 2010-2023 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.ir.backend.js.ic
+
+import org.jetbrains.kotlin.ir.backend.js.transformers.irToJs.*
+import org.jetbrains.kotlin.protobuf.CodedInputStream
+import org.jetbrains.kotlin.protobuf.CodedOutputStream
+import java.io.File
+
+abstract class JsMultiArtifactCache<T : JsMultiArtifactCache.CacheInfo> {
+    abstract fun loadProgramHeadersFromCache(): List<T>
+    abstract fun loadRequiredJsIrModules(crossModuleReferences: Map<JsIrModuleHeader, CrossModuleReferences>)
+    abstract fun fetchCompiledJsCode(cacheInfo: T): CompilationOutputsCached?
+    abstract fun commitCompiledJsCode(cacheInfo: T, compilationOutputs: CompilationOutputsBuilt): CompilationOutputs
+    abstract fun fetchCompiledJsCodeForNullCacheInfo(): CompilationOutputs
+    abstract fun loadJsIrModule(cacheInfo: T): JsIrModule
+    abstract fun getMainModuleAndDependencies(cacheInfo: List<T>): Pair<T?, List<T>>
+
+    protected fun File.writeIfNotNull(data: String?) {
+        if (data != null) {
+            parentFile?.mkdirs()
+            writeText(data)
+        } else {
+            delete()
+        }
+    }
+
+    protected fun CodedInputStream.fetchJsIrModuleHeaderNames(): JsIrModuleHeaderNames {
+        val definitions = mutableSetOf<String>()
+        val nameBindings = mutableMapOf<String, String>()
+        val optionalCrossModuleImports = hashSetOf<String>()
+
+        repeat(readInt32()) {
+            val tag = readString()
+            val mask = readInt32()
+            if (mask and NameType.DEFINITIONS.typeMask != 0) {
+                definitions += tag
+            }
+            if (mask and NameType.OPTIONAL_IMPORTS.typeMask != 0) {
+                optionalCrossModuleImports += tag
+            }
+            if (mask and NameType.NAME_BINDINGS.typeMask != 0) {
+                nameBindings[tag] = readString()
+            }
+        }
+
+        return JsIrModuleHeaderNames(definitions, nameBindings, optionalCrossModuleImports)
+    }
+
+    protected fun CodedOutputStream.commitJsIrModuleHeaderNames(jsIrHeader: JsIrModuleHeader) {
+        val names = mutableMapOf<String, Pair<Int, String?>>()
+
+        for ((tag, name) in jsIrHeader.nameBindings) {
+            names[tag] = NameType.NAME_BINDINGS.typeMask to name
+        }
+        for (tag in jsIrHeader.optionalCrossModuleImports) {
+            val maskAndName = names[tag]
+            names[tag] = ((maskAndName?.first ?: 0) or NameType.OPTIONAL_IMPORTS.typeMask) to maskAndName?.second
+        }
+        for (tag in jsIrHeader.definitions) {
+            val maskAndName = names[tag]
+            names[tag] = ((maskAndName?.first ?: 0) or NameType.DEFINITIONS.typeMask) to maskAndName?.second
+        }
+
+        writeInt32NoTag(names.size)
+
+        for ((tag, maskAndName) in names) {
+            writeStringNoTag(tag)
+            writeInt32NoTag(maskAndName.first)
+            if (maskAndName.second != null) {
+                writeStringNoTag(maskAndName.second)
+            }
+        }
+    }
+
+    interface CacheInfo {
+        val jsIrHeader: JsIrModuleHeader
+    }
+
+    protected data class JsIrModuleHeaderNames(
+        val definitions: Set<String>,
+        val nameBindings: Map<String, String>,
+        val optionalCrossModuleImports: Set<String>,
+    )
+
+    protected enum class NameType(val typeMask: Int) {
+        DEFINITIONS(0b1),
+        NAME_BINDINGS(0b10),
+        OPTIONAL_IMPORTS(0b100)
+    }
+}
@@ -0,0 +1,231 @@
+/*
+ * Copyright 2010-2022 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.ir.backend.js.ic
+
+import org.jetbrains.kotlin.backend.common.serialization.cityHash64
+import org.jetbrains.kotlin.backend.common.serialization.cityHash64String
+import org.jetbrains.kotlin.ir.backend.js.transformers.irToJs.*
+import org.jetbrains.kotlin.protobuf.CodedInputStream
+import org.jetbrains.kotlin.protobuf.CodedOutputStream
+import org.jetbrains.kotlin.utils.addToStdlib.runIf
+import java.io.File
+
+class JsPerFileCache(private val moduleArtifacts: List<ModuleArtifact>) : JsMultiArtifactCache<JsPerFileCache.CachedFileInfo>() {
+    companion object {
+        private const val JS_MODULE_HEADER = "js.module.header.bin"
+        private const val CACHED_FILE_JS = "file.js"
+        private const val CACHED_EXPORT_FILE_JS = "file.export.js"
+        private const val CACHED_FILE_JS_MAP = "file.js.map"
+        private const val CACHED_FILE_D_TS = "file.d.ts"
+    }
+
+    class CachedFileInfo(
+        val moduleArtifact: ModuleArtifact,
+        val fileArtifact: SrcFileArtifact,
+        val isExportFileCachedInfo: Boolean = false,
+    ) : CacheInfo {
+        var dtsHash: Long? = null
+        var crossFileReferencesHash: ICHash = ICHash()
+        var exportFileCachedInfo: CachedFileInfo? = null
+        override lateinit var jsIrHeader: JsIrModuleHeader
+
+        constructor(
+            jsIrModuleHeader: JsIrModuleHeader,
+            moduleArtifact: ModuleArtifact,
+            fileArtifact: SrcFileArtifact,
+            isExportFileCachedInfo: Boolean = false,
+            tsDeclarationsHash: Long? = null,
+        ) : this(moduleArtifact, fileArtifact, isExportFileCachedInfo) {
+            jsIrHeader = jsIrModuleHeader
+            dtsHash = tsDeclarationsHash
+        }
+
+        val moduleHeaderArtifact by lazy(LazyThreadSafetyMode.NONE) { getArtifactWithName(JS_MODULE_HEADER) }
+
+        val jsFileArtifact by lazy(LazyThreadSafetyMode.NONE) { getArtifactWithName(if (isExportFileCachedInfo) CACHED_EXPORT_FILE_JS else CACHED_FILE_JS) }
+        val dtsFileArtifact by lazy(LazyThreadSafetyMode.NONE) { runIf(isExportFileCachedInfo) { getArtifactWithName(CACHED_FILE_D_TS) } }
+        val sourceMapFileArtifact by lazy(LazyThreadSafetyMode.NONE) { runIf(!isExportFileCachedInfo) { getArtifactWithName(CACHED_FILE_JS_MAP) } }
+
+        private fun getArtifactWithName(name: String): File? = moduleArtifact.artifactsDir?.let { File(it, "$filePrefix.$name") }
+
+        private val filePrefix by lazy(LazyThreadSafetyMode.NONE) {
+            val pathHash = fileArtifact.srcFilePath.cityHash64String()
+            "${fileArtifact.srcFilePath.substringAfterLast('/')}.$pathHash"
+        }
+    }
+
+    private val headerToCachedInfo = hashMapOf<JsIrModuleHeader, CachedFileInfo>()
+    private val moduleFragmentToExternalName = ModuleFragmentToExternalName(emptyMap())
+
+    private fun JsIrProgramFragment.getMainFragmentExternalName(moduleArtifact: ModuleArtifact) =
+        moduleFragmentToExternalName.getExternalNameFor(name, packageFqn, moduleArtifact.moduleExternalName)
+
+    private fun JsIrProgramFragment.getExportFragmentExternalName(moduleArtifact: ModuleArtifact) =
+        moduleFragmentToExternalName.getExternalNameForExporterFile(name, packageFqn, moduleArtifact.moduleExternalName)
+
+    private fun JsIrProgramFragment.asIrModuleHeader(moduleName: String): JsIrModuleHeader {
+        return JsIrModuleHeader(
+            moduleName = moduleName,
+            externalModuleName = moduleName,
+            definitions = definitions,
+            nameBindings = nameBindings.mapValues { v -> v.value.toString() },
+            optionalCrossModuleImports = optionalCrossModuleImports,
+            associatedModule = null
+        )
+    }
+
+    private fun SrcFileArtifact.loadJsIrModuleHeaders(moduleArtifact: ModuleArtifact) = with(loadJsIrFragments()) {
+        LoadedJsIrModuleHeaders(
+            mainFragment.run { asIrModuleHeader(getMainFragmentExternalName(moduleArtifact)) },
+            exportFragment?.run { asIrModuleHeader(mainFragment.getExportFragmentExternalName(moduleArtifact)) },
+        )
+    }
+
+    private fun CodedInputStream.loadSingleCachedFileInfo(cachedFileInfo: CachedFileInfo) = cachedFileInfo.also {
+        val moduleName = readString()
+
+        it.crossFileReferencesHash = ICHash.fromProtoStream(this)
+        it.dtsHash = runIf(readBool()) { readInt64() }
+
+        val (definitions, nameBindings, optionalCrossModuleImports) = fetchJsIrModuleHeaderNames()
+
+        it.jsIrHeader = JsIrModuleHeader(
+            moduleName = moduleName,
+            externalModuleName = moduleName,
+            definitions = definitions,
+            nameBindings = nameBindings,
+            optionalCrossModuleImports = optionalCrossModuleImports,
+            associatedModule = null
+        )
+    }
+
+    private fun <T> CachedFileInfo.readModuleHeaderCache(f: CodedInputStream.() -> T): T? = moduleHeaderArtifact?.useCodedInputIfExists(f)
+
+    private fun ModuleArtifact.fetchFileInfoFor(fileArtifact: SrcFileArtifact): List<CachedFileInfo>? {
+        val moduleArtifact = this
+        val mainFileCachedFileInfo = CachedFileInfo(moduleArtifact, fileArtifact)
+
+        return mainFileCachedFileInfo.readModuleHeaderCache {
+            mainFileCachedFileInfo.run {
+                exportFileCachedInfo = fetchFileInfoForExportedPart(this)
+                loadSingleCachedFileInfo(this)
+                listOfNotNull(exportFileCachedInfo, this)
+            }
+        }
+    }
+
+    private fun CodedInputStream.fetchFileInfoForExportedPart(mainCachedFileInfo: CachedFileInfo): CachedFileInfo? {
+        return ifTrue {
+            loadSingleCachedFileInfo(
+                CachedFileInfo(
+                    mainCachedFileInfo.moduleArtifact,
+                    mainCachedFileInfo.fileArtifact,
+                    isExportFileCachedInfo = true
+                )
+            )
+        }
+    }
+
+    private fun CodedOutputStream.commitSingleFileInfo(cachedFileInfo: CachedFileInfo) {
+        writeStringNoTag(cachedFileInfo.jsIrHeader.externalModuleName)
+        cachedFileInfo.crossFileReferencesHash.toProtoStream(this)
+        ifNotNull(cachedFileInfo.dtsHash, ::writeInt64NoTag)
+        commitJsIrModuleHeaderNames(cachedFileInfo.jsIrHeader)
+    }
+
+    private fun CachedFileInfo.commitFileInfo() = runIf(!isExportFileCachedInfo) {
+        moduleHeaderArtifact?.useCodedOutput {
+            ifNotNull(exportFileCachedInfo) { commitSingleFileInfo(it) }
+            commitSingleFileInfo(this@commitFileInfo)
+        }
+    }
+
+    private fun ModuleArtifact.loadFileInfoFor(fileArtifact: SrcFileArtifact): List<CachedFileInfo> {
+        val moduleArtifact = this
+        val headers = fileArtifact.loadJsIrModuleHeaders(moduleArtifact)
+
+        val mainCachedFileInfo = CachedFileInfo(headers.mainHeader, this, fileArtifact)
+
+        if (headers.exportHeader != null) {
+            val tsDeclarationsHash = fileArtifact.loadJsIrFragments().exportFragment?.dts?.raw?.cityHash64()
+            val cachedExportFileInfo = mainCachedFileInfo.readModuleHeaderCache { fetchFileInfoForExportedPart(mainCachedFileInfo) }
+            mainCachedFileInfo.exportFileCachedInfo = if (cachedExportFileInfo?.dtsHash != tsDeclarationsHash) {
+                CachedFileInfo(
+                    headers.exportHeader,
+                    moduleArtifact,
+                    fileArtifact,
+                    tsDeclarationsHash = tsDeclarationsHash,
+                    isExportFileCachedInfo = true
+                )
+            } else {
+                cachedExportFileInfo
+            }
+        }
+
+        return listOfNotNull(mainCachedFileInfo.exportFileCachedInfo, mainCachedFileInfo)
+    }
+
+    private val CachedFileInfo.cachedFiles: CachedFileArtifacts?
+        get() = jsFileArtifact?.let { CachedFileArtifacts(it, sourceMapFileArtifact, dtsFileArtifact) }
+
+    override fun getMainModuleAndDependencies(cacheInfo: List<CachedFileInfo>) = null to cacheInfo
+
+    override fun fetchCompiledJsCodeForNullCacheInfo() = PerFileEntryPointCompilationOutput()
+
+    override fun fetchCompiledJsCode(cacheInfo: CachedFileInfo) =
+        cacheInfo.cachedFiles?.let { (jsCodeFile, sourceMapFile, tsDeclarationsFile) ->
+            jsCodeFile.ifExists { this }
+                ?.let { CompilationOutputsCached(it, sourceMapFile?.ifExists { this }, tsDeclarationsFile?.ifExists { this }) }
+        }
+
+    override fun commitCompiledJsCode(cacheInfo: CachedFileInfo, compilationOutputs: CompilationOutputsBuilt) =
+        cacheInfo.cachedFiles?.let { (jsCodeFile, jsMapFile, tsDeclarationsFile) ->
+            tsDeclarationsFile?.writeIfNotNull(compilationOutputs.tsDefinitions?.raw)
+            compilationOutputs.writeJsCodeIntoModuleCache(jsCodeFile, jsMapFile)
+        } ?: compilationOutputs
+
+    override fun loadJsIrModule(cacheInfo: CachedFileInfo): JsIrModule {
+        val fragments = cacheInfo.fileArtifact.loadJsIrFragments()
+        return JsIrModule(
+            cacheInfo.jsIrHeader.moduleName,
+            cacheInfo.jsIrHeader.externalModuleName,
+            listOf(if (cacheInfo.isExportFileCachedInfo) fragments.exportFragment!! else fragments.mainFragment)
+        )
+    }
+
+    override fun loadProgramHeadersFromCache(): List<CachedFileInfo> {
+        return moduleArtifacts
+            .flatMap { module ->
+                module.fileArtifacts.flatMap {
+                    if (it.isModified())
+                        module.loadFileInfoFor(it)
+                    else
+                        module.fetchFileInfoFor(it) ?: module.loadFileInfoFor(it)
+                }
+            }
+            .onEach { headerToCachedInfo[it.jsIrHeader] = it }
+    }
+
+    override fun loadRequiredJsIrModules(crossModuleReferences: Map<JsIrModuleHeader, CrossModuleReferences>) {
+        for ((header, references) in crossModuleReferences) {
+            val cachedInfo = headerToCachedInfo[header] ?: notFoundIcError("artifact for module ${header.moduleName}")
+
+            val actualCrossModuleHash = references.crossModuleReferencesHashForIC()
+
+            if (header.associatedModule == null && cachedInfo.crossFileReferencesHash != actualCrossModuleHash) {
+                header.associatedModule = loadJsIrModule(cachedInfo)
+            }
+
+            header.associatedModule?.let {
+                cachedInfo.crossFileReferencesHash = actualCrossModuleHash
+                cachedInfo.commitFileInfo()
+            }
+        }
+    }
+
+    private data class CachedFileArtifacts(val jsCodeFile: File, val sourceMapFile: File?, val tsDeclarationsFile: File?)
+    private data class LoadedJsIrModuleHeaders(val mainHeader: JsIrModuleHeader, val exportHeader: JsIrModuleHeader?)
+}
@@ -8,7 +8,7 @@ package org.jetbrains.kotlin.ir.backend.js.ic
 import org.jetbrains.kotlin.ir.backend.js.transformers.irToJs.*
 import java.io.File

-class JsMultiModuleCache(private val moduleArtifacts: List<ModuleArtifact>) {
+class JsPerModuleCache(private val moduleArtifacts: List<ModuleArtifact>) : JsMultiArtifactCache<JsPerModuleCache.CachedModuleInfo>() {
    companion object {
        private const val JS_MODULE_HEADER = "js.module.header.bin"
        private const val CACHED_MODULE_JS = "module.js"
@@ -16,35 +16,18 @@ class JsMultiModuleCache(private val moduleArtifacts: List<ModuleArtifact>) {
        private const val CACHED_MODULE_D_TS = "module.d.ts"
    }

-    private enum class NameType(val typeMask: Int) {
-        DEFINITIONS(0b1), NAME_BINDINGS(0b10), OPTIONAL_IMPORTS(0b100)
-    }
-
-    class CachedModuleInfo(val artifact: ModuleArtifact, val jsIrHeader: JsIrModuleHeader, var crossModuleReferencesHash: ICHash = ICHash())
+    class CachedModuleInfo(
+        val artifact: ModuleArtifact,
+        override val jsIrHeader: JsIrModuleHeader,
+        var crossModuleReferencesHash: ICHash = ICHash()
+    ) : CacheInfo

    private val headerToCachedInfo = hashMapOf<JsIrModuleHeader, CachedModuleInfo>()

    private fun ModuleArtifact.fetchModuleInfo() = File(artifactsDir, JS_MODULE_HEADER).useCodedInputIfExists {
-        val definitions = mutableSetOf<String>()
-        val nameBindings = mutableMapOf<String, String>()
-        val optionalCrossModuleImports = hashSetOf<String>()
-
        val crossModuleReferencesHash = ICHash.fromProtoStream(this)
        val reexportedInModuleWithName = ifTrue { readString() }
-
-        repeat(readInt32()) {
-            val tag = readString()
-            val mask = readInt32()
-            if (mask and NameType.DEFINITIONS.typeMask != 0) {
-                definitions += tag
-            }
-            if (mask and NameType.OPTIONAL_IMPORTS.typeMask != 0) {
-                optionalCrossModuleImports += tag
-            }
-            if (mask and NameType.NAME_BINDINGS.typeMask != 0) {
-                nameBindings[tag] = readString()
-            }
-        }
+        val (definitions, nameBindings, optionalCrossModuleImports) = fetchJsIrModuleHeaderNames()

        CachedModuleInfo(
            artifact = this@fetchModuleInfo,
@@ -63,61 +46,36 @@ class JsMultiModuleCache(private val moduleArtifacts: List<ModuleArtifact>) {

    private fun CachedModuleInfo.commitModuleInfo() = artifact.artifactsDir?.let { cacheDir ->
        File(cacheDir, JS_MODULE_HEADER).useCodedOutput {
-            val names = mutableMapOf<String, Pair<Int, String?>>()
-            for ((tag, name) in jsIrHeader.nameBindings) {
-                names[tag] = NameType.NAME_BINDINGS.typeMask to name
-            }
-            for (tag in jsIrHeader.optionalCrossModuleImports) {
-                val maskAndName = names[tag]
-                names[tag] = ((maskAndName?.first ?: 0) or NameType.OPTIONAL_IMPORTS.typeMask) to maskAndName?.second
-            }
-            for (tag in jsIrHeader.definitions) {
-                val maskAndName = names[tag]
-                names[tag] = ((maskAndName?.first ?: 0) or NameType.DEFINITIONS.typeMask) to maskAndName?.second
-            }
            crossModuleReferencesHash.toProtoStream(this)
-
-            ifNotNull(jsIrHeader.reexportedInModuleWithName) {
-                writeStringNoTag(it)
-            }
-
-            writeInt32NoTag(names.size)
-
-            for ((tag, maskAndName) in names) {
-                writeStringNoTag(tag)
-                writeInt32NoTag(maskAndName.first)
-                if (maskAndName.second != null) {
-                    writeStringNoTag(maskAndName.second)
-                }
-            }
+            ifNotNull(jsIrHeader.reexportedInModuleWithName) { writeStringNoTag(it) }
+            commitJsIrModuleHeaderNames(jsIrHeader)
        }
    }

-    private fun File.writeIfNotNull(data: String?) {
-        if (data != null) {
-            parentFile?.mkdirs()
-            writeText(data)
-        } else {
-            delete()
-        }
-    }
+    override fun loadJsIrModule(cacheInfo: CachedModuleInfo) = cacheInfo.artifact.loadJsIrModule()

-    fun fetchCompiledJsCode(artifact: ModuleArtifact) = artifact.artifactsDir?.let { cacheDir ->
+    override fun getMainModuleAndDependencies(cacheInfo: List<CachedModuleInfo>) =
+        cacheInfo.last() to cacheInfo.dropLast(1)
+
+    override fun fetchCompiledJsCodeForNullCacheInfo() =
+        error("Should never happen for per module granularity")
+
+    override fun fetchCompiledJsCode(cacheInfo: CachedModuleInfo) = cacheInfo.artifact.artifactsDir?.let { cacheDir ->
        val jsCodeFile = File(cacheDir, CACHED_MODULE_JS).ifExists { this }
        val sourceMapFile = File(cacheDir, CACHED_MODULE_JS_MAP).ifExists { this }
        val tsDefinitionsFile = File(cacheDir, CACHED_MODULE_D_TS).ifExists { this }
        jsCodeFile?.let { CompilationOutputsCached(it, sourceMapFile, tsDefinitionsFile) }
    }

-    fun commitCompiledJsCode(artifact: ModuleArtifact, compilationOutputs: CompilationOutputsBuilt): CompilationOutputs =
-        artifact.artifactsDir?.let { cacheDir ->
+    override fun commitCompiledJsCode(cacheInfo: CachedModuleInfo, compilationOutputs: CompilationOutputsBuilt): CompilationOutputs =
+        cacheInfo.artifact.artifactsDir?.let { cacheDir ->
            val jsCodeFile = File(cacheDir, CACHED_MODULE_JS)
            val jsMapFile = File(cacheDir, CACHED_MODULE_JS_MAP)
            File(cacheDir, CACHED_MODULE_D_TS).writeIfNotNull(compilationOutputs.tsDefinitions?.raw)
            compilationOutputs.writeJsCodeIntoModuleCache(jsCodeFile, jsMapFile)
        } ?: compilationOutputs

-    fun loadProgramHeadersFromCache(): List<CachedModuleInfo> {
+    override fun loadProgramHeadersFromCache(): List<CachedModuleInfo> {
        return moduleArtifacts.map { artifact ->
            fun loadModuleInfo() = CachedModuleInfo(artifact, artifact.loadJsIrModule().makeModuleHeader())
            val actualInfo = when {
@@ -130,7 +88,7 @@ class JsMultiModuleCache(private val moduleArtifacts: List<ModuleArtifact>) {
        }
    }

-    fun loadRequiredJsIrModules(crossModuleReferences: Map<JsIrModuleHeader, CrossModuleReferences>) {
+    override fun loadRequiredJsIrModules(crossModuleReferences: Map<JsIrModuleHeader, CrossModuleReferences>) {
        for ((header, references) in crossModuleReferences) {
            val cachedInfo = headerToCachedInfo[header] ?: notFoundIcError("artifact for module ${header.moduleName}")
            val actualCrossModuleHash = references.crossModuleReferencesHashForIC()
@@ -29,13 +29,16 @@ abstract class CompilationOutputs {

    abstract fun writeJsCode(outputJsFile: File, outputJsMapFile: File)

-    fun writeAll(outputDir: File, outputName: String, genDTS: Boolean, moduleName: String, moduleKind: ModuleKind): Collection<File> {
-        val writtenFiles = LinkedHashSet<File>(2 * (dependencies.size + 1) + 1)
+    fun createWrittenFilesContainer(): MutableSet<File> = LinkedHashSet(2 * (dependencies.size + 1) + 1)
+
+    open fun writeAll(outputDir: File, outputName: String, genDTS: Boolean, moduleName: String, moduleKind: ModuleKind): Collection<File> {
+        val writtenFiles = createWrittenFilesContainer()

        fun File.writeAsJsFile(out: CompilationOutputs) {
            parentFile.mkdirs()
            val jsMapFile = mapForJsFile
            val jsFile = normalizedAbsoluteFile
+
            out.writeJsCode(jsFile, jsMapFile)

            writtenFiles += jsFile
@@ -55,9 +58,11 @@ abstract class CompilationOutputs {
            writtenFiles += dtsFile
        }

-        Files.walk(outputDir.toPath()).map { it.toFile() }.filter { it != outputDir && it !in writtenFiles }.forEach(File::delete)
+        return writtenFiles.also { deleteNonWrittenFiles(outputDir, it) }
+    }

-        return writtenFiles
+    fun deleteNonWrittenFiles(outputDir: File, writtenFiles: Set<File>) {
+        Files.walk(outputDir.toPath()).map { it.toFile() }.filter { it != outputDir && it !in writtenFiles }.forEach(File::delete)
    }

    fun getFullTsDefinition(moduleName: String, moduleKind: ModuleKind): String {
@@ -65,13 +70,13 @@ abstract class CompilationOutputs {
        return allTsDefinitions.toTypeScript(moduleName, moduleKind)
    }

-    private val File.normalizedAbsoluteFile
+    protected val File.normalizedAbsoluteFile
        get() = absoluteFile.normalize()

-    private val File.mapForJsFile
+    protected val File.mapForJsFile
        get() = resolveSibling("$name.map").normalizedAbsoluteFile

-    private val File.dtsForJsFile
+    protected val File.dtsForJsFile
        get() = resolveSibling("$nameWithoutExtension.d.ts").normalizedAbsoluteFile
 }

@@ -100,13 +105,47 @@ class CompilationOutputsBuilt(
        outputJsFile.writeText(rawJsCode + sourceMappingUrl)
    }

-    fun writeJsCodeIntoModuleCache(outputJsFile: File, outputJsMapFile: File): CompilationOutputsBuiltForCache {
-        sourceMap?.let { outputJsMapFile.writeText(it) }
+    fun writeJsCodeIntoModuleCache(outputJsFile: File, outputJsMapFile: File?): CompilationOutputsBuiltForCache {
+        sourceMap?.let { outputJsMapFile?.writeText(it) }
        outputJsFile.writeText(rawJsCode)
        return CompilationOutputsBuiltForCache(outputJsFile, outputJsMapFile, this)
    }
 }

+// The output emulates the main module that has all the dependencies. In per-module we expect that the last processed module is a main module
+// and after the compilation we rename it with the provided [outputName] and save all of its dependencies, but with the per-file mode we don't have
+// this last "main" module, as a result we need to emulate it with the output. Also, it helps to save .d.ts files file-by-file instead of the generating
+// one big main .d.ts file
+class PerFileEntryPointCompilationOutput : CompilationOutputs() {
+    override val tsDefinitions: TypeScriptFragment? = null
+    override val jsProgram: JsProgram? = null
+
+    override fun writeJsCode(outputJsFile: File, outputJsMapFile: File) {}
+
+    override fun writeAll(outputDir: File, outputName: String, genDTS: Boolean, moduleName: String, moduleKind: ModuleKind): Collection<File> {
+        val writtenFiles = createWrittenFilesContainer()
+
+        dependencies.forEach { (name, content) ->
+            val dependencyFile = outputDir.resolve("$name${moduleKind.extension}").also { it.parentFile.mkdirs() }
+            val jsMapFile = dependencyFile.mapForJsFile
+            val jsFile = dependencyFile.normalizedAbsoluteFile
+            val tsFile = jsFile.dtsForJsFile
+
+            content.writeJsCode(jsFile, jsMapFile)
+
+            writtenFiles += jsFile
+            writtenFiles += jsMapFile
+
+            content.tsDefinitions.takeIf { genDTS }?.let {
+                tsFile.writeText(listOf(it).toTypeScript(name, moduleKind))
+                writtenFiles += tsFile
+            }
+        }
+
+        return writtenFiles.also { deleteNonWrittenFiles(outputDir, it) }
+    }
+}
+
 class CompilationOutputsCached(
    private val jsCodeFile: File,
    private val sourceMapFile: File?,
@@ -142,7 +181,7 @@ class CompilationOutputsCached(

 class CompilationOutputsBuiltForCache(
    private val jsCodeFile: File,
-    private val sourceMapFile: File,
+    private val sourceMapFile: File?,
    private val outputBuilt: CompilationOutputsBuilt
 ) : CompilationOutputs() {

@@ -160,6 +199,6 @@ class CompilationOutputsBuiltForCache(
        outputBuilt.writeJsCode(outputJsFile, outputJsMapFile)

        jsCodeFile.copyModificationTimeFrom(outputJsFile)
-        sourceMapFile.copyModificationTimeFrom(outputJsMapFile)
+        sourceMapFile?.copyModificationTimeFrom(outputJsMapFile)
    }
 }
@@ -264,12 +264,12 @@ class IrModuleToJsTransformer(

                for (fileExports in module.files) {
                    if (fileExports.file.couldBeSkipped()) continue
-                    val (programFragment, exportProgramFragment) = generateProgramFragment(fileExports, mode)
+                    val programFragments = generateProgramFragment(fileExports, mode)

-                    add(fileExports.toJsIrModule(mode, programFragment))
+                    add(fileExports.toJsIrModule(programFragments.mainFragment))

-                    if (fileExports.exports.isNotEmpty()) {
-                        add(fileExports.toJsIrModuleForExport(module, mode, exportProgramFragment))
+                    programFragments.exportFragment?.let {
+                        add(fileExports.toJsIrModuleForExport(module, it))
                        hasFileWithJsExportedDeclaration = true
                    }
                }
@@ -283,22 +283,18 @@ class IrModuleToJsTransformer(
        return JsIrProgram(modulesPerFile)
    }

-    private fun IrFileExports.toJsIrModule(mode: TranslationMode, programFragment: JsIrProgramFragment): JsIrModule {
+    private fun IrFileExports.toJsIrModule(programFragment: JsIrProgramFragment): JsIrModule {
        return JsIrModule(
            moduleFragmentToNameMapper.getSafeNameFor(file),
-            moduleFragmentToNameMapper.getExternalNameFor(file, mode.granularity),
+            moduleFragmentToNameMapper.getExternalNameFor(file),
            listOf(programFragment),
        )
    }

-    private fun IrFileExports.toJsIrModuleForExport(
-        module: IrAndExportedDeclarations,
-        mode: TranslationMode,
-        programFragment: JsIrProgramFragment
-    ): JsIrModule {
+    private fun IrFileExports.toJsIrModuleForExport(module: IrAndExportedDeclarations, programFragment: JsIrProgramFragment): JsIrModule {
        return JsIrModule(
            moduleFragmentToNameMapper.getSafeNameExporterFor(file),
-            moduleFragmentToNameMapper.getExternalNameForExporterFile(file, mode.granularity),
+            moduleFragmentToNameMapper.getExternalNameForExporterFile(file),
            listOf(programFragment),
            module.fragment.safeName
        )
@@ -308,7 +304,7 @@ class IrModuleToJsTransformer(
        return JsIrModule(
            fragment.safeName,
            moduleFragmentToNameMapper.getExternalNameFor(fragment),
-            listOf(JsIrProgramFragment("<proxy-file>"))
+            listOf(JsIrProgramFragment(fragment.safeName, "<proxy-file>"))
        )
    }

@@ -319,22 +315,21 @@ class IrModuleToJsTransformer(
    private fun IrFileExports.generateProgramFragmentForExport(
        mode: TranslationMode,
        nameScope: NameTable<IrDeclaration>
-    ): JsIrProgramFragment {
+    ): JsIrProgramFragment? {
+        if (exports.isEmpty()) return null
+
        val globalNames = NameTable<String>(nameScope)
        val nameGenerator = JsNameLinkingNamer(backendContext, mode.minimizedMemberNames, isEsModules)
        val internalModuleName = ReservedJsNames.makeInternalModuleName().takeIf { !isEsModules }
        val staticContext = JsStaticContext(backendContext, nameGenerator, nameScope, mode)

-        return JsIrProgramFragment(file.packageFqName.asString()).apply {
-            dts = tsDeclarations
-            exports.statements += ExportModelToJsStatements(staticContext, backendContext.es6mode, { globalNames.declareFreshName(it, it) })
-                .generateModuleExport(
-                    ExportedModule(mainModuleName, moduleKind, this@generateProgramFragmentForExport.exports),
-                    internalModuleName,
-                    isEsModules
-                )
-            computeAndSaveNameBindings(emptySet(), nameGenerator)
-        }
+        return JsIrProgramFragment("", file.packageFqName.asString())
+            .also {
+                it.dts = tsDeclarations
+                it.exports.statements += ExportModelToJsStatements(staticContext, backendContext.es6mode, { globalNames.declareFreshName(it, it) })
+                    .generateModuleExport(ExportedModule(mainModuleName, moduleKind, exports), internalModuleName, isEsModules)
+                it.computeAndSaveNameBindings(emptySet(), nameGenerator)
+            }
    }

    private fun generateProgramFragment(fileExports: IrFileExports, mode: TranslationMode): List<JsIrProgramFragment> {
@@ -342,7 +337,10 @@ class IrModuleToJsTransformer(
        val nameGenerator = JsNameLinkingNamer(backendContext, mode.minimizedMemberNames, isEsModules)
        val staticContext = JsStaticContext(backendContext, nameGenerator, globalNameScope, mode)

-        val result = JsIrProgramFragment(fileExports.file.packageFqName.asString()).apply {
+        val result = JsIrProgramFragment(
+            fileExports.file.getJsName() ?: fileExports.file.nameWithoutExtension,
+            fileExports.file.packageFqName.asString()
+        ).apply {
            if (shouldGeneratePolyfills) {
                polyfills.statements += backendContext.polyfills.getAllPolyfillsFor(fileExports.file)
            }
@@ -415,7 +413,7 @@ class IrModuleToJsTransformer(
            optimizeFragmentByJsAst(result)
        }

-        return listOf(result, exportFragment)
+        return listOfNotNull(result, exportFragment)
    }

    private fun Set<IrDeclaration>.computeTag(declaration: IrDeclaration): String? {
@@ -5,13 +5,14 @@

 package org.jetbrains.kotlin.ir.backend.js.transformers.irToJs

+import org.jetbrains.kotlin.backend.common.serialization.cityHash64String
 import org.jetbrains.kotlin.ir.backend.js.export.TypeScriptFragment
 import org.jetbrains.kotlin.ir.backend.js.utils.toJsIdentifier
 import org.jetbrains.kotlin.js.backend.ast.*
 import java.io.File
 import org.jetbrains.kotlin.serialization.js.ModuleKind

-class JsIrProgramFragment(val packageFqn: String) {
+class JsIrProgramFragment(val name: String, val packageFqn: String) {
    val nameBindings = mutableMapOf<String, JsName>()
    val optionalCrossModuleImports = hashSetOf<String>()
    val declarations = JsCompositeBlock()
@@ -150,7 +151,14 @@ private class JsIrModuleCrossModuleReferenceBuilder(

    fun buildExportNames(startIndex: Int = 0) {
        var index = startIndex
-        exportNames = exports.sorted().associateWith { index++.toJsIdentifier() }
+        exportNames = exports.sorted().associateWith { tag ->
+            // Bundlers should minimize the names by ourselves. Ex, webpack has `optimization.mangleExports` property
+            if (moduleKind == ModuleKind.ES) {
+                "${header.nameBindings[tag]}${tag.cityHash64String()}"
+            } else {
+                index++.toJsIdentifier()
+            }
+        }
    }

    fun buildCrossModuleRefs(): CrossModuleReferences {
@@ -267,4 +275,7 @@ fun JsStatement.renameImportedSymbolInternalName(newName: JsName): JsStatement {
        is JsVars -> JsVars(JsVars.JsVar(newName, vars.single().initExpression))
        else -> error("Unexpected cross-module import statement ${this::class.qualifiedName}")
    }
-}
+}
+
+val List<JsIrProgramFragment>.mainFragment: JsIrProgramFragment get() = first()
+val List<JsIrProgramFragment>.exportFragment: JsIrProgramFragment? get() = getOrNull(1)
@@ -41,7 +41,7 @@ class Merger(
                        error("Missing name for declaration '${declaration}'")
                    }

-                    importStatements.putIfAbsent(declaration, rename(importStatement).importStatementWithName(importName))
+                    importStatements.putIfAbsent(declaration, rename(importStatement.importStatementWithName(importName)))
                }

                val classModels = (mutableMapOf<JsName, JsIrIcClassModel>() + f.classes)
@@ -6,10 +6,10 @@
 package org.jetbrains.kotlin.ir.backend.js.transformers.irToJs

 import org.jetbrains.kotlin.ir.backend.js.utils.getJsName
+import org.jetbrains.kotlin.ir.backend.js.utils.nameWithoutExtension
 import org.jetbrains.kotlin.ir.backend.js.utils.sanitizeName
 import org.jetbrains.kotlin.ir.declarations.IrFile
 import org.jetbrains.kotlin.ir.declarations.IrModuleFragment
-import org.jetbrains.kotlin.ir.declarations.name
 import org.jetbrains.kotlin.ir.declarations.path

 private const val EXPORTER_FILE_POSTFIX = ".export"
@@ -17,9 +17,8 @@ private const val EXPORTER_FILE_POSTFIX = ".export"
 class ModuleFragmentToExternalName(private val jsOutputNamesMapping: Map<IrModuleFragment, String>) {
    private val externalNameToItsFile = hashMapOf<String, IrFile>()

-    fun getExternalNameFor(file: IrFile, granularity: JsGenerationGranularity): String {
-        assert(granularity == JsGenerationGranularity.PER_FILE) { "This method should be used only for PER_FILE granularity" }
-        return file.module.getJsOutputName().getExternalModuleNameForPerFile(file).also {
+    fun getExternalNameFor(file: IrFile): String {
+        return getExternalNameFor(file.outputName, file.packageFqName.asString(), file.module.getJsOutputName()).also {
            val alreadyReservedBy = externalNameToItsFile.putIfAbsent(it.lowercase(), file)

            if (alreadyReservedBy != null && alreadyReservedBy != file) {
@@ -35,8 +34,16 @@ class ModuleFragmentToExternalName(private val jsOutputNamesMapping: Map<IrModul
        }
    }

-    fun getExternalNameForExporterFile(file: IrFile, granularity: JsGenerationGranularity): String {
-        return "${getExternalNameFor(file, granularity)}$EXPORTER_FILE_POSTFIX"
+    fun getExternalNameFor(fileName: String, packageFqn: String, moduleName: String): String {
+        return "$moduleName/${getFileStableName(fileName, packageFqn)}"
+    }
+
+    fun getExternalNameForExporterFile(file: IrFile): String {
+        return getExternalNameForExporterFile(file.outputName, file.packageFqName.asString(), file.module.getJsOutputName())
+    }
+
+    fun getExternalNameForExporterFile(fileName: String, packageFqn: String, moduleName: String): String {
+        return "${getExternalNameFor(fileName, packageFqn, moduleName)}$EXPORTER_FILE_POSTFIX"
    }

    fun getSafeNameFor(file: IrFile): String {
@@ -55,12 +62,11 @@ class ModuleFragmentToExternalName(private val jsOutputNamesMapping: Map<IrModul
        return jsOutputNamesMapping[this] ?: sanitizeName(safeName)
    }

-    private fun String.getExternalModuleNameForPerFile(file: IrFile) = "$this/${file.stableFileName}"
+    private fun getFileStableName(fileName: String, packageFqn: String): String {
+        val prefix = packageFqn.replace('.', '/')
+        return "$prefix${if (prefix.isNotEmpty()) "/" else ""}$fileName"
+    }

-    private val IrFile.stableFileName: String
-        get() {
-            val prefix = packageFqName.asString().replace('.', '/')
-            val fileName = getJsName() ?: name.substringBefore(".kt")
-            return "$prefix${if (prefix.isNotEmpty()) "/" else ""}$fileName"
-        }
+    private val IrFile.outputName: String get() = getJsName() ?: nameWithoutExtension
+    private val IrFile.stableFileName: String get() = getFileStableName(outputName, packageFqName.asString())
 }
@@ -35,6 +35,8 @@ import org.jetbrains.kotlin.js.backend.ast.JsNameRef
 import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.utils.filterIsInstanceAnd

+val IrFile.nameWithoutExtension: String get() = name.substringBeforeLast(".kt")
+
 fun IrClass.jsConstructorReference(context: JsIrBackendContext): IrExpression {
    return JsIrBuilder.buildCall(context.intrinsics.jsClass, origin = JsStatementOrigins.CLASS_REFERENCE)
        .apply { putTypeArgument(0, defaultType) }
@@ -81,7 +81,7 @@ private class JsIrAstDeserializer(private val source: ByteArray) {
    }

    fun readFragment(): JsIrProgramFragment {
-        return JsIrProgramFragment(readString()).apply {
+        return JsIrProgramFragment(readString(), readString()).apply {
            readRepeated {
                importedModules += JsImportedModule(
                    externalName = stringTable[readInt()],
@@ -114,6 +114,7 @@ private class JsIrAstSerializer {
    }

    private fun DataWriter.writeFragment(fragment: JsIrProgramFragment) {
+        writeString(fragment.name)
        writeString(fragment.packageFqn)

        writeCollection(fragment.importedModules) {
@@ -216,6 +216,9 @@ public fun cityHash64(s: ByteArray, pos: Int = 0, len: Int = s.size): ULong {
 fun String.cityHash64(): Long =
    cityHash64(this.toByteArray()).toLong()

+fun String.cityHash64String(): String =
+    cityHash64(this.toByteArray()).toString(Character.MAX_RADIX)
+
 data class Hash128Bits(val lowBytes: ULong = k0, val highBytes: ULong = k1) {
    private infix fun ULong.combineHash(other: ULong) = other xor (this + kGoldenRatio + (other shl 12) + (other shr 4))

@@ -6,13 +6,27 @@
 package org.jetbrains.kotlin.codegen

 import org.jetbrains.kotlin.ir.backend.js.ic.DirtyFileState
+import org.jetbrains.kotlin.ir.backend.js.transformers.irToJs.JsGenerationGranularity
 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, val moduleKind: ModuleKind) {
+class ProjectInfo(
+    val name: String,
+    val modules: List<String>,
+    val steps: List<ProjectBuildStep>,
+    val muted: Boolean,
+    val moduleKind: ModuleKind,
+    val ignoredGranularities: Set<JsGenerationGranularity>
+) {

-    class ProjectBuildStep(val id: Int, val order: List<String>, val dirtyJS: List<String>, val language: List<String>)
+    class ProjectBuildStep(
+        val id: Int,
+        val order: List<String>,
+        val dirtyJsFiles: List<String>,
+        val dirtyJsModules: List<String>,
+        val language: List<String>,
+    )
 }

 class ModuleInfo(val moduleName: String) {
@@ -60,8 +74,11 @@ 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 DIRTY_JS_FILES_LIST = "dirty js files"
+private const val DIRTY_JS_MODULES_LIST = "dirty js modules"
 private const val LANGUAGE = "language"
+private const val IGNORE_PER_FILE = "IGNORE_PER_FILE"
+private const val IGNORE_PER_MODULE = "IGNORE_PER_MODULE"

 const val MODULE_INFO_FILE = "module.info"
 private const val DEPENDENCIES = "dependencies"
@@ -119,7 +136,8 @@ class ProjectInfoParser(infoFile: File) : InfoParser<ProjectInfo>(infoFile) {

    private fun parseSteps(firstId: Int, lastId: Int): List<ProjectInfo.ProjectBuildStep> {
        val order = mutableListOf<String>()
-        val dirtyJS = mutableListOf<String>()
+        val dirtyJsFiles = mutableListOf<String>()
+        val dirtyJsModules = mutableListOf<String>()
        val language = mutableListOf<String>()

        loop { line ->
@@ -138,7 +156,8 @@ class ProjectInfoParser(infoFile: File) : InfoParser<ProjectInfo>(infoFile) {

            when (op) {
                LIBS_LIST -> order += split[1].splitAndTrim()
-                DIRTY_JS_MODULES_LIST -> dirtyJS += split[1].splitAndTrim()
+                DIRTY_JS_FILES_LIST -> dirtyJsFiles += split[1].splitAndTrim()
+                DIRTY_JS_MODULES_LIST -> dirtyJsModules += split[1].splitAndTrim()
                LANGUAGE -> language += split[1].splitAndTrim()
                else -> println(diagnosticMessage("Unknown op $op", line))
            }
@@ -146,12 +165,13 @@ class ProjectInfoParser(infoFile: File) : InfoParser<ProjectInfo>(infoFile) {
            false
        }

-        return (firstId..lastId).map { ProjectInfo.ProjectBuildStep(it, order, dirtyJS, language) }
+        return (firstId..lastId).map { ProjectInfo.ProjectBuildStep(it, order, dirtyJsFiles, dirtyJsModules, language) }
    }

    override fun parse(entryName: String): ProjectInfo {
        val libraries = mutableListOf<String>()
        val steps = mutableListOf<ProjectInfo.ProjectBuildStep>()
+        val ignoredGranularities = mutableSetOf<JsGenerationGranularity>()
        var muted = false
        var moduleKind = ModuleKind.ES

@@ -171,6 +191,8 @@ class ProjectInfoParser(infoFile: File) : InfoParser<ProjectInfo>(infoFile) {

            when {
                op == MODULES_LIST -> libraries += split[1].splitAndTrim()
+                op == IGNORE_PER_FILE && split[1].trim() == "true" -> ignoredGranularities += JsGenerationGranularity.PER_FILE
+                op == IGNORE_PER_MODULE && split[1].trim() == "true" -> ignoredGranularities += JsGenerationGranularity.PER_MODULE
                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'") }
@@ -200,7 +222,7 @@ class ProjectInfoParser(infoFile: File) : InfoParser<ProjectInfo>(infoFile) {
            false
        }

-        return ProjectInfo(entryName, libraries, steps, muted, moduleKind)
+        return ProjectInfo(entryName, libraries, steps, muted, moduleKind, ignoredGranularities)
    }
 }

@@ -7,10 +7,7 @@ package org.jetbrains.kotlin.generators.tests

 import org.jetbrains.kotlin.generators.generateTestGroupSuiteWithJUnit5
 import org.jetbrains.kotlin.generators.impl.generateTestGroupSuite
-import org.jetbrains.kotlin.incremental.AbstractJsIrES6InvalidationTest
-import org.jetbrains.kotlin.incremental.AbstractJsIrInvalidationWithPLTest
-import org.jetbrains.kotlin.incremental.AbstractJsIrInvalidationTest
-import org.jetbrains.kotlin.incremental.AbstractJsFirInvalidationTest
+import org.jetbrains.kotlin.incremental.*
 import org.jetbrains.kotlin.js.test.*
 import org.jetbrains.kotlin.js.test.fir.*
 import org.jetbrains.kotlin.js.test.ir.*
@@ -73,19 +70,35 @@ fun main(args: Array<String>) {
        }

        testGroup("js/js.tests/tests-gen", "js/js.translator/testData") {
-            testClass<AbstractJsIrInvalidationTest> {
+            testClass<AbstractJsIrInvalidationPerFileTest> {
                model("incremental/invalidation/", pattern = "^([^_](.+))$", targetBackend = TargetBackend.JS_IR, recursive = false)
            }

-            testClass<AbstractJsIrES6InvalidationTest> {
+            testClass<AbstractJsIrInvalidationPerModuleTest> {
+                model("incremental/invalidation/", pattern = "^([^_](.+))$", targetBackend = TargetBackend.JS_IR, recursive = false)
+            }
+
+            testClass<AbstractJsIrES6InvalidationPerFileTest> {
                model("incremental/invalidation/", pattern = "^([^_](.+))$", targetBackend = TargetBackend.JS_IR_ES6, recursive = false)
            }

-            testClass<AbstractJsFirInvalidationTest> {
+            testClass<AbstractJsIrES6InvalidationPerModuleTest> {
+                model("incremental/invalidation/", pattern = "^([^_](.+))$", targetBackend = TargetBackend.JS_IR_ES6, recursive = false)
+            }
+
+            testClass<AbstractJsFirInvalidationPerFileTest> {
                model("incremental/invalidation/", pattern = "^([^_](.+))$", targetBackend = TargetBackend.JS_IR, recursive = false)
            }

-            testClass<AbstractJsIrInvalidationWithPLTest> {
+            testClass<AbstractJsFirInvalidationPerModuleTest> {
+                model("incremental/invalidation/", pattern = "^([^_](.+))$", targetBackend = TargetBackend.JS_IR, recursive = false)
+            }
+
+            testClass<AbstractJsIrInvalidationPerFileWithPLTest> {
+                model("incremental/invalidationWithPL/", pattern = "^([^_](.+))$", targetBackend = TargetBackend.JS_IR, recursive = false)
+            }
+
+            testClass<AbstractJsIrInvalidationPerModuleWithPLTest> {
                model("incremental/invalidationWithPL/", pattern = "^([^_](.+))$", targetBackend = TargetBackend.JS_IR, recursive = false)
            }
        }
@@ -26,8 +26,8 @@ import org.jetbrains.kotlin.ir.backend.js.WholeWorldStageController
 import org.jetbrains.kotlin.ir.backend.js.ic.*
 import org.jetbrains.kotlin.ir.backend.js.jsPhases
 import org.jetbrains.kotlin.ir.backend.js.transformers.irToJs.CompilationOutputs
-import org.jetbrains.kotlin.ir.backend.js.transformers.irToJs.extension
 import org.jetbrains.kotlin.ir.backend.js.transformers.irToJs.JsGenerationGranularity
+import org.jetbrains.kotlin.ir.backend.js.transformers.irToJs.extension
 import org.jetbrains.kotlin.ir.backend.js.transformers.irToJs.safeModuleName
 import org.jetbrains.kotlin.ir.declarations.impl.IrFactoryImplForJsIC
 import org.jetbrains.kotlin.js.config.JSConfigurationKeys
@@ -49,7 +49,11 @@ import org.junit.jupiter.api.AfterEach
 import java.io.File
 import java.util.*

-abstract class AbstractInvalidationTest(private val targetBackend: TargetBackend, private val workingDirPath: String) {
+abstract class AbstractInvalidationTest(
+    private val targetBackend: TargetBackend,
+    private val granularity: JsGenerationGranularity,
+    private val workingDirPath: String
+) {
    companion object {
        private val OUT_DIR_PATH = System.getProperty("kotlin.js.test.root.out.dir") ?: error("'kotlin.js.test.root.out.dir' is not set")
        private val STDLIB_KLIB = File(System.getProperty("kotlin.js.stdlib.klib.path") ?: error("Please set stdlib path")).canonicalPath
@@ -153,16 +157,18 @@ abstract class AbstractInvalidationTest(private val targetBackend: TargetBackend
        private val testDir: File,
        private val sourceDir: File,
        private val buildDir: File,
-        private val jsDir: File
+        private val jsDir: File,
    ) {
        private inner class TestStepInfo(
            val moduleName: String,
            val modulePath: String,
            val friends: List<String>,
            val expectedFileStats: Map<String, Set<String>>,
-            val expectedDTS: String?
+            val expectedDTS: ExpectedFile?,
        )

+        private inner class ExpectedFile(val name: String, val content: String)
+
        private fun setupTestStep(projStep: ProjectInfo.ProjectBuildStep, module: String): TestStepInfo {
            val projStepId = projStep.id
            val moduleTestDir = File(testDir, module)
@@ -198,7 +204,7 @@ abstract class AbstractInvalidationTest(private val targetBackend: TargetBackend
                outputKlibFile.canonicalPath,
                friends.map { it.canonicalPath },
                moduleStep.expectedFileStats,
-                dtsFile?.readText()
+                dtsFile?.let { ExpectedFile(moduleStep.expectedDTS.single(), it.readText()) }
            )
        }

@@ -234,7 +240,7 @@ abstract class AbstractInvalidationTest(private val targetBackend: TargetBackend
        }

        private fun verifyJsExecutableProducerBuildModules(stepId: Int, gotRebuilt: List<String>, expectedRebuilt: List<String>) {
-            val got = gotRebuilt.filter { it != STDLIB_MODULE_NAME }
+            val got = gotRebuilt.filter { !it.startsWith(STDLIB_MODULE_NAME) }
            JUnit4Assertions.assertSameElements(got, expectedRebuilt) {
                "Mismatched rebuilt modules at step $stepId"
            }
@@ -255,16 +261,20 @@ abstract class AbstractInvalidationTest(private val targetBackend: TargetBackend
        }

        private fun verifyJsCode(stepId: Int, mainModuleName: String, jsFiles: List<String>) {
+            val testModuleName = "./$mainModuleName${projectInfo.moduleKind.extension}"
            try {
                V8IrJsTestChecker.checkWithTestFunctionArgs(
                    files = jsFiles,
-                    testModuleName = "./$mainModuleName${projectInfo.moduleKind.extension}",
+                    testModuleName = testModuleName,
                    testPackageName = null,
                    testFunctionName = BOX_FUNCTION_NAME,
                    testFunctionArgs = "$stepId",
                    expectedResult = "OK",
-                    entryModulePath = jsFiles.last(),
-                    withModuleSystem = projectInfo.moduleKind in setOf(ModuleKind.COMMON_JS, ModuleKind.UMD, ModuleKind.AMD)
+                    withModuleSystem = projectInfo.moduleKind in setOf(ModuleKind.COMMON_JS, ModuleKind.UMD, ModuleKind.AMD),
+                    entryModulePath = when (granularity) {
+                        JsGenerationGranularity.PER_FILE -> jsFiles.find { it.endsWith("m.export.mjs") }
+                        else -> jsFiles.last()
+                    }
                )
            } catch (e: ComparisonFailure) {
                throw ComparisonFailure("Mismatched box out at step $stepId", e.expected, e.actual)
@@ -275,15 +285,20 @@ abstract class AbstractInvalidationTest(private val targetBackend: TargetBackend

        private fun verifyDTS(stepId: Int, testInfo: List<TestStepInfo>) {
            for (info in testInfo) {
+                val moduleName = File(info.modulePath).nameWithoutExtension
                val expectedDTS = info.expectedDTS ?: continue
+                val dtsFilePath = when (granularity) {
+                    JsGenerationGranularity.PER_FILE -> "$moduleName/${expectedDTS.name.substringBefore('.')}.export.d.ts"
+                    else -> "$moduleName.d.ts"
+                }

-                val dtsFile = jsDir.resolve("${File(info.modulePath).nameWithoutExtension}.d.ts")
+                val dtsFile = jsDir.resolve(dtsFilePath)
                JUnit4Assertions.assertTrue(dtsFile.exists()) {
                    "Cannot find d.ts (${dtsFile.absolutePath}) file for module ${info.moduleName} at step $stepId"
                }

                val gotDTS = dtsFile.readText()
-                JUnit4Assertions.assertEquals(expectedDTS, gotDTS) {
+                JUnit4Assertions.assertEquals(expectedDTS.content, gotDTS) {
                    "Mismatched d.ts for module ${info.moduleName} at step $stepId"
                }
            }
@@ -302,13 +317,22 @@ abstract class AbstractInvalidationTest(private val targetBackend: TargetBackend
        }

        private fun writeJsCode(stepId: Int, mainModuleName: String, jsOutput: CompilationOutputs): List<String> {
-            val compiledJsFiles = jsOutput.writeAll(jsDir, mainModuleName, true, mainModuleName, projectInfo.moduleKind).filter {
+            val compiledJsFiles = jsOutput.writeAll(
+                jsDir,
+                mainModuleName,
+                true,
+                mainModuleName,
+                projectInfo.moduleKind
+            ).filter {
                it.extension == "js" || it.extension == "mjs"
            }
            for (jsCodeFile in compiledJsFiles) {
                val sourceMappingUrlLine = jsCodeFile.readLines().singleOrNull { it.startsWith(SOURCE_MAPPING_URL_PREFIX) }
-                JUnit4Assertions.assertEquals("$SOURCE_MAPPING_URL_PREFIX${jsCodeFile.name}.map", sourceMappingUrlLine) {
-                    "Mismatched source map url at step $stepId"
+
+                if (sourceMappingUrlLine != null) {
+                    JUnit4Assertions.assertEquals("$SOURCE_MAPPING_URL_PREFIX${jsCodeFile.name}.map", sourceMappingUrlLine) {
+                        "Mismatched source map url at step $stepId"
+                    }
                }

                jsCodeFile.writeAsJsModule(jsCodeFile.readText(), "./${jsCodeFile.name}")
@@ -318,6 +342,8 @@ abstract class AbstractInvalidationTest(private val targetBackend: TargetBackend
        }

        fun execute() {
+            if (granularity in projectInfo.ignoredGranularities) return
+
            for (projStep in projectInfo.steps) {
                val testInfo = projStep.order.map { setupTestStep(projStep, it) }

@@ -327,6 +353,12 @@ abstract class AbstractInvalidationTest(private val targetBackend: TargetBackend
                }

                val configuration = createConfiguration(projStep.order.last(), projStep.language, projectInfo.moduleKind)
+
+                val dirtyData = when (granularity) {
+                    JsGenerationGranularity.PER_FILE -> projStep.dirtyJsFiles
+                    else -> projStep.dirtyJsModules
+                }
+
                val cacheUpdater = CacheUpdater(
                    mainModule = mainModuleInfo.modulePath,
                    allModules = testInfo.mapTo(mutableListOf(STDLIB_KLIB)) { it.modulePath },
@@ -339,7 +371,7 @@ abstract class AbstractInvalidationTest(private val targetBackend: TargetBackend
                        JsIrCompilerWithIC(
                            mainModule,
                            cfg,
-                            JsGenerationGranularity.PER_MODULE,
+                            granularity,
                            getPhaseConfig(projStep.id),
                            setOf(FqName(BOX_FUNCTION_NAME)),
                            targetBackend == TargetBackend.JS_IR_ES6
@@ -361,10 +393,10 @@ abstract class AbstractInvalidationTest(private val targetBackend: TargetBackend
                    relativeRequirePath = true
                )

-                val (jsOutput, rebuiltModules) = jsExecutableProducer.buildExecutable(granularity = JsGenerationGranularity.PER_MODULE, outJsProgram = true)
+                val (jsOutput, rebuiltModules) = jsExecutableProducer.buildExecutable(granularity, outJsProgram = true)
                val writtenFiles = writeJsCode(projStep.id, mainModuleName, jsOutput)

-                verifyJsExecutableProducerBuildModules(projStep.id, rebuiltModules, projStep.dirtyJS)
+                verifyJsExecutableProducerBuildModules(projStep.id, rebuiltModules, dirtyData)
                verifyJsCode(projStep.id, mainModuleName, writtenFiles)
                verifyDTS(projStep.id, testInfo)
            }
@@ -426,6 +458,6 @@ abstract class AbstractInvalidationTest(private val targetBackend: TargetBackend
        sourceDir: File,
        dependencies: Collection<File>,
        friends: Collection<File>,
-        outputKlibFile: File
+        outputKlibFile: File,
    )
 }
@@ -14,18 +14,23 @@ import org.jetbrains.kotlin.config.CompilerConfiguration
 import org.jetbrains.kotlin.diagnostics.DiagnosticReporterFactory
 import org.jetbrains.kotlin.ir.backend.js.MainModule
 import org.jetbrains.kotlin.ir.backend.js.ModulesStructure
+import org.jetbrains.kotlin.ir.backend.js.transformers.irToJs.JsGenerationGranularity
 import org.jetbrains.kotlin.test.TargetBackend
 import java.io.ByteArrayOutputStream
 import java.io.File
 import java.io.PrintStream
 import java.nio.charset.Charset

-abstract class AbstractJsFirInvalidationTest : FirAbstractInvalidationTest(TargetBackend.JS_IR, "incrementalOut/invalidationFir")
+abstract class AbstractJsFirInvalidationPerFileTest :
+    FirAbstractInvalidationTest(TargetBackend.JS_IR, JsGenerationGranularity.PER_FILE, "incrementalOut/invalidationFir/perFile")
+abstract class AbstractJsFirInvalidationPerModuleTest :
+    FirAbstractInvalidationTest(TargetBackend.JS_IR, JsGenerationGranularity.PER_MODULE, "incrementalOut/invalidationFir/perModule")

 abstract class FirAbstractInvalidationTest(
    targetBackend: TargetBackend,
+    granularity: JsGenerationGranularity,
    workingDirPath: String
-) : AbstractInvalidationTest(targetBackend, workingDirPath) {
+) : AbstractInvalidationTest(targetBackend, granularity, workingDirPath) {
    private fun getFirInfoFile(defaultInfoFile: File): File {
        val firInfoFileName = "${defaultInfoFile.nameWithoutExtension}.fir.${defaultInfoFile.extension}"
        val firInfoFile = defaultInfoFile.parentFile.resolve(firInfoFileName)
@@ -10,6 +10,7 @@ import org.jetbrains.kotlin.cli.js.klib.generateIrForKlibSerialization
 import org.jetbrains.kotlin.config.CompilerConfiguration
 import org.jetbrains.kotlin.descriptors.DeclarationDescriptor
 import org.jetbrains.kotlin.ir.backend.js.*
+import org.jetbrains.kotlin.ir.backend.js.transformers.irToJs.JsGenerationGranularity
 import org.jetbrains.kotlin.ir.declarations.impl.IrFactoryImpl
 import org.jetbrains.kotlin.ir.linkage.partial.PartialLinkageConfig
 import org.jetbrains.kotlin.ir.linkage.partial.PartialLinkageLogLevel
@@ -20,20 +21,45 @@ import org.jetbrains.kotlin.serialization.js.ModuleKind
 import org.jetbrains.kotlin.test.TargetBackend
 import java.io.File

-abstract class AbstractJsIrInvalidationTest : IrAbstractInvalidationTest(
+abstract class AbstractJsIrInvalidationPerFileTest : IrAbstractInvalidationTest(
    targetBackend = TargetBackend.JS_IR,
-    workingDirPath = "incrementalOut/invalidation"
+    granularity = JsGenerationGranularity.PER_FILE,
+    workingDirPath = "incrementalOut/invalidation/perFile"
 )

-abstract class AbstractJsIrES6InvalidationTest : IrAbstractInvalidationTest(
+abstract class AbstractJsIrInvalidationPerModuleTest : IrAbstractInvalidationTest(
+    targetBackend = TargetBackend.JS_IR,
+    granularity = JsGenerationGranularity.PER_MODULE,
+    workingDirPath = "incrementalOut/invalidation/perModule"
+)
+
+abstract class AbstractJsIrES6InvalidationPerFileTest : IrAbstractInvalidationTest(
    targetBackend = TargetBackend.JS_IR_ES6,
-    workingDirPath = "incrementalOut/invalidationES6"
+    granularity = JsGenerationGranularity.PER_FILE,
+    workingDirPath = "incrementalOut/invalidationES6/perFile"
 )

-abstract class AbstractJsIrInvalidationWithPLTest : IrAbstractInvalidationTest(
-    targetBackend = TargetBackend.JS_IR,
-    workingDirPath = "incrementalOut/invalidationWithPL"
-) {
+abstract class AbstractJsIrES6InvalidationPerModuleTest : IrAbstractInvalidationTest(
+    targetBackend = TargetBackend.JS_IR_ES6,
+    granularity = JsGenerationGranularity.PER_MODULE,
+    workingDirPath = "incrementalOut/invalidationES6/perModule"
+)
+
+abstract class AbstractJsIrInvalidationPerFileWithPLTest : AbstractJsIrInvalidationWithPLTest(
+    granularity = JsGenerationGranularity.PER_FILE,
+    workingDirPath = "incrementalOut/invalidationWithPL/perModule"
+)
+
+abstract class AbstractJsIrInvalidationPerModuleWithPLTest : AbstractJsIrInvalidationWithPLTest(
+    granularity = JsGenerationGranularity.PER_MODULE,
+    workingDirPath = "incrementalOut/invalidationWithPL/perModule"
+)
+
+abstract class AbstractJsIrInvalidationWithPLTest(granularity: JsGenerationGranularity, workingDirPath: String) : IrAbstractInvalidationTest(
+        TargetBackend.JS_IR,
+        granularity,
+        workingDirPath
+    ) {
    override fun createConfiguration(moduleName: String, language: List<String>, moduleKind: ModuleKind): CompilerConfiguration {
        val config = super.createConfiguration(moduleName, language, moduleKind)
        config.setupPartialLinkageConfig(PartialLinkageConfig(PartialLinkageMode.ENABLE, PartialLinkageLogLevel.WARNING))
@@ -43,8 +69,9 @@ abstract class AbstractJsIrInvalidationWithPLTest : IrAbstractInvalidationTest(

 abstract class IrAbstractInvalidationTest(
    targetBackend: TargetBackend,
+    granularity: JsGenerationGranularity,
    workingDirPath: String
-) : AbstractInvalidationTest(targetBackend, workingDirPath) {
+) : AbstractInvalidationTest(targetBackend, granularity, workingDirPath) {
    override fun buildKlib(
        configuration: CompilerConfiguration,
        moduleName: String,
@@ -19,7 +19,7 @@ import java.util.regex.Pattern;
@SuppressWarnings("all")
@TestMetadata("js/js.translator/testData/incremental/invalidation")
@TestDataPath("$PROJECT_ROOT")
-public class JsIrInvalidationTestGenerated extends AbstractJsIrInvalidationTest {
+public class JsFirInvalidationPerFileTestGenerated extends AbstractJsFirInvalidationPerFileTest {
    @Test
    @TestMetadata("addUpdateRemoveDependentFile")
    public void testAddUpdateRemoveDependentFile() throws Exception {
@@ -343,6 +343,12 @@ public class JsIrInvalidationTestGenerated extends AbstractJsIrInvalidationTest
        runTest("js/js.translator/testData/incremental/invalidation/moveAndModifyInlineFunction/");
    }

+    @Test
+    @TestMetadata("moveExternalDeclarationsBetweenFiles")
+    public void testMoveExternalDeclarationsBetweenFiles() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/moveExternalDeclarationsBetweenFiles/");
+    }
+
    @Test
    @TestMetadata("moveExternalDeclarationsBetweenJsModules")
    public void testMoveExternalDeclarationsBetweenJsModules() throws Exception {
@@ -458,9 +464,15 @@ public class JsIrInvalidationTestGenerated extends AbstractJsIrInvalidationTest
    }

    @Test
-    @TestMetadata("typeScriptExports")
-    public void testTypeScriptExports() throws Exception {
-        runTest("js/js.translator/testData/incremental/invalidation/typeScriptExports/");
+    @TestMetadata("typeScriptExportsPerFile")
+    public void testTypeScriptExportsPerFile() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/typeScriptExportsPerFile/");
+    }
+
+    @Test
+    @TestMetadata("typeScriptExportsPerModule")
+    public void testTypeScriptExportsPerModule() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/typeScriptExportsPerModule/");
    }

    @Test
@@ -0,0 +1,501 @@
+/*
+ * Copyright 2010-2023 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.incremental;
+
+import com.intellij.testFramework.TestDataPath;
+import org.jetbrains.kotlin.test.util.KtTestUtil;
+import org.jetbrains.kotlin.test.TargetBackend;
+import org.jetbrains.kotlin.test.TestMetadata;
+import org.junit.jupiter.api.Nested;
+import org.junit.jupiter.api.Test;
+
+import java.io.File;
+import java.util.regex.Pattern;
+
+/** This class is generated by {@link org.jetbrains.kotlin.generators.tests.GenerateJsTestsKt}. DO NOT MODIFY MANUALLY */
+@SuppressWarnings("all")
+@TestMetadata("js/js.translator/testData/incremental/invalidation")
+@TestDataPath("$PROJECT_ROOT")
+public class JsFirInvalidationPerModuleTestGenerated extends AbstractJsFirInvalidationPerModuleTest {
+    @Test
+    @TestMetadata("addUpdateRemoveDependentFile")
+    public void testAddUpdateRemoveDependentFile() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/addUpdateRemoveDependentFile/");
+    }
+
+    @Test
+    @TestMetadata("addUpdateRemoveDependentModule")
+    public void testAddUpdateRemoveDependentModule() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/addUpdateRemoveDependentModule/");
+    }
+
+    @Test
+    public void testAllFilesPresentInInvalidation() throws Exception {
+        KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("js/js.translator/testData/incremental/invalidation"), Pattern.compile("^([^_](.+))$"), null, TargetBackend.JS_IR, false);
+    }
+
+    @Test
+    @TestMetadata("circleExportsUpdate")
+    public void testCircleExportsUpdate() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/circleExportsUpdate/");
+    }
+
+    @Test
+    @TestMetadata("circleInlineImportsUpdate")
+    public void testCircleInlineImportsUpdate() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/circleInlineImportsUpdate/");
+    }
+
+    @Test
+    @TestMetadata("class")
+    public void testClass() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/class/");
+    }
+
+    @Test
+    @TestMetadata("classFunctionsAndFields")
+    public void testClassFunctionsAndFields() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/classFunctionsAndFields/");
+    }
+
+    @Test
+    @TestMetadata("companionFunction")
+    public void testCompanionFunction() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/companionFunction/");
+    }
+
+    @Test
+    @TestMetadata("companionInlineFunction")
+    public void testCompanionInlineFunction() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/companionInlineFunction/");
+    }
+
+    @Test
+    @TestMetadata("companionProperties")
+    public void testCompanionProperties() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/companionProperties/");
+    }
+
+    @Test
+    @TestMetadata("companionWithStdLibCall")
+    public void testCompanionWithStdLibCall() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/companionWithStdLibCall/");
+    }
+
+    @Test
+    @TestMetadata("constVals")
+    public void testConstVals() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/constVals/");
+    }
+
+    @Test
+    @TestMetadata("crossModuleReferences")
+    public void testCrossModuleReferences() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/crossModuleReferences/");
+    }
+
+    @Test
+    @TestMetadata("eagerInitialization")
+    public void testEagerInitialization() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/eagerInitialization/");
+    }
+
+    @Test
+    @TestMetadata("enum")
+    public void testEnum() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/enum/");
+    }
+
+    @Test
+    @TestMetadata("enumsInInlineFunctions")
+    public void testEnumsInInlineFunctions() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/enumsInInlineFunctions/");
+    }
+
+    @Test
+    @TestMetadata("exceptionsFromInlineFunction")
+    public void testExceptionsFromInlineFunction() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/exceptionsFromInlineFunction/");
+    }
+
+    @Test
+    @TestMetadata("exportsThroughInlineFunction")
+    public void testExportsThroughInlineFunction() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/exportsThroughInlineFunction/");
+    }
+
+    @Test
+    @TestMetadata("fakeOverrideClassFunctionQualifiers")
+    public void testFakeOverrideClassFunctionQualifiers() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/fakeOverrideClassFunctionQualifiers/");
+    }
+
+    @Test
+    @TestMetadata("fakeOverrideInheritance")
+    public void testFakeOverrideInheritance() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/fakeOverrideInheritance/");
+    }
+
+    @Test
+    @TestMetadata("fakeOverrideInlineExtension")
+    public void testFakeOverrideInlineExtension() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/fakeOverrideInlineExtension/");
+    }
+
+    @Test
+    @TestMetadata("fakeOverrideInlineFunction")
+    public void testFakeOverrideInlineFunction() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/fakeOverrideInlineFunction/");
+    }
+
+    @Test
+    @TestMetadata("fakeOverrideInlineProperty")
+    public void testFakeOverrideInlineProperty() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/fakeOverrideInlineProperty/");
+    }
+
+    @Test
+    @TestMetadata("fakeOverrideInterfaceFunctionQualifiers")
+    public void testFakeOverrideInterfaceFunctionQualifiers() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/fakeOverrideInterfaceFunctionQualifiers/");
+    }
+
+    @Test
+    @TestMetadata("fastPath1")
+    public void testFastPath1() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/fastPath1/");
+    }
+
+    @Test
+    @TestMetadata("fastPath2")
+    public void testFastPath2() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/fastPath2/");
+    }
+
+    @Test
+    @TestMetadata("friendDependency")
+    public void testFriendDependency() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/friendDependency/");
+    }
+
+    @Test
+    @TestMetadata("functionDefaultParams")
+    public void testFunctionDefaultParams() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/functionDefaultParams/");
+    }
+
+    @Test
+    @TestMetadata("functionSignature")
+    public void testFunctionSignature() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/functionSignature/");
+    }
+
+    @Test
+    @TestMetadata("functionTypeInterface")
+    public void testFunctionTypeInterface() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/functionTypeInterface/");
+    }
+
+    @Test
+    @TestMetadata("functionTypeInterfaceReflect")
+    public void testFunctionTypeInterfaceReflect() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/functionTypeInterfaceReflect/");
+    }
+
+    @Test
+    @TestMetadata("genericFunctions")
+    public void testGenericFunctions() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/genericFunctions/");
+    }
+
+    @Test
+    @TestMetadata("genericInlineFunctions")
+    public void testGenericInlineFunctions() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/genericInlineFunctions/");
+    }
+
+    @Test
+    @TestMetadata("gettersAndSettersInlining")
+    public void testGettersAndSettersInlining() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/gettersAndSettersInlining/");
+    }
+
+    @Test
+    @TestMetadata("inlineBecomeNonInline")
+    public void testInlineBecomeNonInline() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/inlineBecomeNonInline/");
+    }
+
+    @Test
+    @TestMetadata("inlineFunctionAnnotations")
+    public void testInlineFunctionAnnotations() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/inlineFunctionAnnotations/");
+    }
+
+    @Test
+    @TestMetadata("inlineFunctionAsFunctionReference")
+    public void testInlineFunctionAsFunctionReference() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/inlineFunctionAsFunctionReference/");
+    }
+
+    @Test
+    @TestMetadata("inlineFunctionAsParam")
+    public void testInlineFunctionAsParam() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/inlineFunctionAsParam/");
+    }
+
+    @Test
+    @TestMetadata("inlineFunctionCircleUsage")
+    public void testInlineFunctionCircleUsage() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/inlineFunctionCircleUsage/");
+    }
+
+    @Test
+    @TestMetadata("inlineFunctionDefaultParams")
+    public void testInlineFunctionDefaultParams() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/inlineFunctionDefaultParams/");
+    }
+
+    @Test
+    @TestMetadata("inlineFunctionWithObject")
+    public void testInlineFunctionWithObject() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/inlineFunctionWithObject/");
+    }
+
+    @Test
+    @TestMetadata("interfaceOpenMethods")
+    public void testInterfaceOpenMethods() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/interfaceOpenMethods/");
+    }
+
+    @Test
+    @TestMetadata("interfaceOpenMethodsInOpenClass")
+    public void testInterfaceOpenMethodsInOpenClass() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/interfaceOpenMethodsInOpenClass/");
+    }
+
+    @Test
+    @TestMetadata("interfaceSuperUsage")
+    public void testInterfaceSuperUsage() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/interfaceSuperUsage/");
+    }
+
+    @Test
+    @TestMetadata("interfaceWithDefaultParams")
+    public void testInterfaceWithDefaultParams() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/interfaceWithDefaultParams/");
+    }
+
+    @Test
+    @TestMetadata("jsCode")
+    public void testJsCode() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/jsCode/");
+    }
+
+    @Test
+    @TestMetadata("jsCodeWithConstString")
+    public void testJsCodeWithConstString() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/jsCodeWithConstString/");
+    }
+
+    @Test
+    @TestMetadata("jsExport")
+    public void testJsExport() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/jsExport/");
+    }
+
+    @Test
+    @TestMetadata("jsModuleAnnotation")
+    public void testJsModuleAnnotation() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/jsModuleAnnotation/");
+    }
+
+    @Test
+    @TestMetadata("languageVersionSettings")
+    public void testLanguageVersionSettings() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/languageVersionSettings/");
+    }
+
+    @Test
+    @TestMetadata("localInlineFunction")
+    public void testLocalInlineFunction() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/localInlineFunction/");
+    }
+
+    @Test
+    @TestMetadata("localObjectsLeakThroughInterface")
+    public void testLocalObjectsLeakThroughInterface() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/localObjectsLeakThroughInterface/");
+    }
+
+    @Test
+    @TestMetadata("mainModuleInvalidation")
+    public void testMainModuleInvalidation() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/mainModuleInvalidation/");
+    }
+
+    @Test
+    @TestMetadata("moveAndModifyInlineFunction")
+    public void testMoveAndModifyInlineFunction() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/moveAndModifyInlineFunction/");
+    }
+
+    @Test
+    @TestMetadata("moveExternalDeclarationsBetweenFiles")
+    public void testMoveExternalDeclarationsBetweenFiles() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/moveExternalDeclarationsBetweenFiles/");
+    }
+
+    @Test
+    @TestMetadata("moveExternalDeclarationsBetweenJsModules")
+    public void testMoveExternalDeclarationsBetweenJsModules() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/moveExternalDeclarationsBetweenJsModules/");
+    }
+
+    @Test
+    @TestMetadata("moveFilesBetweenModules")
+    public void testMoveFilesBetweenModules() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/moveFilesBetweenModules/");
+    }
+
+    @Test
+    @TestMetadata("moveInlineFunctionBetweenModules")
+    public void testMoveInlineFunctionBetweenModules() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/moveInlineFunctionBetweenModules/");
+    }
+
+    @Test
+    @TestMetadata("nestedClass")
+    public void testNestedClass() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/nestedClass/");
+    }
+
+    @Test
+    @TestMetadata("nonInlineBecomeInline")
+    public void testNonInlineBecomeInline() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/nonInlineBecomeInline/");
+    }
+
+    @Test
+    @TestMetadata("privateDeclarationLeakThroughDefaultParam")
+    public void testPrivateDeclarationLeakThroughDefaultParam() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/privateDeclarationLeakThroughDefaultParam/");
+    }
+
+    @Test
+    @TestMetadata("privateInlineFunction1")
+    public void testPrivateInlineFunction1() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/privateInlineFunction1/");
+    }
+
+    @Test
+    @TestMetadata("privateObjectsLeakThroughSealedInterface")
+    public void testPrivateObjectsLeakThroughSealedInterface() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/privateObjectsLeakThroughSealedInterface/");
+    }
+
+    @Test
+    @TestMetadata("removeFile")
+    public void testRemoveFile() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/removeFile/");
+    }
+
+    @Test
+    @TestMetadata("removeModule")
+    public void testRemoveModule() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/removeModule/");
+    }
+
+    @Test
+    @TestMetadata("removeUnusedFile")
+    public void testRemoveUnusedFile() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/removeUnusedFile/");
+    }
+
+    @Test
+    @TestMetadata("renameFile")
+    public void testRenameFile() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/renameFile/");
+    }
+
+    @Test
+    @TestMetadata("renameModule")
+    public void testRenameModule() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/renameModule/");
+    }
+
+    @Test
+    @TestMetadata("simple")
+    public void testSimple() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/simple/");
+    }
+
+    @Test
+    @TestMetadata("splitJoinModule")
+    public void testSplitJoinModule() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/splitJoinModule/");
+    }
+
+    @Test
+    @TestMetadata("suspendFunctions")
+    public void testSuspendFunctions() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/suspendFunctions/");
+    }
+
+    @Test
+    @TestMetadata("suspendInterfaceWithDefaultParams")
+    public void testSuspendInterfaceWithDefaultParams() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/suspendInterfaceWithDefaultParams/");
+    }
+
+    @Test
+    @TestMetadata("toplevelProperties")
+    public void testToplevelProperties() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/toplevelProperties/");
+    }
+
+    @Test
+    @TestMetadata("transitiveInlineFunction")
+    public void testTransitiveInlineFunction() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/transitiveInlineFunction/");
+    }
+
+    @Test
+    @TestMetadata("typeScriptExportsPerFile")
+    public void testTypeScriptExportsPerFile() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/typeScriptExportsPerFile/");
+    }
+
+    @Test
+    @TestMetadata("typeScriptExportsPerModule")
+    public void testTypeScriptExportsPerModule() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/typeScriptExportsPerModule/");
+    }
+
+    @Test
+    @TestMetadata("unicodeSerializationAndDeserialization")
+    public void testUnicodeSerializationAndDeserialization() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/unicodeSerializationAndDeserialization/");
+    }
+
+    @Test
+    @TestMetadata("updateExports")
+    public void testUpdateExports() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/updateExports/");
+    }
+
+    @Test
+    @TestMetadata("updateExportsAndInlineImports")
+    public void testUpdateExportsAndInlineImports() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/updateExportsAndInlineImports/");
+    }
+
+    @Test
+    @TestMetadata("variance")
+    public void testVariance() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/variance/");
+    }
+}
@@ -19,7 +19,7 @@ import java.util.regex.Pattern;
@SuppressWarnings("all")
@TestMetadata("js/js.translator/testData/incremental/invalidation")
@TestDataPath("$PROJECT_ROOT")
-public class JsIrES6InvalidationTestGenerated extends AbstractJsIrES6InvalidationTest {
+public class JsIrES6InvalidationPerFileTestGenerated extends AbstractJsIrES6InvalidationPerFileTest {
    @Test
    @TestMetadata("addUpdateRemoveDependentFile")
    public void testAddUpdateRemoveDependentFile() throws Exception {
@@ -343,6 +343,12 @@ public class JsIrES6InvalidationTestGenerated extends AbstractJsIrES6Invalidatio
        runTest("js/js.translator/testData/incremental/invalidation/moveAndModifyInlineFunction/");
    }

+    @Test
+    @TestMetadata("moveExternalDeclarationsBetweenFiles")
+    public void testMoveExternalDeclarationsBetweenFiles() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/moveExternalDeclarationsBetweenFiles/");
+    }
+
    @Test
    @TestMetadata("moveExternalDeclarationsBetweenJsModules")
    public void testMoveExternalDeclarationsBetweenJsModules() throws Exception {
@@ -458,9 +464,15 @@ public class JsIrES6InvalidationTestGenerated extends AbstractJsIrES6Invalidatio
    }

    @Test
-    @TestMetadata("typeScriptExports")
-    public void testTypeScriptExports() throws Exception {
-        runTest("js/js.translator/testData/incremental/invalidation/typeScriptExports/");
+    @TestMetadata("typeScriptExportsPerFile")
+    public void testTypeScriptExportsPerFile() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/typeScriptExportsPerFile/");
+    }
+
+    @Test
+    @TestMetadata("typeScriptExportsPerModule")
+    public void testTypeScriptExportsPerModule() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/typeScriptExportsPerModule/");
    }

    @Test
@@ -0,0 +1,501 @@
+/*
+ * Copyright 2010-2023 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.incremental;
+
+import com.intellij.testFramework.TestDataPath;
+import org.jetbrains.kotlin.test.util.KtTestUtil;
+import org.jetbrains.kotlin.test.TargetBackend;
+import org.jetbrains.kotlin.test.TestMetadata;
+import org.junit.jupiter.api.Nested;
+import org.junit.jupiter.api.Test;
+
+import java.io.File;
+import java.util.regex.Pattern;
+
+/** This class is generated by {@link org.jetbrains.kotlin.generators.tests.GenerateJsTestsKt}. DO NOT MODIFY MANUALLY */
+@SuppressWarnings("all")
+@TestMetadata("js/js.translator/testData/incremental/invalidation")
+@TestDataPath("$PROJECT_ROOT")
+public class JsIrES6InvalidationPerModuleTestGenerated extends AbstractJsIrES6InvalidationPerModuleTest {
+    @Test
+    @TestMetadata("addUpdateRemoveDependentFile")
+    public void testAddUpdateRemoveDependentFile() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/addUpdateRemoveDependentFile/");
+    }
+
+    @Test
+    @TestMetadata("addUpdateRemoveDependentModule")
+    public void testAddUpdateRemoveDependentModule() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/addUpdateRemoveDependentModule/");
+    }
+
+    @Test
+    public void testAllFilesPresentInInvalidation() throws Exception {
+        KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("js/js.translator/testData/incremental/invalidation"), Pattern.compile("^([^_](.+))$"), null, TargetBackend.JS_IR_ES6, false);
+    }
+
+    @Test
+    @TestMetadata("circleExportsUpdate")
+    public void testCircleExportsUpdate() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/circleExportsUpdate/");
+    }
+
+    @Test
+    @TestMetadata("circleInlineImportsUpdate")
+    public void testCircleInlineImportsUpdate() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/circleInlineImportsUpdate/");
+    }
+
+    @Test
+    @TestMetadata("class")
+    public void testClass() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/class/");
+    }
+
+    @Test
+    @TestMetadata("classFunctionsAndFields")
+    public void testClassFunctionsAndFields() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/classFunctionsAndFields/");
+    }
+
+    @Test
+    @TestMetadata("companionFunction")
+    public void testCompanionFunction() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/companionFunction/");
+    }
+
+    @Test
+    @TestMetadata("companionInlineFunction")
+    public void testCompanionInlineFunction() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/companionInlineFunction/");
+    }
+
+    @Test
+    @TestMetadata("companionProperties")
+    public void testCompanionProperties() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/companionProperties/");
+    }
+
+    @Test
+    @TestMetadata("companionWithStdLibCall")
+    public void testCompanionWithStdLibCall() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/companionWithStdLibCall/");
+    }
+
+    @Test
+    @TestMetadata("constVals")
+    public void testConstVals() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/constVals/");
+    }
+
+    @Test
+    @TestMetadata("crossModuleReferences")
+    public void testCrossModuleReferences() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/crossModuleReferences/");
+    }
+
+    @Test
+    @TestMetadata("eagerInitialization")
+    public void testEagerInitialization() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/eagerInitialization/");
+    }
+
+    @Test
+    @TestMetadata("enum")
+    public void testEnum() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/enum/");
+    }
+
+    @Test
+    @TestMetadata("enumsInInlineFunctions")
+    public void testEnumsInInlineFunctions() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/enumsInInlineFunctions/");
+    }
+
+    @Test
+    @TestMetadata("exceptionsFromInlineFunction")
+    public void testExceptionsFromInlineFunction() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/exceptionsFromInlineFunction/");
+    }
+
+    @Test
+    @TestMetadata("exportsThroughInlineFunction")
+    public void testExportsThroughInlineFunction() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/exportsThroughInlineFunction/");
+    }
+
+    @Test
+    @TestMetadata("fakeOverrideClassFunctionQualifiers")
+    public void testFakeOverrideClassFunctionQualifiers() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/fakeOverrideClassFunctionQualifiers/");
+    }
+
+    @Test
+    @TestMetadata("fakeOverrideInheritance")
+    public void testFakeOverrideInheritance() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/fakeOverrideInheritance/");
+    }
+
+    @Test
+    @TestMetadata("fakeOverrideInlineExtension")
+    public void testFakeOverrideInlineExtension() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/fakeOverrideInlineExtension/");
+    }
+
+    @Test
+    @TestMetadata("fakeOverrideInlineFunction")
+    public void testFakeOverrideInlineFunction() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/fakeOverrideInlineFunction/");
+    }
+
+    @Test
+    @TestMetadata("fakeOverrideInlineProperty")
+    public void testFakeOverrideInlineProperty() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/fakeOverrideInlineProperty/");
+    }
+
+    @Test
+    @TestMetadata("fakeOverrideInterfaceFunctionQualifiers")
+    public void testFakeOverrideInterfaceFunctionQualifiers() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/fakeOverrideInterfaceFunctionQualifiers/");
+    }
+
+    @Test
+    @TestMetadata("fastPath1")
+    public void testFastPath1() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/fastPath1/");
+    }
+
+    @Test
+    @TestMetadata("fastPath2")
+    public void testFastPath2() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/fastPath2/");
+    }
+
+    @Test
+    @TestMetadata("friendDependency")
+    public void testFriendDependency() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/friendDependency/");
+    }
+
+    @Test
+    @TestMetadata("functionDefaultParams")
+    public void testFunctionDefaultParams() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/functionDefaultParams/");
+    }
+
+    @Test
+    @TestMetadata("functionSignature")
+    public void testFunctionSignature() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/functionSignature/");
+    }
+
+    @Test
+    @TestMetadata("functionTypeInterface")
+    public void testFunctionTypeInterface() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/functionTypeInterface/");
+    }
+
+    @Test
+    @TestMetadata("functionTypeInterfaceReflect")
+    public void testFunctionTypeInterfaceReflect() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/functionTypeInterfaceReflect/");
+    }
+
+    @Test
+    @TestMetadata("genericFunctions")
+    public void testGenericFunctions() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/genericFunctions/");
+    }
+
+    @Test
+    @TestMetadata("genericInlineFunctions")
+    public void testGenericInlineFunctions() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/genericInlineFunctions/");
+    }
+
+    @Test
+    @TestMetadata("gettersAndSettersInlining")
+    public void testGettersAndSettersInlining() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/gettersAndSettersInlining/");
+    }
+
+    @Test
+    @TestMetadata("inlineBecomeNonInline")
+    public void testInlineBecomeNonInline() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/inlineBecomeNonInline/");
+    }
+
+    @Test
+    @TestMetadata("inlineFunctionAnnotations")
+    public void testInlineFunctionAnnotations() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/inlineFunctionAnnotations/");
+    }
+
+    @Test
+    @TestMetadata("inlineFunctionAsFunctionReference")
+    public void testInlineFunctionAsFunctionReference() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/inlineFunctionAsFunctionReference/");
+    }
+
+    @Test
+    @TestMetadata("inlineFunctionAsParam")
+    public void testInlineFunctionAsParam() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/inlineFunctionAsParam/");
+    }
+
+    @Test
+    @TestMetadata("inlineFunctionCircleUsage")
+    public void testInlineFunctionCircleUsage() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/inlineFunctionCircleUsage/");
+    }
+
+    @Test
+    @TestMetadata("inlineFunctionDefaultParams")
+    public void testInlineFunctionDefaultParams() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/inlineFunctionDefaultParams/");
+    }
+
+    @Test
+    @TestMetadata("inlineFunctionWithObject")
+    public void testInlineFunctionWithObject() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/inlineFunctionWithObject/");
+    }
+
+    @Test
+    @TestMetadata("interfaceOpenMethods")
+    public void testInterfaceOpenMethods() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/interfaceOpenMethods/");
+    }
+
+    @Test
+    @TestMetadata("interfaceOpenMethodsInOpenClass")
+    public void testInterfaceOpenMethodsInOpenClass() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/interfaceOpenMethodsInOpenClass/");
+    }
+
+    @Test
+    @TestMetadata("interfaceSuperUsage")
+    public void testInterfaceSuperUsage() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/interfaceSuperUsage/");
+    }
+
+    @Test
+    @TestMetadata("interfaceWithDefaultParams")
+    public void testInterfaceWithDefaultParams() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/interfaceWithDefaultParams/");
+    }
+
+    @Test
+    @TestMetadata("jsCode")
+    public void testJsCode() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/jsCode/");
+    }
+
+    @Test
+    @TestMetadata("jsCodeWithConstString")
+    public void testJsCodeWithConstString() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/jsCodeWithConstString/");
+    }
+
+    @Test
+    @TestMetadata("jsExport")
+    public void testJsExport() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/jsExport/");
+    }
+
+    @Test
+    @TestMetadata("jsModuleAnnotation")
+    public void testJsModuleAnnotation() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/jsModuleAnnotation/");
+    }
+
+    @Test
+    @TestMetadata("languageVersionSettings")
+    public void testLanguageVersionSettings() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/languageVersionSettings/");
+    }
+
+    @Test
+    @TestMetadata("localInlineFunction")
+    public void testLocalInlineFunction() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/localInlineFunction/");
+    }
+
+    @Test
+    @TestMetadata("localObjectsLeakThroughInterface")
+    public void testLocalObjectsLeakThroughInterface() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/localObjectsLeakThroughInterface/");
+    }
+
+    @Test
+    @TestMetadata("mainModuleInvalidation")
+    public void testMainModuleInvalidation() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/mainModuleInvalidation/");
+    }
+
+    @Test
+    @TestMetadata("moveAndModifyInlineFunction")
+    public void testMoveAndModifyInlineFunction() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/moveAndModifyInlineFunction/");
+    }
+
+    @Test
+    @TestMetadata("moveExternalDeclarationsBetweenFiles")
+    public void testMoveExternalDeclarationsBetweenFiles() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/moveExternalDeclarationsBetweenFiles/");
+    }
+
+    @Test
+    @TestMetadata("moveExternalDeclarationsBetweenJsModules")
+    public void testMoveExternalDeclarationsBetweenJsModules() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/moveExternalDeclarationsBetweenJsModules/");
+    }
+
+    @Test
+    @TestMetadata("moveFilesBetweenModules")
+    public void testMoveFilesBetweenModules() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/moveFilesBetweenModules/");
+    }
+
+    @Test
+    @TestMetadata("moveInlineFunctionBetweenModules")
+    public void testMoveInlineFunctionBetweenModules() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/moveInlineFunctionBetweenModules/");
+    }
+
+    @Test
+    @TestMetadata("nestedClass")
+    public void testNestedClass() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/nestedClass/");
+    }
+
+    @Test
+    @TestMetadata("nonInlineBecomeInline")
+    public void testNonInlineBecomeInline() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/nonInlineBecomeInline/");
+    }
+
+    @Test
+    @TestMetadata("privateDeclarationLeakThroughDefaultParam")
+    public void testPrivateDeclarationLeakThroughDefaultParam() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/privateDeclarationLeakThroughDefaultParam/");
+    }
+
+    @Test
+    @TestMetadata("privateInlineFunction1")
+    public void testPrivateInlineFunction1() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/privateInlineFunction1/");
+    }
+
+    @Test
+    @TestMetadata("privateObjectsLeakThroughSealedInterface")
+    public void testPrivateObjectsLeakThroughSealedInterface() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/privateObjectsLeakThroughSealedInterface/");
+    }
+
+    @Test
+    @TestMetadata("removeFile")
+    public void testRemoveFile() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/removeFile/");
+    }
+
+    @Test
+    @TestMetadata("removeModule")
+    public void testRemoveModule() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/removeModule/");
+    }
+
+    @Test
+    @TestMetadata("removeUnusedFile")
+    public void testRemoveUnusedFile() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/removeUnusedFile/");
+    }
+
+    @Test
+    @TestMetadata("renameFile")
+    public void testRenameFile() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/renameFile/");
+    }
+
+    @Test
+    @TestMetadata("renameModule")
+    public void testRenameModule() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/renameModule/");
+    }
+
+    @Test
+    @TestMetadata("simple")
+    public void testSimple() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/simple/");
+    }
+
+    @Test
+    @TestMetadata("splitJoinModule")
+    public void testSplitJoinModule() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/splitJoinModule/");
+    }
+
+    @Test
+    @TestMetadata("suspendFunctions")
+    public void testSuspendFunctions() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/suspendFunctions/");
+    }
+
+    @Test
+    @TestMetadata("suspendInterfaceWithDefaultParams")
+    public void testSuspendInterfaceWithDefaultParams() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/suspendInterfaceWithDefaultParams/");
+    }
+
+    @Test
+    @TestMetadata("toplevelProperties")
+    public void testToplevelProperties() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/toplevelProperties/");
+    }
+
+    @Test
+    @TestMetadata("transitiveInlineFunction")
+    public void testTransitiveInlineFunction() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/transitiveInlineFunction/");
+    }
+
+    @Test
+    @TestMetadata("typeScriptExportsPerFile")
+    public void testTypeScriptExportsPerFile() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/typeScriptExportsPerFile/");
+    }
+
+    @Test
+    @TestMetadata("typeScriptExportsPerModule")
+    public void testTypeScriptExportsPerModule() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/typeScriptExportsPerModule/");
+    }
+
+    @Test
+    @TestMetadata("unicodeSerializationAndDeserialization")
+    public void testUnicodeSerializationAndDeserialization() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/unicodeSerializationAndDeserialization/");
+    }
+
+    @Test
+    @TestMetadata("updateExports")
+    public void testUpdateExports() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/updateExports/");
+    }
+
+    @Test
+    @TestMetadata("updateExportsAndInlineImports")
+    public void testUpdateExportsAndInlineImports() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/updateExportsAndInlineImports/");
+    }
+
+    @Test
+    @TestMetadata("variance")
+    public void testVariance() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/variance/");
+    }
+}
@@ -19,7 +19,7 @@ import java.util.regex.Pattern;
@SuppressWarnings("all")
@TestMetadata("js/js.translator/testData/incremental/invalidation")
@TestDataPath("$PROJECT_ROOT")
-public class JsFirInvalidationTestGenerated extends AbstractJsFirInvalidationTest {
+public class JsIrInvalidationPerFileTestGenerated extends AbstractJsIrInvalidationPerFileTest {
    @Test
    @TestMetadata("addUpdateRemoveDependentFile")
    public void testAddUpdateRemoveDependentFile() throws Exception {
@@ -343,6 +343,12 @@ public class JsFirInvalidationTestGenerated extends AbstractJsFirInvalidationTes
        runTest("js/js.translator/testData/incremental/invalidation/moveAndModifyInlineFunction/");
    }

+    @Test
+    @TestMetadata("moveExternalDeclarationsBetweenFiles")
+    public void testMoveExternalDeclarationsBetweenFiles() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/moveExternalDeclarationsBetweenFiles/");
+    }
+
    @Test
    @TestMetadata("moveExternalDeclarationsBetweenJsModules")
    public void testMoveExternalDeclarationsBetweenJsModules() throws Exception {
@@ -458,9 +464,15 @@ public class JsFirInvalidationTestGenerated extends AbstractJsFirInvalidationTes
    }

    @Test
-    @TestMetadata("typeScriptExports")
-    public void testTypeScriptExports() throws Exception {
-        runTest("js/js.translator/testData/incremental/invalidation/typeScriptExports/");
+    @TestMetadata("typeScriptExportsPerFile")
+    public void testTypeScriptExportsPerFile() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/typeScriptExportsPerFile/");
+    }
+
+    @Test
+    @TestMetadata("typeScriptExportsPerModule")
+    public void testTypeScriptExportsPerModule() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/typeScriptExportsPerModule/");
    }

    @Test
@@ -19,7 +19,7 @@ import java.util.regex.Pattern;
@SuppressWarnings("all")
@TestMetadata("js/js.translator/testData/incremental/invalidationWithPL")
@TestDataPath("$PROJECT_ROOT")
-public class JsIrInvalidationWithPLTestGenerated extends AbstractJsIrInvalidationWithPLTest {
+public class JsIrInvalidationPerFileWithPLTestGenerated extends AbstractJsIrInvalidationPerFileWithPLTest {
    @Test
    public void testAllFilesPresentInInvalidationWithPL() throws Exception {
        KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("js/js.translator/testData/incremental/invalidationWithPL"), Pattern.compile("^([^_](.+))$"), null, TargetBackend.JS_IR, false);
@@ -0,0 +1,501 @@
+/*
+ * Copyright 2010-2023 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.incremental;
+
+import com.intellij.testFramework.TestDataPath;
+import org.jetbrains.kotlin.test.util.KtTestUtil;
+import org.jetbrains.kotlin.test.TargetBackend;
+import org.jetbrains.kotlin.test.TestMetadata;
+import org.junit.jupiter.api.Nested;
+import org.junit.jupiter.api.Test;
+
+import java.io.File;
+import java.util.regex.Pattern;
+
+/** This class is generated by {@link org.jetbrains.kotlin.generators.tests.GenerateJsTestsKt}. DO NOT MODIFY MANUALLY */
+@SuppressWarnings("all")
+@TestMetadata("js/js.translator/testData/incremental/invalidation")
+@TestDataPath("$PROJECT_ROOT")
+public class JsIrInvalidationPerModuleTestGenerated extends AbstractJsIrInvalidationPerModuleTest {
+    @Test
+    @TestMetadata("addUpdateRemoveDependentFile")
+    public void testAddUpdateRemoveDependentFile() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/addUpdateRemoveDependentFile/");
+    }
+
+    @Test
+    @TestMetadata("addUpdateRemoveDependentModule")
+    public void testAddUpdateRemoveDependentModule() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/addUpdateRemoveDependentModule/");
+    }
+
+    @Test
+    public void testAllFilesPresentInInvalidation() throws Exception {
+        KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("js/js.translator/testData/incremental/invalidation"), Pattern.compile("^([^_](.+))$"), null, TargetBackend.JS_IR, false);
+    }
+
+    @Test
+    @TestMetadata("circleExportsUpdate")
+    public void testCircleExportsUpdate() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/circleExportsUpdate/");
+    }
+
+    @Test
+    @TestMetadata("circleInlineImportsUpdate")
+    public void testCircleInlineImportsUpdate() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/circleInlineImportsUpdate/");
+    }
+
+    @Test
+    @TestMetadata("class")
+    public void testClass() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/class/");
+    }
+
+    @Test
+    @TestMetadata("classFunctionsAndFields")
+    public void testClassFunctionsAndFields() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/classFunctionsAndFields/");
+    }
+
+    @Test
+    @TestMetadata("companionFunction")
+    public void testCompanionFunction() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/companionFunction/");
+    }
+
+    @Test
+    @TestMetadata("companionInlineFunction")
+    public void testCompanionInlineFunction() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/companionInlineFunction/");
+    }
+
+    @Test
+    @TestMetadata("companionProperties")
+    public void testCompanionProperties() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/companionProperties/");
+    }
+
+    @Test
+    @TestMetadata("companionWithStdLibCall")
+    public void testCompanionWithStdLibCall() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/companionWithStdLibCall/");
+    }
+
+    @Test
+    @TestMetadata("constVals")
+    public void testConstVals() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/constVals/");
+    }
+
+    @Test
+    @TestMetadata("crossModuleReferences")
+    public void testCrossModuleReferences() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/crossModuleReferences/");
+    }
+
+    @Test
+    @TestMetadata("eagerInitialization")
+    public void testEagerInitialization() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/eagerInitialization/");
+    }
+
+    @Test
+    @TestMetadata("enum")
+    public void testEnum() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/enum/");
+    }
+
+    @Test
+    @TestMetadata("enumsInInlineFunctions")
+    public void testEnumsInInlineFunctions() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/enumsInInlineFunctions/");
+    }
+
+    @Test
+    @TestMetadata("exceptionsFromInlineFunction")
+    public void testExceptionsFromInlineFunction() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/exceptionsFromInlineFunction/");
+    }
+
+    @Test
+    @TestMetadata("exportsThroughInlineFunction")
+    public void testExportsThroughInlineFunction() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/exportsThroughInlineFunction/");
+    }
+
+    @Test
+    @TestMetadata("fakeOverrideClassFunctionQualifiers")
+    public void testFakeOverrideClassFunctionQualifiers() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/fakeOverrideClassFunctionQualifiers/");
+    }
+
+    @Test
+    @TestMetadata("fakeOverrideInheritance")
+    public void testFakeOverrideInheritance() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/fakeOverrideInheritance/");
+    }
+
+    @Test
+    @TestMetadata("fakeOverrideInlineExtension")
+    public void testFakeOverrideInlineExtension() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/fakeOverrideInlineExtension/");
+    }
+
+    @Test
+    @TestMetadata("fakeOverrideInlineFunction")
+    public void testFakeOverrideInlineFunction() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/fakeOverrideInlineFunction/");
+    }
+
+    @Test
+    @TestMetadata("fakeOverrideInlineProperty")
+    public void testFakeOverrideInlineProperty() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/fakeOverrideInlineProperty/");
+    }
+
+    @Test
+    @TestMetadata("fakeOverrideInterfaceFunctionQualifiers")
+    public void testFakeOverrideInterfaceFunctionQualifiers() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/fakeOverrideInterfaceFunctionQualifiers/");
+    }
+
+    @Test
+    @TestMetadata("fastPath1")
+    public void testFastPath1() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/fastPath1/");
+    }
+
+    @Test
+    @TestMetadata("fastPath2")
+    public void testFastPath2() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/fastPath2/");
+    }
+
+    @Test
+    @TestMetadata("friendDependency")
+    public void testFriendDependency() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/friendDependency/");
+    }
+
+    @Test
+    @TestMetadata("functionDefaultParams")
+    public void testFunctionDefaultParams() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/functionDefaultParams/");
+    }
+
+    @Test
+    @TestMetadata("functionSignature")
+    public void testFunctionSignature() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/functionSignature/");
+    }
+
+    @Test
+    @TestMetadata("functionTypeInterface")
+    public void testFunctionTypeInterface() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/functionTypeInterface/");
+    }
+
+    @Test
+    @TestMetadata("functionTypeInterfaceReflect")
+    public void testFunctionTypeInterfaceReflect() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/functionTypeInterfaceReflect/");
+    }
+
+    @Test
+    @TestMetadata("genericFunctions")
+    public void testGenericFunctions() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/genericFunctions/");
+    }
+
+    @Test
+    @TestMetadata("genericInlineFunctions")
+    public void testGenericInlineFunctions() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/genericInlineFunctions/");
+    }
+
+    @Test
+    @TestMetadata("gettersAndSettersInlining")
+    public void testGettersAndSettersInlining() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/gettersAndSettersInlining/");
+    }
+
+    @Test
+    @TestMetadata("inlineBecomeNonInline")
+    public void testInlineBecomeNonInline() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/inlineBecomeNonInline/");
+    }
+
+    @Test
+    @TestMetadata("inlineFunctionAnnotations")
+    public void testInlineFunctionAnnotations() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/inlineFunctionAnnotations/");
+    }
+
+    @Test
+    @TestMetadata("inlineFunctionAsFunctionReference")
+    public void testInlineFunctionAsFunctionReference() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/inlineFunctionAsFunctionReference/");
+    }
+
+    @Test
+    @TestMetadata("inlineFunctionAsParam")
+    public void testInlineFunctionAsParam() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/inlineFunctionAsParam/");
+    }
+
+    @Test
+    @TestMetadata("inlineFunctionCircleUsage")
+    public void testInlineFunctionCircleUsage() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/inlineFunctionCircleUsage/");
+    }
+
+    @Test
+    @TestMetadata("inlineFunctionDefaultParams")
+    public void testInlineFunctionDefaultParams() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/inlineFunctionDefaultParams/");
+    }
+
+    @Test
+    @TestMetadata("inlineFunctionWithObject")
+    public void testInlineFunctionWithObject() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/inlineFunctionWithObject/");
+    }
+
+    @Test
+    @TestMetadata("interfaceOpenMethods")
+    public void testInterfaceOpenMethods() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/interfaceOpenMethods/");
+    }
+
+    @Test
+    @TestMetadata("interfaceOpenMethodsInOpenClass")
+    public void testInterfaceOpenMethodsInOpenClass() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/interfaceOpenMethodsInOpenClass/");
+    }
+
+    @Test
+    @TestMetadata("interfaceSuperUsage")
+    public void testInterfaceSuperUsage() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/interfaceSuperUsage/");
+    }
+
+    @Test
+    @TestMetadata("interfaceWithDefaultParams")
+    public void testInterfaceWithDefaultParams() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/interfaceWithDefaultParams/");
+    }
+
+    @Test
+    @TestMetadata("jsCode")
+    public void testJsCode() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/jsCode/");
+    }
+
+    @Test
+    @TestMetadata("jsCodeWithConstString")
+    public void testJsCodeWithConstString() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/jsCodeWithConstString/");
+    }
+
+    @Test
+    @TestMetadata("jsExport")
+    public void testJsExport() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/jsExport/");
+    }
+
+    @Test
+    @TestMetadata("jsModuleAnnotation")
+    public void testJsModuleAnnotation() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/jsModuleAnnotation/");
+    }
+
+    @Test
+    @TestMetadata("languageVersionSettings")
+    public void testLanguageVersionSettings() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/languageVersionSettings/");
+    }
+
+    @Test
+    @TestMetadata("localInlineFunction")
+    public void testLocalInlineFunction() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/localInlineFunction/");
+    }
+
+    @Test
+    @TestMetadata("localObjectsLeakThroughInterface")
+    public void testLocalObjectsLeakThroughInterface() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/localObjectsLeakThroughInterface/");
+    }
+
+    @Test
+    @TestMetadata("mainModuleInvalidation")
+    public void testMainModuleInvalidation() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/mainModuleInvalidation/");
+    }
+
+    @Test
+    @TestMetadata("moveAndModifyInlineFunction")
+    public void testMoveAndModifyInlineFunction() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/moveAndModifyInlineFunction/");
+    }
+
+    @Test
+    @TestMetadata("moveExternalDeclarationsBetweenFiles")
+    public void testMoveExternalDeclarationsBetweenFiles() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/moveExternalDeclarationsBetweenFiles/");
+    }
+
+    @Test
+    @TestMetadata("moveExternalDeclarationsBetweenJsModules")
+    public void testMoveExternalDeclarationsBetweenJsModules() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/moveExternalDeclarationsBetweenJsModules/");
+    }
+
+    @Test
+    @TestMetadata("moveFilesBetweenModules")
+    public void testMoveFilesBetweenModules() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/moveFilesBetweenModules/");
+    }
+
+    @Test
+    @TestMetadata("moveInlineFunctionBetweenModules")
+    public void testMoveInlineFunctionBetweenModules() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/moveInlineFunctionBetweenModules/");
+    }
+
+    @Test
+    @TestMetadata("nestedClass")
+    public void testNestedClass() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/nestedClass/");
+    }
+
+    @Test
+    @TestMetadata("nonInlineBecomeInline")
+    public void testNonInlineBecomeInline() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/nonInlineBecomeInline/");
+    }
+
+    @Test
+    @TestMetadata("privateDeclarationLeakThroughDefaultParam")
+    public void testPrivateDeclarationLeakThroughDefaultParam() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/privateDeclarationLeakThroughDefaultParam/");
+    }
+
+    @Test
+    @TestMetadata("privateInlineFunction1")
+    public void testPrivateInlineFunction1() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/privateInlineFunction1/");
+    }
+
+    @Test
+    @TestMetadata("privateObjectsLeakThroughSealedInterface")
+    public void testPrivateObjectsLeakThroughSealedInterface() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/privateObjectsLeakThroughSealedInterface/");
+    }
+
+    @Test
+    @TestMetadata("removeFile")
+    public void testRemoveFile() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/removeFile/");
+    }
+
+    @Test
+    @TestMetadata("removeModule")
+    public void testRemoveModule() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/removeModule/");
+    }
+
+    @Test
+    @TestMetadata("removeUnusedFile")
+    public void testRemoveUnusedFile() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/removeUnusedFile/");
+    }
+
+    @Test
+    @TestMetadata("renameFile")
+    public void testRenameFile() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/renameFile/");
+    }
+
+    @Test
+    @TestMetadata("renameModule")
+    public void testRenameModule() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/renameModule/");
+    }
+
+    @Test
+    @TestMetadata("simple")
+    public void testSimple() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/simple/");
+    }
+
+    @Test
+    @TestMetadata("splitJoinModule")
+    public void testSplitJoinModule() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/splitJoinModule/");
+    }
+
+    @Test
+    @TestMetadata("suspendFunctions")
+    public void testSuspendFunctions() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/suspendFunctions/");
+    }
+
+    @Test
+    @TestMetadata("suspendInterfaceWithDefaultParams")
+    public void testSuspendInterfaceWithDefaultParams() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/suspendInterfaceWithDefaultParams/");
+    }
+
+    @Test
+    @TestMetadata("toplevelProperties")
+    public void testToplevelProperties() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/toplevelProperties/");
+    }
+
+    @Test
+    @TestMetadata("transitiveInlineFunction")
+    public void testTransitiveInlineFunction() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/transitiveInlineFunction/");
+    }
+
+    @Test
+    @TestMetadata("typeScriptExportsPerFile")
+    public void testTypeScriptExportsPerFile() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/typeScriptExportsPerFile/");
+    }
+
+    @Test
+    @TestMetadata("typeScriptExportsPerModule")
+    public void testTypeScriptExportsPerModule() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/typeScriptExportsPerModule/");
+    }
+
+    @Test
+    @TestMetadata("unicodeSerializationAndDeserialization")
+    public void testUnicodeSerializationAndDeserialization() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/unicodeSerializationAndDeserialization/");
+    }
+
+    @Test
+    @TestMetadata("updateExports")
+    public void testUpdateExports() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/updateExports/");
+    }
+
+    @Test
+    @TestMetadata("updateExportsAndInlineImports")
+    public void testUpdateExportsAndInlineImports() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/updateExportsAndInlineImports/");
+    }
+
+    @Test
+    @TestMetadata("variance")
+    public void testVariance() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidation/variance/");
+    }
+}
@@ -0,0 +1,75 @@
+/*
+ * Copyright 2010-2023 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.incremental;
+
+import com.intellij.testFramework.TestDataPath;
+import org.jetbrains.kotlin.test.util.KtTestUtil;
+import org.jetbrains.kotlin.test.TargetBackend;
+import org.jetbrains.kotlin.test.TestMetadata;
+import org.junit.jupiter.api.Nested;
+import org.junit.jupiter.api.Test;
+
+import java.io.File;
+import java.util.regex.Pattern;
+
+/** This class is generated by {@link org.jetbrains.kotlin.generators.tests.GenerateJsTestsKt}. DO NOT MODIFY MANUALLY */
+@SuppressWarnings("all")
+@TestMetadata("js/js.translator/testData/incremental/invalidationWithPL")
+@TestDataPath("$PROJECT_ROOT")
+public class JsIrInvalidationPerModuleWithPLTestGenerated extends AbstractJsIrInvalidationPerModuleWithPLTest {
+    @Test
+    public void testAllFilesPresentInInvalidationWithPL() throws Exception {
+        KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("js/js.translator/testData/incremental/invalidationWithPL"), Pattern.compile("^([^_](.+))$"), null, TargetBackend.JS_IR, false);
+    }
+
+    @Test
+    @TestMetadata("changeFunctionSignature")
+    public void testChangeFunctionSignature() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidationWithPL/changeFunctionSignature/");
+    }
+
+    @Test
+    @TestMetadata("interfaceBecomeClass")
+    public void testInterfaceBecomeClass() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidationWithPL/interfaceBecomeClass/");
+    }
+
+    @Test
+    @TestMetadata("removeFunction")
+    public void testRemoveFunction() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidationWithPL/removeFunction/");
+    }
+
+    @Test
+    @TestMetadata("removeFunctionFromBlock")
+    public void testRemoveFunctionFromBlock() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidationWithPL/removeFunctionFromBlock/");
+    }
+
+    @Test
+    @TestMetadata("removeFunctionFromChainCall")
+    public void testRemoveFunctionFromChainCall() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidationWithPL/removeFunctionFromChainCall/");
+    }
+
+    @Test
+    @TestMetadata("removeFunctionFromElvis")
+    public void testRemoveFunctionFromElvis() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidationWithPL/removeFunctionFromElvis/");
+    }
+
+    @Test
+    @TestMetadata("removeFunctionFromInline")
+    public void testRemoveFunctionFromInline() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidationWithPL/removeFunctionFromInline/");
+    }
+
+    @Test
+    @TestMetadata("removeInlineFunction")
+    public void testRemoveInlineFunction() throws Exception {
+        runTest("js/js.translator/testData/incremental/invalidationWithPL/removeInlineFunction/");
+    }
+}
@@ -1,17 +1,26 @@
 MODULES: lib1, lib2, main

-STEP 0..1:
+STEP 0:
    libs: lib1, lib2, main
-    dirty js: lib1, lib2, main
+    dirty js modules: lib1, lib2, main
+    dirty js files:   lib1/l1a, lib2/l2, main/m, main/m.export
+STEP 1:
+    libs: lib1, lib2, main
+    dirty js modules: lib1, lib2, main
+    dirty js files:   lib1/l1a, lib1/l1b, lib2/l2, main/m
 STEP 2:
    libs: lib1, lib2, main
-    dirty js: lib1
+    dirty js modules: lib1
+    dirty js files:   lib1/l1a, lib1/l1b
 STEP 3..4:
    libs: lib1, lib2, main
-    dirty js: lib1, lib2, main
+    dirty js modules: lib1, lib2, main
+    dirty js files:   lib1/l1a, lib1/l1b, lib2/l2, main/m
 STEP 5:
    libs: lib1, lib2, main
-    dirty js: lib1
+    dirty js modules: lib1
+    dirty js files:   lib1/l1a, lib1/l1b
 STEP 6..7:
    libs: lib1, lib2, main
-    dirty js: lib1, lib2, main
+    dirty js modules: lib1, lib2, main
+    dirty js files:   lib1/l1a, lib2/l2, main/m
@@ -2,13 +2,21 @@ MODULES: lib1, lib2, main

 STEP 0:
    libs: lib1, main
-    dirty js: lib1, main
-STEP 1..2:
+    dirty js modules: lib1, main
+    dirty js files:   lib1/l1a, lib1/l1b, main/m, main/m.export
+STEP 1:
    libs: lib1, lib2, main
-    dirty js: lib1, lib2, main
+    dirty js modules: lib1, lib2, main
+    dirty js files:   lib1/l1a, lib1/l1b, lib2/l2, main/m
+STEP 2:
+    libs: lib1, lib2, main
+    dirty js modules: lib1, lib2, main
+    dirty js files:   lib1/l1a, lib2/l2, main/m
 STEP 3:
    libs: lib1, main
-    dirty js: lib1, main
+    dirty js modules: lib1, main
+    dirty js files:   lib1/l1a, lib1/l1b, main/m
 STEP 4:
    libs: lib1, main
-    dirty js: lib1
+    dirty js modules: lib1
+    dirty js files:   lib1/l1a, lib1/l1b
@@ -2,7 +2,9 @@ MODULES: lib1, main

 STEP 0:
    libs: lib1, main
-    dirty js: lib1, main
+    dirty js modules: lib1, main
+    dirty js files:   lib1/f, lib1/f1, lib1/f2, lib1/f3, main/m, main/m.export
 STEP 1..3:
    libs: lib1, main
-    dirty js: lib1
+    dirty js modules: lib1
+    dirty js files:   lib1/f, lib1/f1, lib1/f2, lib1/f3
@@ -1,5 +1,10 @@
 MODULES: lib1, main

-STEP 0..2:
+STEP 0:
    libs: lib1, main
-    dirty js: lib1, main
+    dirty js modules: lib1, main
+    dirty js files:   lib1/f, lib1/f1, lib1/f2, lib1/f3, main/m, main/m.export
+STEP 1..2:
+    libs: lib1, main
+    dirty js modules: lib1, main
+    dirty js files:   lib1/f, lib1/f1, lib1/f2, lib1/f3, main/m
@@ -2,7 +2,9 @@ MODULES: lib1, main

 STEP 0:
    libs: lib1, main
-    dirty js: lib1, main
+    dirty js modules: lib1, main
+    dirty js files:   lib1/l1, main/testEquals, main/testToString, main/testHashCode, main/m, main/m.export
 STEP 1..3:
    libs: lib1, main
-    dirty js: lib1, main
+    dirty js modules: lib1, main
+    dirty js files:   lib1/l1, main/testEquals, main/testToString, main/testHashCode, main/m
@@ -2,22 +2,29 @@ MODULES: lib1, main

 STEP 0:
    libs: lib1, main
-    dirty js: lib1, main
+    dirty js modules: lib1, main
+    dirty js files:   lib1/l1, main/m, main/m.export
 STEP 1:
    libs: lib1, main
-    dirty js: lib1
+    dirty js modules: lib1
+    dirty js files:   lib1/l1
 STEP 2..3:
    libs: lib1, main
-    dirty js: lib1, main
+    dirty js modules: lib1, main
+    dirty js files:   lib1/l1, main/m
 STEP 4..7:
    libs: lib1, main
-    dirty js: lib1
+    dirty js modules: lib1
+    dirty js files:   lib1/l1
 STEP 8:
    libs: lib1, main
-    dirty js: lib1, main
+    dirty js modules: lib1, main
+    dirty js files:   lib1/l1, main/m
 STEP 9:
    libs: lib1, main
-    dirty js: lib1
+    dirty js modules: lib1
+    dirty js files:   lib1/l1
 STEP 10..11:
    libs: lib1, main
-    dirty js: lib1, main
+    dirty js modules: lib1, main
+    dirty js files:   lib1/l1, main/m
@@ -2,7 +2,9 @@ MODULES: lib1, lib2, main

 STEP 0:
    libs: lib1, lib2, main
-    dirty js: lib1, lib2, main
+    dirty js modules: lib1, lib2, main
+    dirty js files:   lib1/l1, lib2/l2, main/m, main/m.export
 STEP 1:
    libs: lib1, lib2, main
-    dirty js: lib1
+    dirty js modules: lib1
+    dirty js files:   lib1/l1
@@ -1,8 +1,14 @@
 MODULES: lib1, lib2, main

-STEP 0..4:
+STEP 0:
    libs: lib1, lib2, main
-    dirty js: lib1, lib2, main
+    dirty js modules: lib1, lib2, main
+    dirty js files:   lib1/l1, lib2/l2, main/m, main/m.export
+STEP 1..4:
+    libs: lib1, lib2, main
+    dirty js modules: lib1, lib2, main
+    dirty js files:   lib1/l1, lib2/l2, main/m
 STEP 5:
    libs: lib1, lib2, main
-    dirty js: lib1, lib2
+    dirty js modules: lib1, lib2
+    dirty js files:   lib1/l1, lib2/l2
@@ -2,19 +2,41 @@ MODULES: lib1, lib2, main

 STEP 0:
    libs: lib1, lib2, main
-    dirty js: lib1, lib2, main
+    dirty js modules: lib1, lib2, main
+    dirty js files:   lib1/l1, lib2/l2, lib2/l2string, main/m, main/m.export
 STEP 1:
    libs: lib1, lib2, main
-    dirty js: lib1, lib2
+    dirty js modules: lib1, lib2
+    dirty js files:   lib1/l1, lib2/l2, lib2/l2int
 STEP 2:
    libs: lib1, lib2, main
-    dirty js: lib1
-STEP 3..4:
+    dirty js modules: lib1
+    dirty js files:   lib1/l1
+STEP 3:
    libs: lib1, lib2, main
-    dirty js: lib1, lib2
+    dirty js modules: lib1, lib2
+    dirty js files:   lib1/l1, lib2/l2, lib2/l2pair
+STEP 4:
+    libs: lib1, lib2, main
+    dirty js modules: lib1, lib2
+    dirty js files:   lib1/l1, lib2/l2, lib2/l2func, lib2/l2string
 STEP 5:
    libs: lib1, lib2, main
-    dirty js: lib1
-STEP 6..10:
+    dirty js modules: lib1
+    dirty js files:   lib1/l1
+STEP 6:
    libs: lib1, lib2, main
-    dirty js: lib1, lib2
+    dirty js modules: lib1, lib2
+    dirty js files:   lib1/l1, lib2/l2, lib2/l2func, lib2/l2string, lib2/l2pair
+STEP 7:
+    libs: lib1, lib2, main
+    dirty js modules: lib1, lib2
+    dirty js files:   lib1/l1
+STEP 8:
+    libs: lib1, lib2, main
+    dirty js modules: lib1, lib2
+    dirty js files:   lib1/l1, lib2/l2int
+STEP 9..10:
+    libs: lib1, lib2, main
+    dirty js modules: lib1, lib2
+    dirty js files:   lib1/l1, lib2/l2, lib2/l2int
@@ -2,10 +2,13 @@ MODULES: lib1, main

 STEP 0:
    libs: lib1, main
-    dirty js: lib1, main
+    dirty js modules: lib1, main
+    dirty js files:   lib1/l1, main/f, main/m, main/m.export
 STEP 1..2:
    libs: lib1, main
-    dirty js: lib1
+    dirty js modules: lib1
+    dirty js files:   lib1/l1
 STEP 3:
    libs: lib1, main
-    dirty js: main
+    dirty js modules: main
+    dirty js files:   main/f
@@ -1,5 +1,10 @@
 MODULES: lib1, lib2, main

-STEP 0..3:
+STEP 0:
    libs: lib1, lib2, main
-    dirty js: lib1, lib2, main
+    dirty js modules: lib1, lib2, main
+    dirty js files: lib1/l1, lib2/l2, main/m, main/m.export
+STEP 1..3:
+    libs: lib1, lib2, main
+    dirty js modules: lib1, lib2, main
+    dirty js files: lib1/l1, lib2/l2, main/m
@@ -2,13 +2,17 @@ MODULES: lib1, lib2, main

 STEP 0:
    libs: lib1, lib2, main
-    dirty js: lib1, lib2, main
+    dirty js modules: lib1, lib2, main
+    dirty js files: lib1/l1, lib2/l2, main/m, main/m.export
 STEP 1:
    libs: lib1, lib2, main
-    dirty js: lib1, lib2
+    dirty js modules: lib1, lib2
+    dirty js files: lib1/l1, lib2/l2
 STEP 2:
    libs: lib1, lib2, main
-    dirty js: lib1, lib2, main
+    dirty js modules: lib1, lib2, main
+    dirty js files: lib1/l1, lib2/l2, main/m
 STEP 3:
    libs: lib1, lib2, main
-    dirty js: lib1, lib2
+    dirty js modules: lib1, lib2
+    dirty js files: lib1/l1, lib2/l2
@@ -2,13 +2,17 @@ MODULES: lib1, lib2, main

 STEP 0:
    libs: lib1, lib2, main
-    dirty js: lib1, lib2, main
+    dirty js modules: lib1, lib2, main
+    dirty js files: lib1/l1, lib2/l2, main/m, main/m.export
 STEP 1..4:
    libs: lib1, lib2, main
-    dirty js: lib1, lib2
+    dirty js modules: lib1, lib2
+    dirty js files: lib1/l1, lib2/l2
 STEP 5:
    libs: lib1, lib2, main
-    dirty js: lib1, main
+    dirty js modules: lib1, main
+    dirty js files: lib1/l1, main/m
 STEP 6:
    libs: lib1, lib2, main
-    dirty js: lib1, lib2, main
+    dirty js modules: lib1, lib2
+    dirty js files: lib1/l1, lib2/l2
@@ -1,8 +1,10 @@
+IGNORE_PER_FILE: true
+
 MODULES: lib1, main

 STEP 0:
    libs: lib1, main
-    dirty js: lib1, main
+    dirty js modules: lib1, main
 STEP 1..3:
    libs: lib1, main
-    dirty js: lib1
+    dirty js modules: lib1
@@ -2,15 +2,19 @@ MODULES: lib1, main

 STEP 0:
    libs: lib1, main
-    dirty js: lib1, main
+    dirty js modules: lib1, main
+    dirty js files:   lib1/l1, main/testEnumEntries, main/testEnumValues, main/m, main/m.export
 STEP 1:
    libs: lib1, main
-    dirty js: lib1
+    dirty js modules: lib1
+    dirty js files:   lib1/l1
 STEP 2:
    language: +EnumEntries
    libs: lib1, main
-    dirty js: main, lib1
+    dirty js modules: main, lib1
+    dirty js files:   lib1/l1, main/testEnumEntries, main/testEnumValues, main/m, main/m.export
 STEP 3:
    language: +EnumEntries
    libs: lib1, main
-    dirty js: main, lib1
+    dirty js modules: main, lib1
+    dirty js files:   lib1/l1, main/testEnumEntries
@@ -1,5 +1,14 @@
 MODULES: lib1, lib2, main

-STEP 0..4:
+STEP 0:
    libs: lib1, lib2, main
-    dirty js: lib1, lib2, main
+    dirty js modules: lib1, lib2, main
+    dirty js files:   lib1/l1, lib2/l2, main/m, main/m.export
+STEP 1..2:
+    libs: lib1, lib2, main
+    dirty js modules: lib1, lib2
+    dirty js files:   lib1/l1, lib2/l2
+STEP 3..4:
+    libs: lib1, lib2, main
+    dirty js modules: lib1, lib2
+    dirty js files:   lib1/l1, lib2/l2
@@ -2,25 +2,33 @@ MODULES: lib1, lib2, main

 STEP 0:
    libs: lib1, lib2, main
-    dirty js: lib1, lib2, main
+    dirty js modules: lib1, lib2, main
+    dirty js files:   lib1/l1, lib2/l2, main/m, main/m.export
 STEP 1:
    libs: lib1, lib2, main
-    dirty js: lib1, lib2
+    dirty js modules: lib1, lib2
+    dirty js files:   lib1/l1, lib2/l2
 STEP 2:
    libs: lib1, lib2, main
-    dirty js: lib1, lib2, main
+    dirty js modules: lib2
+    dirty js files:   lib2/l2
 STEP 3:
    libs: lib1, lib2, main
-    dirty js: lib1, lib2
+    dirty js modules: lib1, lib2
+    dirty js files:   lib1/l1, lib2/l2
 STEP 4:
    libs: lib1, lib2, main
-    dirty js: lib2, main
+    dirty js modules: lib2
+    dirty js files:   lib2/l2
 STEP 5..6:
    libs: lib1, lib2, main
-    dirty js: lib1, lib2, main
+    dirty js modules: lib1, lib2
+    dirty js files:   lib1/l1, lib2/l2
 STEP 7:
    libs: lib1, lib2, main
-    dirty js: lib2
+    dirty js modules: lib2
+    dirty js files:   lib2/l2
 STEP 8:
    libs: lib1, lib2, main
-    dirty js: lib1, lib2
+    dirty js modules: lib1, lib2
+    dirty js files:   lib1/l1, lib2/l2
@@ -1,11 +1,18 @@
 MODULES: lib1, main

-STEP 0..4:
+STEP 0:
    libs: lib1, main
-    dirty js: lib1, main
+    dirty js modules: lib1, main
+    dirty js files:   lib1/l1, lib1/l2, main/m, main/m.export
+STEP 1..4:
+    libs: lib1, main
+    dirty js modules: lib1, main
+    dirty js files:   lib1/l1, lib1/l2, main/m
 STEP 5:
    libs: lib1, main
-    dirty js: lib1
+    dirty js modules: lib1
+    dirty js files:   lib1/l1
 STEP 6..7:
    libs: lib1, main
-    dirty js: lib1, main
+    dirty js modules: lib1, main
+    dirty js files:   lib1/l1, lib1/l2, main/m
@@ -1,23 +1,34 @@
 MODULES: lib1, lib2, main

-STEP 0..1:
+STEP 0:
    libs: lib1, lib2, main
-    dirty js: lib1, lib2, main
+    dirty js modules: lib1, lib2, main
+    dirty js files:   lib1/l1, lib2/l2, main/m, main/m.export
+STEP 1:
+    libs: lib1, lib2, main
+    dirty js modules: lib1, lib2, main
+    dirty js files:   lib1/l1, lib2/l2, main/m
 STEP 2:
    libs: lib1, lib2, main
-    dirty js: lib1, lib2
+    dirty js modules: lib1, lib2
+    dirty js files:   lib1/l1, lib2/l2
 STEP 3:
    libs: lib1, lib2, main
-    dirty js: lib1
+    dirty js modules: lib1
+    dirty js files:   lib1/l1
 STEP 4:
    libs: lib1, lib2, main
-    dirty js: main, lib1, lib2
+    dirty js modules: main, lib1, lib2
+    dirty js files:   lib1/l1, lib2/l2, main/m
 STEP 5:
    libs: lib1, lib2, main
-    dirty js: lib1
+    dirty js modules: lib1
+    dirty js files:   lib1/l1
 STEP 6..10:
    libs: lib1, lib2, main
-    dirty js: lib1, lib2, main
+    dirty js modules: lib1, lib2, main
+    dirty js files:   lib1/l1, lib2/l2, main/m
 STEP 11:
    libs: lib1, lib2, main
-    dirty js: lib1
+    dirty js modules: lib1
+    dirty js files:   lib1/l1
@@ -2,7 +2,25 @@ MODULES: lib1, main

 STEP 0:
    libs: lib1, main
-    dirty js: lib1, main
-STEP 1..5:
+    dirty js modules: lib1, main
+    dirty js files:   lib1/A, lib1/B, lib1/C, main/classABC, main/m, main/m.export
+STEP 1:
    libs: lib1, main
-    dirty js: lib1, main
+    dirty js modules: lib1, main
+    dirty js files:   lib1/A, lib1/B, lib1/C, main/classABC, main/m
+STEP 2:
+    libs: lib1, main
+    dirty js modules: lib1, main
+    dirty js files:   lib1/B, lib1/C, main/classABC, main/m
+STEP 3:
+    libs: lib1, main
+    dirty js modules: lib1, main
+    dirty js files:   lib1/A, lib1/B, lib1/C, main/classABC, main/m
+STEP 4:
+    libs: lib1, main
+    dirty js modules: lib1, main
+    dirty js files:   lib1/B, lib1/C, main/classABC, main/m
+STEP 5:
+    libs: lib1, main
+    dirty js modules: lib1, main
+    dirty js files:   lib1/A, lib1/B, lib1/C, main/classABC, main/m
@@ -2,7 +2,9 @@ MODULES: lib1, main

 STEP 0:
    libs: lib1, main
-    dirty js: lib1, main
+    dirty js modules: lib1, main
+    dirty js files:   lib1/l1, main/classA, main/m, main/m.export
 STEP 1..4:
    libs: lib1, main
-    dirty js: lib1, main
+    dirty js modules: lib1, main
+    dirty js files:   lib1/l1, main/classA, main/m
@@ -1,5 +1,10 @@
 MODULES: lib1, lib2, main

-STEP 0..2:
+STEP 0:
    libs: lib1, lib2, main
-    dirty js: lib1, lib2, main
+    dirty js modules: lib1, lib2, main
+    dirty js files:   lib1/l1, lib2/l2, main/m, main/m.export
+STEP 1..2:
+    libs: lib1, lib2, main
+    dirty js modules: lib1, lib2, main
+    dirty js files:   lib1/l1, lib2/l2, main/m
@@ -2,7 +2,9 @@ MODULES: lib1, main

 STEP 0:
    libs: lib1, main
-    dirty js: lib1, main
+    dirty js modules: lib1, main
+    dirty js files:   lib1/l1, main/classA, main/m, main/m.export
 STEP 1..2:
    libs: lib1, main
-    dirty js: lib1, main
+    dirty js modules: lib1, main
+    dirty js files:   lib1/l1, main/classA, main/m
@@ -1,26 +1,38 @@
 MODULES: lib1, lib2, main

-STEP 0..1:
+STEP 0:
    libs: lib1, lib2, main
-    dirty js: lib1, lib2, main
+    dirty js modules: lib1, lib2, main
+    dirty js files:   lib1/l1, lib2/class2, lib2/object2, main/m, main/m.export
+STEP 1:
+    libs: lib1, lib2, main
+    dirty js modules: lib1, lib2, main
+    dirty js files:   lib1/l1, lib2/class2, lib2/object2, main/m
 STEP 2:
    libs: lib1, lib2, main
-    dirty js: lib1, lib2
+    dirty js modules: lib1, lib2
+    dirty js files:   lib1/l1, lib2/class2, lib2/object2
 STEP 3:
    libs: lib1, lib2, main
-    dirty js: lib1, lib2
+    dirty js modules: lib1, lib2
+    dirty js files:   lib1/l1, lib2/class2, lib2/object2
 STEP 4:
    libs: lib1, lib2, main
-    dirty js: lib2, main
+    dirty js modules: lib2, main
+    dirty js files:   lib2/class2, lib2/object2, main/m
 STEP 5:
    libs: lib1, lib2, main
-    dirty js: lib1
+    dirty js modules: lib1
+    dirty js files:   lib1/l1
 STEP 6:
    libs: lib1, lib2, main
-    dirty js: lib1, lib2, main
+    dirty js modules: lib1, lib2, main
+    dirty js files:   lib1/l1, lib2/class2, lib2/object2, main/m
 STEP 7:
    libs: lib1, lib2, main
-    dirty js: lib1, lib2
+    dirty js modules: lib1, lib2
+    dirty js files:   lib1/l1, lib2/class2, lib2/object2
 STEP 8:
    libs: lib1, lib2, main
-    dirty js: lib2, main
+    dirty js modules: lib2, main
+    dirty js files:   lib2/class2, lib2/object2, main/m
@@ -2,7 +2,9 @@ MODULES: lib1, lib2, main

 STEP 0:
    libs: lib1, lib2, main
-    dirty js: lib1, lib2, main
+    dirty js modules: lib1, lib2, main
+    dirty js files:   lib1/l1, lib2/l2, main/m, main/m.export
 STEP 1:
    libs: lib1, lib2, main
-    dirty js: lib2
+    dirty js modules: lib2
+    dirty js files:   lib2/l2
@@ -2,6 +2,7 @@ MODULES: lib1, lib2, main

 STEP 0:
    libs: lib1, lib2, main
-    dirty js: lib1, lib2, main
+    dirty js modules: lib1, lib2, main
+    dirty js files:   lib1/l1, lib2/l2, main/m, main/m.export
 STEP 1:
    libs: lib1, lib2, main
@@ -2,22 +2,29 @@ MODULES: lib1, main

 STEP 0:
    libs: lib1, main
-    dirty js: lib1, main
+    dirty js modules: lib1, main
+    dirty js files:   lib1/l1, main/publicClass, main/test, main/m, main/m.export
 STEP 1..2:
    libs: lib1, main
-    dirty js: lib1
+    dirty js modules: lib1
+    dirty js files:   lib1/l1
 STEP 3:
    libs: lib1, main
-    dirty js: lib1, main
+    dirty js modules: lib1, main
+    dirty js files:   lib1/l1, main/publicClass, main/test
 STEP 4:
    libs: lib1, main
-    dirty js: main
+    dirty js modules: main
+    dirty js files:   main/publicClass, main/test
 STEP 5..6:
    libs: lib1, main
-    dirty js: lib1, main
+    dirty js modules: lib1, main
+    dirty js files:   lib1/l1, main/publicClass, main/test
 STEP 7:
    libs: lib1, main
-    dirty js: main
+    dirty js modules: main
+    dirty js files:   main/publicClass, main/test
 STEP 8..9:
    libs: lib1, main
-    dirty js: lib1, main
+    dirty js modules: lib1, main
+    dirty js files:   lib1/l1, main/publicClass
@@ -2,13 +2,17 @@ MODULES: lib1, main

 STEP 0:
    libs: lib1, main
-    dirty js: lib1, main
+    dirty js modules: lib1, main
+    dirty js files:   lib1/l1, main/m, main/m.export
 STEP 1:
    libs: lib1, main
-    dirty js: lib1
+    dirty js modules: lib1
+    dirty js files:   lib1/l1
 STEP 2:
    libs: lib1, main
-    dirty js: lib1, main
+    dirty js modules: lib1, main
+    dirty js files:   lib1/l1, main/m
 STEP 3:
    libs: lib1, main
-    dirty js: lib1
+    dirty js modules: lib1
+    dirty js files:   lib1/l1
@@ -2,13 +2,17 @@ MODULES: lib1, main

 STEP 0:
    libs: lib1, main
-    dirty js: lib1, main
+    dirty js modules: lib1, main
+    dirty js files:   lib1/l1, main/m, main/m.export
 STEP 1..6:
    libs: lib1, main
-    dirty js: lib1, main
+    dirty js modules: lib1, main
+    dirty js files:   lib1/l1, main/m
 STEP 7..8:
    libs: lib1, main
-    dirty js: lib1, main
+    dirty js modules: lib1, main
+    dirty js files:   lib1/l1, main/m
 STEP 9..16:
    libs: lib1, main
-    dirty js: lib1, main
+    dirty js modules: lib1, main
+    dirty js files:   lib1/l1, main/m
@@ -2,19 +2,33 @@ MODULES: lib1, lib2, main

 STEP 0:
    libs: lib1, lib2, main
-    dirty js: lib1, lib2, main
-STEP 1..8:
+    dirty js modules: lib1, lib2, main
+    dirty js files:   lib1/l1, lib2/l2b, lib2/l2a, main/m, main/m.export
+STEP 1..4:
    libs: lib1, lib2, main
-    dirty js: lib2
+    dirty js modules: lib2
+    dirty js files:   lib2/l2a
+STEP 5:
+    libs: lib1, lib2, main
+    dirty js modules: lib2
+    dirty js files:   lib2/l2b
+STEP 6..8:
+    libs: lib1, lib2, main
+    dirty js modules: lib2
+    dirty js files:   lib2/l2a
 STEP 9:
    libs: lib1, lib2, main
-    dirty js: lib1, lib2
+    dirty js modules: lib1, lib2
+    dirty js files:   lib1/l1, lib2/l2a
 STEP 10:
    libs: lib1, lib2, main
-    dirty js: lib2
+    dirty js modules: lib2
+    dirty js files:   lib2/l2a
 STEP 11..12:
    libs: lib1, lib2, main
-    dirty js: lib1, lib2
+    dirty js modules: lib1, lib2
+    dirty js files:   lib1/l1, lib2/l2a
 STEP 13..15:
    libs: lib1, lib2, main
-    dirty js: lib2
+    dirty js modules: lib2
+    dirty js files:   lib2/l2a
@@ -1,5 +1,18 @@
 MODULES: lib1, main

-STEP 0..3:
+STEP 0:
    libs: lib1, main
-    dirty js: lib1, main
+    dirty js modules: lib1, main
+    dirty js files:   lib1/A, lib1/B, lib1/C, main/test, main/m, main/m.export
+STEP 1:
+    libs: lib1, main
+    dirty js modules: lib1, main
+    dirty js files:   lib1/A, lib1/B, main/test
+STEP 2:
+    libs: lib1, main
+    dirty js modules: lib1, main
+    dirty js files:   lib1/A, main/test
+STEP 3:
+    libs: lib1, main
+    dirty js modules: lib1, main
+    dirty js files:   lib1/C, main/test
@@ -2,7 +2,9 @@ MODULES: lib1, main

 STEP 0:
    libs: lib1, main
-    dirty js: lib1, main
+    dirty js modules: lib1, main
+    dirty js files:   lib1/l1, main/m, main/m.export
 STEP 1..4:
    libs: lib1, main
-    dirty js: lib1, main
+    dirty js modules: lib1, main
+    dirty js files:   lib1/l1, main/m
@@ -1,8 +1,14 @@
 MODULES: lib1, main, libProxy

-STEP 0..7:
+STEP 0:
    libs: lib1, main
-    dirty js: lib1, main
+    dirty js modules: lib1, main
+    dirty js files:   lib1/l1, main/m, main/m.export
+STEP 1..7:
+    libs: lib1, main
+    dirty js modules: lib1, main
+    dirty js files:   lib1/l1, main/m
 STEP 8..23:
    libs: lib1, libProxy, main
-    dirty js: lib1, libProxy, main
+    dirty js modules: lib1, libProxy, main
+    dirty js files:   lib1/l1, libProxy/proxy, main/m
@@ -1,8 +1,14 @@
 MODULES: lib1, lib2, main

-STEP 0..3:
+STEP 0:
    libs: lib1, lib2, main
-    dirty js: lib1, lib2, main
+    dirty js modules: lib1, lib2, main
+    dirty js files:   lib1/l1, lib2/l2, main/m, main/m.export
+STEP 1..3:
+    libs: lib1, lib2, main
+    dirty js modules: lib1, lib2, main
+    dirty js files:   lib1/l1, lib2/l2, main/m
 STEP 4:
    libs: lib1, lib2, main
-    dirty js: lib2, main
+    dirty js modules: lib2, main
+    dirty js files:   lib2/l2, main/m
@@ -1,8 +1,14 @@
 MODULES: lib1, main

-STEP 0..1:
+STEP 0:
    libs: lib1, main
-    dirty js: lib1, main
+    dirty js modules: lib1, main
+    dirty js files:   lib1/l1, main/m, main/m.export
+STEP 1:
+    libs: lib1, main
+    dirty js modules: lib1, main
+    dirty js files:   lib1/l1, main/m
 STEP 2:
    libs: lib1, main
-    dirty js: lib1
+    dirty js modules: lib1
+    dirty js files:   lib1/l1
@@ -1,5 +1,18 @@
 MODULES: lib1, main

-STEP 0..4:
+STEP 0:
    libs: lib1, main
-    dirty js: lib1, main
+    dirty js modules: lib1, main
+    dirty js files:   lib1/l1, main/m, main/m.export
+STEP 1:
+    libs: lib1, main
+    dirty js modules: lib1, main
+    dirty js files:   lib1/l1, lib1/l1.export, main/m
+STEP 2..3:
+    libs: lib1, main
+    dirty js modules: lib1, main
+    dirty js files:   lib1/l1, lib1/l1.export, main/m
+STEP 4:
+    libs: lib1, main
+    dirty js modules: lib1, main
+    dirty js files:   lib1/l1, main/m
@@ -1,5 +1,18 @@
 MODULES: lib1, main

-STEP 0..3:
+STEP 0:
    libs: lib1, main
-    dirty js: lib1, main
+    dirty js modules: lib1, main
+    dirty js files:   lib1/l1, lib1/l2, main/m, main/m.export
+STEP 1:
+    libs: lib1, main
+    dirty js modules: lib1, main
+    dirty js files:   lib1/l1, lib1/l2, main/m
+STEP 2:
+    libs: lib1, main
+    dirty js modules: lib1, main
+    dirty js files:   lib1/l2, main/m
+STEP 3:
+    libs: lib1, main
+    dirty js modules: lib1, main
+    dirty js files:   lib1/l1, lib1/l2, main/m
@@ -1,5 +1,10 @@
 MODULES: lib1, main

-STEP 0..9:
+STEP 0:
    libs: lib1, main
-    dirty js: lib1, main
+    dirty js modules: lib1, main
+    dirty js files:   lib1/l1, main/m, main/m.export
+STEP 1..9:
+    libs: lib1, main
+    dirty js modules: lib1, main
+    dirty js files:   lib1/l1, main/m
@@ -1,5 +1,10 @@
 MODULES: lib1, main

-STEP 0..2:
+STEP 0:
    libs: lib1, main
-    dirty js: lib1, main
+    dirty js modules: lib1, main
+    dirty js files:   lib1/l1a, lib1/l1b, main/m, main/m.export
+STEP 1..2:
+    libs: lib1, main
+    dirty js modules: lib1, main
+    dirty js files:   lib1/l1a, lib1/l1b, main/m
@@ -1,5 +1,10 @@
 MODULES: lib1, main

-STEP 0..3:
+STEP 0:
    libs: lib1, main
-    dirty js: lib1, main
+    dirty js modules: lib1, main
+    dirty js files:   lib1/l1, main/m, main/m.export
+STEP 1..3:
+    libs: lib1, main
+    dirty js modules: lib1, main
+    dirty js files:   lib1/l1, main/m
@@ -2,7 +2,9 @@ MODULES: lib1, lib2, main

 STEP 0:
    libs: lib1, lib2, main
-    dirty js: lib1, lib2, main
+    dirty js modules: lib1, lib2, main
+    dirty js files:   lib1/l1, lib2/l2, main/m, main/m.export
 STEP 1:
    libs: lib1, lib2, main
-    dirty js: lib2, main
+    dirty js modules: lib2, main
+    dirty js files:   lib2/l2, main/m
@@ -1,14 +1,22 @@
 MODULES: lib1, lib2, main

-STEP 0..1:
+STEP 0:
    libs: lib1, lib2, main
-    dirty js: lib1, lib2, main
+    dirty js modules: lib1, lib2, main
+    dirty js files:   lib1/InterfaceA, lib1/InterfaceB, lib1/InterfaceC, lib2/MyClass, lib2/GetA, lib2/GetB, lib2/GetC, main/test, main/m, main/m.export
+STEP 1:
+    libs: lib1, lib2, main
+    dirty js modules: lib1, lib2, main
+    dirty js files:   lib1/InterfaceA, lib1/InterfaceB, lib1/InterfaceC, lib2/MyClass, lib2/GetA, lib2/GetB, lib2/GetC, main/test
 STEP 2:
    libs: lib1, lib2, main
-    dirty js: lib1, main
+    dirty js modules: lib1, main
+    dirty js files:   lib1/InterfaceB, lib1/InterfaceC, main/test
 STEP 3:
    libs: lib1, lib2, main
-    dirty js: lib1, lib2, main
+    dirty js modules: lib1, lib2, main
+    dirty js files:   lib1/InterfaceA, lib1/InterfaceB, lib1/InterfaceC, lib2/MyClass, lib2/GetA, lib2/GetB, lib2/GetC, main/test
 STEP 4:
    libs: lib1, lib2, main
-    dirty js: lib1, main
+    dirty js modules: lib1, main
+    dirty js files:   lib1/InterfaceA, lib1/InterfaceB, lib1/InterfaceC, main/test
@@ -2,19 +2,25 @@ MODULES: lib1, lib2, main

 STEP 0:
    libs: lib1, lib2, main
-    dirty js: lib1, lib2, main
+    dirty js modules: lib1, lib2, main
+    dirty js files:   lib1/InterfaceA, lib1/ClassB, lib2/MyClass, lib2/GetA, lib2/GetB, main/test, main/m, main/m.export
 STEP 1..3:
    libs: lib1, lib2, main
-    dirty js: lib1, main
+    dirty js modules: lib1, main
+    dirty js files:   lib1/InterfaceA, lib1/ClassB, main/test
 STEP 4:
    libs: lib1, lib2, main
-    dirty js: main
+    dirty js modules: main
+    dirty js files:   main/test
 STEP 5:
    libs: lib1, lib2, main
-    dirty js: lib1, lib2, main
+    dirty js modules: lib1, lib2, main
+    dirty js files:   lib1/InterfaceA, lib1/ClassB, lib2/MyClass, lib2/GetA, main/test
 STEP 6:
    libs: lib1, lib2, main
-    dirty js: lib1, main
+    dirty js modules: lib1, main
+    dirty js files:   lib1/InterfaceA, lib1/ClassB, main/test
 STEP 7:
    libs: lib1, lib2, main
-    dirty js: lib1, lib2, main
+    dirty js modules: lib1, lib2, main
+    dirty js files:   lib1/InterfaceA, lib1/ClassB, lib2/MyClass, main/test
@@ -1,29 +1,42 @@
 MODULES: lib1, main

-STEP 0..1:
+STEP 0:
    libs: lib1, main
-    dirty js: lib1, main
+    dirty js modules: lib1, main
+    dirty js files:   lib1/Interface, lib1/ClassA, lib1/ClassB, main/test, main/m, main/m.export
+STEP 1:
+    libs: lib1, main
+    dirty js modules: lib1, main
+    dirty js files:   lib1/ClassB, main/test
 STEP 2:
    libs: lib1, main
-    dirty js: lib1
+    dirty js modules: lib1
+    dirty js files:   lib1/Interface
 STEP 3:
    libs: lib1, main
-    dirty js: lib1, main
+    dirty js modules: lib1, main
+    dirty js files:   lib1/ClassB, main/test
 STEP 4:
    libs: lib1, main
-    dirty js: lib1
+    dirty js modules: lib1
+    dirty js files:   lib1/ClassA, lib1/ClassB, lib1/Interface
 STEP 5:
    libs: lib1, main
-    dirty js: lib1, main
+    dirty js modules: lib1, main
+    dirty js files:   lib1/ClassB, main/test
 STEP 6:
    libs: lib1, main
-    dirty js: lib1
+    dirty js modules: lib1
+    dirty js files:   lib1/Interface, lib1/ClassB
 STEP 7:
    libs: lib1, main
-    dirty js: lib1, main
+    dirty js modules: lib1, main
+    dirty js files:   lib1/ClassB, main/test
 STEP 8:
    libs: lib1, main
-    dirty js: lib1
+    dirty js modules: lib1
+    dirty js files:   lib1/ClassA
 STEP 9..10:
    libs: lib1, main
-    dirty js: lib1, main
+    dirty js modules: lib1, main
+    dirty js files:   lib1/ClassA, main/test
@@ -2,25 +2,33 @@ MODULES: lib1, lib2, main

 STEP 0:
    libs: lib1, lib2, main
-    dirty js: lib1, lib2, main
+    dirty js modules: lib1, lib2, main
+    dirty js files:   lib1/l1, lib2/l2, lib2/l2test, main/m, main/m.export
 STEP 1..2:
    libs: lib1, lib2, main
-    dirty js: lib1, lib2
+    dirty js modules: lib1, lib2
+    dirty js files:   lib1/l1, lib2/l2, lib2/l2test
 STEP 3:
    libs: lib1, lib2, main
-    dirty js: lib2
+    dirty js modules: lib2
+    dirty js files:   lib2/l2test
 STEP 4:
    libs: lib1, lib2, main
-    dirty js: lib1, lib2
+    dirty js modules: lib1, lib2
+    dirty js files:   lib1/l1, lib2/l2, lib2/l2test
 STEP 5:
    libs: lib1, lib2, main
-    dirty js: lib2
+    dirty js modules: lib2
+    dirty js files:   lib2/l2test
 STEP 6:
    libs: lib1, lib2, main
-    dirty js: lib1, lib2
+    dirty js modules: lib1, lib2
+    dirty js files:   lib1/l1, lib2/l2, lib2/l2test
 STEP 7:
    libs: lib1, lib2, main
-    dirty js: lib2
+    dirty js modules: lib2
+    dirty js files:   lib2/l2test
 STEP 8:
    libs: lib1, lib2, main
-    dirty js: lib1
+    dirty js modules: lib1
+    dirty js files:   lib1/l1
@@ -1,5 +1,10 @@
 MODULES: lib1, main

-STEP 0..3:
+STEP 0:
    libs: lib1, main
-    dirty js: lib1, main
+    dirty js modules: lib1, main
+    dirty js files:   lib1/l1, main/m, main/m.export
+STEP 1..3:
+    libs: lib1, main
+    dirty js modules: lib1, main
+    dirty js files:   lib1/l1, main/m
@@ -0,0 +1,34 @@
+MODULES: lib1, main
+
+STEP 0:
+    libs: lib1, main
+    dirty js modules: lib1, main
+    dirty js files:   lib1/l1, lib1/js, lib1/test, main/m, main/m.export
+STEP 1:
+    libs: lib1, main
+    dirty js modules: lib1
+    dirty js files:   lib1/js
+STEP 2:
+    libs: lib1, main
+    dirty js modules: lib1
+    dirty js files:   lib1/js
+STEP 3:
+    libs: lib1, main
+    dirty js modules: lib1
+    dirty js files:   lib1/js, lib1/l1
+STEP 4:
+    libs: lib1, main
+    dirty js modules: lib1
+    dirty js files:   lib1/test
+STEP 5:
+    libs: lib1, main
+    dirty js modules: lib1
+    dirty js files:   lib1/js, lib1/l1
+STEP 6:
+    libs: lib1, main
+    dirty js modules: lib1
+    dirty js files:   lib1/js
+STEP 7:
+    libs: lib1, main
+    dirty js modules: lib1
+    dirty js files:   lib1/js, lib1/l1
@@ -2,7 +2,21 @@ MODULES: lib1, main

 STEP 0:
    libs: lib1, main
-    dirty js: lib1, main
-STEP 1..7:
+    dirty js modules: lib1, main
+    dirty js files:   lib1/l1, lib1/js, lib1/test, main/m, main/m.export
+STEP 1:
    libs: lib1, main
-    dirty js: lib1
+    dirty js modules: lib1
+    dirty js files:   lib1/js
+STEP 2..3:
+    libs: lib1, main
+    dirty js modules: lib1
+    dirty js files:   lib1/js, lib1/l1
+STEP 4:
+    libs: lib1, main
+    dirty js modules: lib1
+    dirty js files:   lib1/test
+STEP 5..7:
+    libs: lib1, main
+    dirty js modules: lib1
+    dirty js files:   lib1/js, lib1/l1
@@ -1,5 +1,18 @@
 MODULES: lib1, main

-STEP 0..6:
+STEP 0:
    libs: lib1, main
-    dirty js: lib1, main
+    dirty js modules: lib1, main
+    dirty js files:   lib1/l1, main/m, main/m.export
+STEP 1:
+    libs: lib1, main
+    dirty js modules: lib1, main
+    dirty js files:   lib1/l1, lib1/l1.export, main/m
+STEP 2..3:
+    libs: lib1, main
+    dirty js modules: lib1, main
+    dirty js files:   lib1/l1, lib1/l1.export, main/m
+STEP 4..6:
+    libs: lib1, main
+    dirty js modules: lib1, main
+    dirty js files:   lib1/l1, lib1/l1.export, main/m
@@ -1,5 +1,10 @@
 MODULES: lib1, main

-STEP 0..1:
+STEP 0:
    libs: lib1, main
-    dirty js: lib1, main
+    dirty js modules: lib1, main
+    dirty js files:   lib1/ObjectA, lib1/ObjectB, main/m, main/m.export
+STEP 1:
+    libs: lib1, main
+    dirty js modules: lib1, main
+    dirty js files:   lib1/ObjectB, main/m
@@ -2,19 +2,23 @@ MODULES: lib1, main

 STEP 0:
    libs: lib1, main
-    dirty js: lib1, main
+    dirty js modules: lib1, main
+    dirty js files:   lib1/l1, main/m, main/m.export
 STEP 1:
    language: +TypeAliases
    libs: lib1, main
-    dirty js: lib1, main
+    dirty js modules: lib1, main
+    dirty js files:   lib1/l1, main/m, main/m.export
 STEP 2:
    language: +TypeAliases, +BoundCallableReferences, +LocalDelegatedProperties, +TopLevelSealedInheritance
    libs: lib1, main
-    dirty js: lib1, main
+    dirty js modules: lib1, main
+    dirty js files:   lib1/l1, main/m, main/m.export
 STEP 3:
    language: +TypeAliases, +BoundCallableReferences, +TopLevelSealedInheritance
    libs: lib1, main
-    dirty js: lib1, main
+    dirty js modules: lib1, main
+    dirty js files:   lib1/l1, main/m, main/m.export
 STEP 4:
    language: +BoundCallableReferences, +TopLevelSealedInheritance, +TypeAliases
    libs: lib1, main
@@ -24,7 +28,8 @@ STEP 5:
 STEP 6:
    language: +BoundCallableReferences, -TypeAliases, +TopLevelSealedInheritance
    libs: lib1, main
-    dirty js: lib1, main
+    dirty js modules: lib1, main
+    dirty js files:   lib1/l1, main/m, main/m.export
 STEP 7:
    language: +TopLevelSealedInheritance, +BoundCallableReferences, +TypeAliases
    libs: lib1, main
@@ -2,7 +2,9 @@ MODULES: lib1, main

 STEP 0:
    libs: lib1, main
-    dirty js: lib1, main
+    dirty js modules: lib1, main
+    dirty js files:   lib1/l1, main/m, main/m.export
 STEP 1:
    libs: lib1, main
-    dirty js: lib1
+    dirty js modules: lib1
+    dirty js files:   lib1/l1
@@ -2,16 +2,25 @@ MODULES: lib1, main

 STEP 0:
    libs: lib1, main
-    dirty js: lib1, main
+    dirty js modules: lib1, main
+    dirty js files:   lib1/classA, lib1/interface, main/test, main/m, main/m.export
 STEP 1:
    libs: lib1, main
-    dirty js: lib1
+    dirty js modules: lib1
+    dirty js files:   lib1/classA, lib1/interface
 STEP 2:
    libs: lib1, main
-    dirty js: lib1, main
+    dirty js modules: lib1, main
+    dirty js files:   lib1/classA, lib1/interface, main/test
 STEP 3:
    libs: lib1, main
-    dirty js: main
-STEP 4..5:
+    dirty js modules: main
+    dirty js files:   main/test
+STEP 4:
    libs: lib1, main
-    dirty js: lib1, main
+    dirty js modules: lib1, main
+    dirty js files:   lib1/interface, lib1/classA, main/test
+STEP 5:
+    libs: lib1, main
+    dirty js modules: lib1, main
+    dirty js files:   lib1/interface, main/test
@@ -2,7 +2,9 @@ MODULES: lib1, main

 STEP 0:
    libs: lib1, main
-    dirty js: lib1, main
+    dirty js modules: lib1, main
+    dirty js files:   lib1/l1, main/m0, main/m1, main/m, main/m.export
 STEP 1:
    libs: lib1, main
-    dirty js: main
+    dirty js modules: main
+    dirty js files:   main/m
@@ -2,7 +2,9 @@ MODULES: lib1, main

 STEP 0:
    libs: lib1, main
-    dirty js: lib1, main
+    dirty js modules: lib1, main
+    dirty js files:   lib1/l1a, lib1/l1b, lib1/test, main/m, main/m.export
 STEP 1:
    libs: lib1, main
-    dirty js: lib1
+    dirty js modules: lib1
+    dirty js files:   lib1/l1a, lib1/l1b, lib1/test
@@ -0,0 +1 @@
+export function externalDemoFunction() { return 3; }
@@ -0,0 +1 @@
+export function externalDemoFunction() { return 0; }
@@ -0,0 +1 @@
+export function externalDemoFunction() { return 2; }
@@ -0,0 +1 @@
+export function externalDemoFunction() { return 1; }
@@ -0,0 +1 @@
+export function externalDemoFunction() { return 5; }
@@ -0,0 +1 @@
+export function externalDemoFunction() { return 4; }
@@ -0,0 +1,3 @@
+@file:JsModule("../js-module-a.mjs")
+
+external fun externalDemoFunction(): Int
@@ -0,0 +1 @@
+@file:JsModule("../js-module-a.mjs")
@@ -0,0 +1,3 @@
+@file:JsModule("../js-module-a-new.mjs")
+
+external fun externalDemoFunction(): Int
@@ -0,0 +1 @@
+@file:JsModule("../js-module-b.mjs")
@@ -0,0 +1,3 @@
+@file:JsModule("../js-module-b.mjs")
+
+external fun externalDemoFunction(): Int
@@ -0,0 +1,3 @@
+@file:JsModule("../js-module-b-new.mjs")
+
+external fun externalDemoFunction(): Int
@@ -0,0 +1 @@
+fun demoFunction() = externalDemoFunction()
@@ -0,0 +1 @@
+fun demoFunction() = -1
@@ -0,0 +1,32 @@
+STEP 0:
+    modifications:
+        U : JsModuleA.0.kt -> JsModuleA.kt
+        U : JsModuleB.0.kt -> JsModuleB.kt
+        U : demo.0.kt -> demo.kt
+    added file: JsModuleA.kt, JsModuleB.kt, demo.kt
+STEP 1:
+    modifications:
+        U : JsModuleA.1.kt -> JsModuleA.kt
+        U : JsModuleB.1.kt -> JsModuleB.kt
+    modified ir: JsModuleA.kt, JsModuleB.kt
+    updated imports: demo.kt
+STEP 2:
+    modifications:
+        U : JsModuleB.2.kt -> JsModuleB.kt
+    modified ir: JsModuleB.kt
+    updated imports: demo.kt
+STEP 3:
+    modifications:
+        U : demo.3.kt -> demo.kt
+    modified ir: demo.kt
+STEP 4:
+    modifications:
+        U : JsModuleA.4.kt -> JsModuleA.kt
+        U : JsModuleB.0.kt -> JsModuleB.kt
+    modified ir: JsModuleA.kt, JsModuleB.kt
+STEP 5:
+    modifications:
+        U : JsModuleA.1.kt -> JsModuleA.kt
+    modified ir: JsModuleA.kt
+    updated exports: JsModuleA.kt
+STEP 6:
@@ -0,0 +1,3 @@
+@file:JsModule("../js-module-c")
+
+external fun externalDemoFunction(): Int
@@ -0,0 +1,3 @@
+@file:JsModule("../js-module-c-new")
+
+external fun externalDemoFunction(): Int
--- a/Show More
+++ b/Show More
				`@@ -0,0 +1 @@`
				`export function externalDemoFunction() { return 3; }`
				`@@ -0,0 +1 @@`
				`fun demoFunction() = externalDemoFunction()`