Introduce DeserializationConfiguration

Will be used soon to deliver the language/API-version-related behavior to the
deserialization

js/js.frontend/src/org/jetbrains/kotlin/js/config/JsConfig.java

@@ -26,11 +26,13 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.kotlin.config.CommonConfigurationKeys;
 import org.jetbrains.kotlin.config.CompilerConfiguration;
+import org.jetbrains.kotlin.config.LanguageVersionSettingsImpl;
 import org.jetbrains.kotlin.descriptors.PackageFragmentProvider;
 import org.jetbrains.kotlin.descriptors.impl.ModuleDescriptorImpl;
 import org.jetbrains.kotlin.js.resolve.JsPlatform;
 import org.jetbrains.kotlin.name.Name;
 import org.jetbrains.kotlin.psi.KtFile;
+import org.jetbrains.kotlin.resolve.CompilerDeserializationConfiguration;
 import org.jetbrains.kotlin.resolve.TargetPlatformKt;
 import org.jetbrains.kotlin.serialization.js.JsModuleDescriptor;
 import org.jetbrains.kotlin.serialization.js.KotlinJavascriptSerializationUtil;
@@ -135,9 +137,12 @@ public abstract class JsConfig {
                 JsPlatform.INSTANCE, Name.special("<" + metadata.getModuleName() + ">"), storageManager,
                 JsPlatform.INSTANCE.getBuiltIns());
 
-
         JsModuleDescriptor<PackageFragmentProvider> rawDescriptor = KotlinJavascriptSerializationUtil.readModule(
-                metadata.getBody(), storageManager, moduleDescriptor);
+                metadata.getBody(), storageManager, moduleDescriptor, new CompilerDeserializationConfiguration(
+                        configuration.get(CommonConfigurationKeys.LANGUAGE_VERSION_SETTINGS, LanguageVersionSettingsImpl.DEFAULT)
+                )
+        );
+
         PackageFragmentProvider provider = rawDescriptor.getData();
         moduleDescriptor.initialize(provider != null ? provider : PackageFragmentProvider.Empty.INSTANCE);
 

js/js.serializer/src/org/jetbrains/kotlin/serialization/js/KotlinJavascriptSerializationUtil.kt

@@ -26,6 +26,7 @@ import org.jetbrains.kotlin.resolve.scopes.MemberScope
 import org.jetbrains.kotlin.serialization.DescriptorSerializer
 import org.jetbrains.kotlin.serialization.ProtoBuf
 import org.jetbrains.kotlin.serialization.StringTableImpl
+import org.jetbrains.kotlin.serialization.deserialization.DeserializationConfiguration
 import org.jetbrains.kotlin.storage.StorageManager
 import org.jetbrains.kotlin.utils.KotlinJavascriptMetadataUtils
 import java.io.ByteArrayInputStream
@@ -56,18 +57,25 @@ object KotlinJavascriptSerializationUtil {
         stream.toByteArray()
     }
 
-    @JvmStatic fun readModule(metadata: ByteArray, storageManager: StorageManager,
-                              kotlinModule: ModuleDescriptor): JsModuleDescriptor<PackageFragmentProvider?> {
+    @JvmStatic
+    fun readModule(
+            metadata: ByteArray, storageManager: StorageManager, kotlinModule: ModuleDescriptor, configuration: DeserializationConfiguration
+    ): JsModuleDescriptor<PackageFragmentProvider?> {
         val jsModule = metadata.readAsContentMap(kotlinModule.name.asString())
-        return jsModule.copy(createPackageFragmentProvider(kotlinModule, jsModule.data, storageManager))
+        return jsModule.copy(createPackageFragmentProvider(kotlinModule, jsModule.data, storageManager, configuration))
     }
 
-    @JvmStatic private fun createPackageFragmentProvider(moduleDescriptor: ModuleDescriptor, contentMap: Map<String, ByteArray>,
-                                                         storageManager: StorageManager): PackageFragmentProvider? {
-        val packageFqNames = getPackages(contentMap).map { FqName(it) }.toSet()
+    @JvmStatic
+    private fun createPackageFragmentProvider(
+            moduleDescriptor: ModuleDescriptor,
+            contentMap: Map<String, ByteArray>,
+            storageManager: StorageManager,
+            configuration: DeserializationConfiguration
+    ): PackageFragmentProvider? {
+        val packageFqNames = getPackages(contentMap).map(::FqName).toSet()
         if (packageFqNames.isEmpty()) return null
 
-        return createKotlinJavascriptPackageFragmentProvider(storageManager, moduleDescriptor, packageFqNames) {
+        return createKotlinJavascriptPackageFragmentProvider(storageManager, moduleDescriptor, packageFqNames, configuration) {
             path ->
             if (!contentMap.containsKey(path)) {
                 when {

js/js.serializer/src/org/jetbrains/kotlin/serialization/js/kotlinJavascriptPackageFragmentProvider.kt

@@ -29,6 +29,7 @@ fun createKotlinJavascriptPackageFragmentProvider(
         storageManager: StorageManager,
         module: ModuleDescriptor,
         packageFqNames: Set<FqName>,
+        configuration: DeserializationConfiguration,
         loadResource: (String) -> InputStream?
 ): PackageFragmentProvider {
     val packageFragments = packageFqNames.map { fqName ->
@@ -41,6 +42,7 @@ fun createKotlinJavascriptPackageFragmentProvider(
     val components = DeserializationComponents(
             storageManager,
             module,
+            configuration,
             DeserializedClassDataFinder(provider),
             AnnotationAndConstantLoaderImpl(module, notFoundClasses, JsSerializerProtocol),
             provider,