Use MODULE_NAME configuration key in JS instead of MODULE_ID

compiler/cli/src/org/jetbrains/kotlin/cli/js/K2JSCompiler.java

@@ -42,6 +42,7 @@ import org.jetbrains.kotlin.cli.common.messages.MessageCollector;
 import org.jetbrains.kotlin.cli.common.output.outputUtils.OutputUtilsKt;
 import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles;
 import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment;
+import org.jetbrains.kotlin.config.CommonConfigurationKeys;
 import org.jetbrains.kotlin.config.CompilerConfiguration;
 import org.jetbrains.kotlin.config.ContentRootsKt;
 import org.jetbrains.kotlin.config.Services;
@@ -120,6 +121,8 @@ public class K2JSCompiler extends CLICompiler<K2JSCompilerArguments> {
 
         File outputFile = new File(arguments.outputFile);
 
+        configuration.put(CommonConfigurationKeys.MODULE_NAME, FileUtil.getNameWithoutExtension(outputFile));
+
         JsConfig config = new LibrarySourcesConfig(project, configuration);
         if (config.checkLibFilesAndReportErrors(new Function1<String, Unit>() {
             @Override
@@ -247,9 +250,6 @@ public class K2JSCompiler extends CLICompiler<K2JSCompilerArguments> {
         }
         configuration.put(JSConfigurationKeys.TARGET, EcmaVersion.defaultVersion());
 
-        String moduleId = FileUtil.getNameWithoutExtension(new File(arguments.outputFile));
-        configuration.put(JSConfigurationKeys.MODULE_ID, moduleId);
-
         if (arguments.sourceMap) {
             configuration.put(JSConfigurationKeys.SOURCE_MAP, true);
         }

compiler/tests/org/jetbrains/kotlin/checkers/AbstractDiagnosticsTestWithJsStdLib.java

@@ -18,6 +18,7 @@ package org.jetbrains.kotlin.checkers;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles;
+import org.jetbrains.kotlin.config.CommonConfigurationKeys;
 import org.jetbrains.kotlin.config.CompilerConfiguration;
 import org.jetbrains.kotlin.context.ModuleContext;
 import org.jetbrains.kotlin.descriptors.impl.ModuleDescriptorImpl;
@@ -31,6 +32,7 @@ import org.jetbrains.kotlin.psi.KtFile;
 import org.jetbrains.kotlin.resolve.BindingTrace;
 import org.jetbrains.kotlin.resolve.TargetPlatformKt;
 import org.jetbrains.kotlin.storage.StorageManager;
+import org.jetbrains.kotlin.test.KotlinTestUtils;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -43,7 +45,7 @@ public abstract class AbstractDiagnosticsTestWithJsStdLib extends AbstractDiagno
     protected void setUp() throws Exception {
         super.setUp();
         CompilerConfiguration configuration = getEnvironment().getConfiguration().copy();
-        configuration.put(JSConfigurationKeys.MODULE_ID, "module");
+        configuration.put(CommonConfigurationKeys.MODULE_NAME, KotlinTestUtils.TEST_MODULE_NAME);
         configuration.put(JSConfigurationKeys.LIBRARY_FILES, LibrarySourcesConfig.JS_STDLIB);
         config = new LibrarySourcesConfig(getProject(), configuration);
     }

compiler/tests/org/jetbrains/kotlin/serialization/js/KotlinJavascriptSerializerTest.kt

@@ -40,7 +40,6 @@ import org.jetbrains.kotlin.utils.sure
 import java.io.File
 
 class KotlinJavascriptSerializerTest : TestCaseWithTmpdir() {
-    private val MODULE_NAME = "module"
     private val BASE_DIR = "compiler/testData/serialization"
 
     private fun doTest(fileName: String, metaFileDir: File = tmpdir) {
@@ -49,9 +48,8 @@ class KotlinJavascriptSerializerTest : TestCaseWithTmpdir() {
 
         val srcDirs = listOf(File(source))
 
-        val configuration = CompilerConfiguration()
+        val configuration = KotlinTestUtils.newConfiguration()
         configuration.put(CLIConfigurationKeys.MESSAGE_COLLECTOR_KEY, MessageCollector.NONE)
-        configuration.put(JSConfigurationKeys.MODULE_ID, MODULE_NAME)
         configuration.put(JSConfigurationKeys.LIBRARY_FILES, LibrarySourcesConfig.JS_STDLIB)
 
         configuration.addKotlinSourceRoots(srcDirs.map { it.path })
@@ -73,7 +71,9 @@ class KotlinJavascriptSerializerTest : TestCaseWithTmpdir() {
             val files = environment.getSourceFiles()
             val config = LibrarySourcesConfig(environment.project, environment.configuration)
             val analysisResult = TopDownAnalyzerFacadeForJS.analyzeFiles(files, config)
-            FileUtil.writeToFile(metaFile, KotlinJavascriptSerializationUtil.metadataAsString(MODULE_NAME, analysisResult.moduleDescriptor))
+            FileUtil.writeToFile(metaFile, KotlinJavascriptSerializationUtil.metadataAsString(
+                    KotlinTestUtils.TEST_MODULE_NAME, analysisResult.moduleDescriptor
+            ))
         }
         finally {
             Disposer.dispose(rootDisposable)
@@ -81,7 +81,7 @@ class KotlinJavascriptSerializerTest : TestCaseWithTmpdir() {
     }
 
     private fun deserialize(metaFile: File): ModuleDescriptorImpl {
-        val module = KotlinTestUtils.createEmptyModule("<$MODULE_NAME>", JsPlatform, JsPlatform.builtIns)
+        val module = KotlinTestUtils.createEmptyModule("<${KotlinTestUtils.TEST_MODULE_NAME}>", JsPlatform, JsPlatform.builtIns)
         val metadata = KotlinJavascriptMetadataUtils.loadMetadata(metaFile)
         assert(metadata.size == 1)
 

idea/tests/org/jetbrains/kotlin/idea/highlighter/AbstractDiagnosticMessageJsTest.java

@@ -30,6 +30,7 @@ import org.jetbrains.kotlin.js.config.JsConfig;
 import org.jetbrains.kotlin.js.config.LibrarySourcesConfig;
 import org.jetbrains.kotlin.js.resolve.diagnostics.ErrorsJs;
 import org.jetbrains.kotlin.psi.KtFile;
+import org.jetbrains.kotlin.test.KotlinTestUtils;
 
 import java.lang.reflect.Field;
 
@@ -63,7 +64,7 @@ public abstract class AbstractDiagnosticMessageJsTest extends AbstractDiagnostic
     @NotNull
     private JsConfig getConfig() {
         CompilerConfiguration configuration = getEnvironment().getConfiguration().copy();
-        configuration.put(JSConfigurationKeys.MODULE_ID, "testModule");
+        configuration.put(CommonConfigurationKeys.MODULE_NAME, KotlinTestUtils.TEST_MODULE_NAME);
         configuration.put(JSConfigurationKeys.LIBRARY_FILES, LibrarySourcesConfig.JS_STDLIB);
         configuration.put(CommonConfigurationKeys.DISABLE_INLINE, true);
         configuration.put(JSConfigurationKeys.UNIT_TEST_CONFIG, true);

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

@@ -36,7 +36,4 @@ public class JSConfigurationKeys {
 
     public static final CompilerConfigurationKey<Boolean> UNIT_TEST_CONFIG =
             CompilerConfigurationKey.create("unit test config");
-
-    public static final CompilerConfigurationKey<String> MODULE_ID =
-            CompilerConfigurationKey.create("module id");
 }

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

@@ -23,6 +23,7 @@ import kotlin.Unit;
 import kotlin.collections.CollectionsKt;
 import kotlin.jvm.functions.Function1;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.kotlin.config.CommonConfigurationKeys;
 import org.jetbrains.kotlin.config.CompilerConfiguration;
 import org.jetbrains.kotlin.descriptors.PackageFragmentProvider;
 import org.jetbrains.kotlin.descriptors.impl.ModuleDescriptorImpl;
@@ -68,7 +69,7 @@ public abstract class JsConfig {
 
     @NotNull
     public String getModuleId() {
-        return configuration.getNotNull(JSConfigurationKeys.MODULE_ID);
+        return configuration.getNotNull(CommonConfigurationKeys.MODULE_NAME);
     }
 
     public abstract boolean checkLibFilesAndReportErrors(@NotNull Function1<String, Unit> report);

js/js.tests/test/org/jetbrains/kotlin/js/test/BasicTest.java

@@ -323,7 +323,7 @@ public abstract class BasicTest extends KotlinTestWithEnvironment {
     @NotNull
     private JsConfig createConfig(
             @NotNull Project project,
-            @NotNull String moduleId,
+            @NotNull String moduleName,
             @NotNull EcmaVersion ecmaVersion,
             @Nullable List<String> libraries,
             @NotNull List<KtFile> files
@@ -338,7 +338,7 @@ public abstract class BasicTest extends KotlinTestWithEnvironment {
         }
         configuration.put(JSConfigurationKeys.LIBRARY_FILES, librariesWithStdlib);
 
-        configuration.put(JSConfigurationKeys.MODULE_ID, moduleId);
+        configuration.put(CommonConfigurationKeys.MODULE_NAME, moduleName);
         configuration.put(JSConfigurationKeys.TARGET, ecmaVersion);
 
         configuration.put(JSConfigurationKeys.SOURCE_MAP, shouldGenerateSourceMap());