Make Zip FS accessor available to all Klib-based compilers

^KT-79675

Author: aviroop-123

compiler/cli/cli-js/src/org/jetbrains/kotlin/cli/js/K2JSCompiler.kt

@@ -29,6 +29,7 @@ import org.jetbrains.kotlin.cli.pipeline.web.CommonWebConfigurationUpdater
 import org.jetbrains.kotlin.cli.pipeline.web.WebCliPipeline
 import org.jetbrains.kotlin.config.CommonConfigurationKeys
 import org.jetbrains.kotlin.config.CompilerConfiguration
+import org.jetbrains.kotlin.config.KlibConfigurationKeys
 import org.jetbrains.kotlin.config.Services
 import org.jetbrains.kotlin.diagnostics.DiagnosticReporterFactory
 import org.jetbrains.kotlin.ir.backend.js.*
@@ -124,7 +125,7 @@ class K2JSCompiler : CLICompiler<K2JSCompilerArguments>() {
 
         val zipAccessor = DisposableZipFileSystemAccessor(64)
         Disposer.register(rootDisposable, zipAccessor)
-        targetEnvironment.configuration.put(JSConfigurationKeys.ZIP_FILE_SYSTEM_ACCESSOR, zipAccessor)
+        targetEnvironment.configuration.put(KlibConfigurationKeys.ZIP_FILE_SYSTEM_ACCESSOR, zipAccessor)
 
         val sourcesFiles = targetEnvironment.getSourceFiles()
 

compiler/config/configuration-keys-generator/src/org/jetbrains/kotlin/config/keys/generator/JsConfigurationKeysContainer.kt

@@ -14,7 +14,6 @@ import org.jetbrains.kotlin.backend.js.TsCompilationStrategy
 import org.jetbrains.kotlin.js.config.EcmaVersion
 import org.jetbrains.kotlin.js.config.SourceMapNamesPolicy
 import org.jetbrains.kotlin.js.config.SourceMapSourceEmbedding
-import org.jetbrains.kotlin.konan.file.ZipFileSystemAccessor
 import org.jetbrains.kotlin.serialization.js.ModuleKind
 import java.io.File
 
@@ -98,8 +97,6 @@ object JsConfigurationKeysContainer : KeysContainer("org.jetbrains.kotlin.js.con
 
     val GENERATE_STRICT_IMPLICIT_EXPORT by key<Boolean>("enable strict implicitly exported entities types inside d.ts files")
 
-    val ZIP_FILE_SYSTEM_ACCESSOR by key<ZipFileSystemAccessor>("zip file system accessor, used for klib reading")
-
     val OPTIMIZE_GENERATED_JS by key<Boolean>("perform additional optimizations on the generated JS code")
 
     val USE_ES6_CLASSES by key<Boolean>("perform ES6 class usage")

compiler/config/configuration-keys-generator/src/org/jetbrains/kotlin/config/keys/generator/KlibConfigurationKeysContainer.kt

@@ -8,6 +8,7 @@ package org.jetbrains.kotlin.config.keys.generator
 import org.jetbrains.kotlin.config.DuplicatedUniqueNameStrategy
 import org.jetbrains.kotlin.config.KlibAbiCompatibilityLevel
 import org.jetbrains.kotlin.config.keys.generator.model.KeysContainer
+import org.jetbrains.kotlin.konan.file.ZipFileSystemAccessor
 import org.jetbrains.kotlin.library.KotlinAbiVersion
 
 @Suppress("unused")
@@ -26,4 +27,6 @@ object KlibConfigurationKeysContainer : KeysContainer("org.jetbrains.kotlin.conf
         "KLIB ABI compatibility level",
         defaultValue = "KlibAbiCompatibilityLevel.LATEST_STABLE"
     )
+
+    val ZIP_FILE_SYSTEM_ACCESSOR by key<ZipFileSystemAccessor>("zip file system accessor, used for klib reading")
 }

compiler/config/gen/org/jetbrains/kotlin/config/KlibConfigurationKeys.kt

@@ -12,6 +12,7 @@ package org.jetbrains.kotlin.config
  * DO NOT MODIFY IT MANUALLY
  */
 
+import org.jetbrains.kotlin.konan.file.ZipFileSystemAccessor
 import org.jetbrains.kotlin.library.KotlinAbiVersion
 
 object KlibConfigurationKeys {
@@ -33,6 +34,9 @@ object KlibConfigurationKeys {
     @JvmField
     val KLIB_ABI_COMPATIBILITY_LEVEL = CompilerConfigurationKey.create<KlibAbiCompatibilityLevel>("KLIB ABI compatibility level")
 
+    @JvmField
+    val ZIP_FILE_SYSTEM_ACCESSOR = CompilerConfigurationKey.create<ZipFileSystemAccessor>("zip file system accessor, used for klib reading")
+
 }
 
 var CompilerConfiguration.klibRelativePathBases: List<String>
@@ -59,3 +63,7 @@ var CompilerConfiguration.klibAbiCompatibilityLevel: KlibAbiCompatibilityLevel
     get() = get(KlibConfigurationKeys.KLIB_ABI_COMPATIBILITY_LEVEL, KlibAbiCompatibilityLevel.LATEST_STABLE)
     set(value) { put(KlibConfigurationKeys.KLIB_ABI_COMPATIBILITY_LEVEL, value) }
 
+var CompilerConfiguration.zipFileSystemAccessor: ZipFileSystemAccessor?
+    get() = get(KlibConfigurationKeys.ZIP_FILE_SYSTEM_ACCESSOR)
+    set(value) { put(KlibConfigurationKeys.ZIP_FILE_SYSTEM_ACCESSOR, requireNotNull(value) { "nullable values are not allowed" }) }
+

compiler/ir/serialization.js/src/org/jetbrains/kotlin/ir/backend/js/loadWebKlibs.kt

@@ -16,7 +16,7 @@ import org.jetbrains.kotlin.ir.backend.js.checkers.WasmLibrarySpecialCompatibili
 import org.jetbrains.kotlin.js.config.friendLibraries
 import org.jetbrains.kotlin.js.config.includes
 import org.jetbrains.kotlin.js.config.libraries
-import org.jetbrains.kotlin.js.config.zipFileSystemAccessor
+import org.jetbrains.kotlin.config.zipFileSystemAccessor
 import org.jetbrains.kotlin.library.KotlinAbiVersion
 import org.jetbrains.kotlin.library.loader.KlibLoader
 import org.jetbrains.kotlin.library.loader.KlibPlatformChecker

compiler/tests-common-new/testFixtures/org/jetbrains/kotlin/test/frontend/classic/ClassicFrontendFacade.kt

@@ -42,7 +42,7 @@ import org.jetbrains.kotlin.incremental.components.ExpectActualTracker
 import org.jetbrains.kotlin.incremental.components.InlineConstTracker
 import org.jetbrains.kotlin.incremental.components.LookupTracker
 import org.jetbrains.kotlin.ir.backend.js.JsFactories
-import org.jetbrains.kotlin.js.config.zipFileSystemAccessor
+import org.jetbrains.kotlin.config.zipFileSystemAccessor
 import org.jetbrains.kotlin.library.isAnyPlatformStdlib
 import org.jetbrains.kotlin.library.loader.KlibLoader
 import org.jetbrains.kotlin.library.loader.KlibPlatformChecker

js/js.frontend/gen/org/jetbrains/kotlin/js/config/JSConfigurationKeys.kt

@@ -20,7 +20,6 @@ import org.jetbrains.kotlin.config.CompilerConfigurationKey
 import org.jetbrains.kotlin.incremental.js.IncrementalDataProvider
 import org.jetbrains.kotlin.incremental.js.IncrementalNextRoundChecker
 import org.jetbrains.kotlin.incremental.js.IncrementalResultsConsumer
-import org.jetbrains.kotlin.konan.file.ZipFileSystemAccessor
 import org.jetbrains.kotlin.serialization.js.ModuleKind
 
 object JSConfigurationKeys {
@@ -135,9 +134,6 @@ object JSConfigurationKeys {
     @JvmField
     val GENERATE_STRICT_IMPLICIT_EXPORT = CompilerConfigurationKey.create<Boolean>("enable strict implicitly exported entities types inside d.ts files")
 
-    @JvmField
-    val ZIP_FILE_SYSTEM_ACCESSOR = CompilerConfigurationKey.create<ZipFileSystemAccessor>("zip file system accessor, used for klib reading")
-
     @JvmField
     val OPTIMIZE_GENERATED_JS = CompilerConfigurationKey.create<Boolean>("perform additional optimizations on the generated JS code")
 
@@ -342,10 +338,6 @@ var CompilerConfiguration.generateStrictImplicitExport: Boolean
     get() = getBoolean(JSConfigurationKeys.GENERATE_STRICT_IMPLICIT_EXPORT)
     set(value) { put(JSConfigurationKeys.GENERATE_STRICT_IMPLICIT_EXPORT, value) }
 
-var CompilerConfiguration.zipFileSystemAccessor: ZipFileSystemAccessor?
-    get() = get(JSConfigurationKeys.ZIP_FILE_SYSTEM_ACCESSOR)
-    set(value) { put(JSConfigurationKeys.ZIP_FILE_SYSTEM_ACCESSOR, requireNotNull(value) { "nullable values are not allowed" }) }
-
 var CompilerConfiguration.optimizeGeneratedJs: Boolean
     get() = getBoolean(JSConfigurationKeys.OPTIMIZE_GENERATED_JS)
     set(value) { put(JSConfigurationKeys.OPTIMIZE_GENERATED_JS, value) }

js/js.tests/testFixtures/org/jetbrains/kotlin/incremental/AbstractInvalidationTest.kt

@@ -171,7 +171,7 @@ abstract class AbstractInvalidationTest(
         includedLibrary?.let { copy.includes = includedLibrary }
 
         zipAccessor.reset()
-        copy.put(JSConfigurationKeys.ZIP_FILE_SYSTEM_ACCESSOR, zipAccessor)
+        copy.put(KlibConfigurationKeys.ZIP_FILE_SYSTEM_ACCESSOR, zipAccessor)
         return copy
     }