Command-line tool for JS DCE

compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/CommonCompilerArguments.java

@@ -16,15 +16,9 @@
 
 package org.jetbrains.kotlin.cli.common.arguments;
 
-import com.intellij.util.SmartList;
 import org.jetbrains.annotations.NotNull;
 
-import java.io.Serializable;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-
-public abstract class CommonCompilerArguments implements Serializable {
+public abstract class CommonCompilerArguments extends CommonToolArguments {
     public static final long serialVersionUID = 0L;
 
     public static final String PLUGIN_OPTION_FORMAT = "plugin:<pluginId>:<optionName>=<value>";
@@ -45,23 +39,6 @@ public abstract class CommonCompilerArguments implements Serializable {
     )
     public String apiVersion;
 
-    @GradleOption(DefaultValues.BooleanFalseDefault.class)
-    @Argument(value = "-nowarn", description = "Generate no warnings")
-    public boolean suppressWarnings;
-
-    @GradleOption(DefaultValues.BooleanFalseDefault.class)
-    @Argument(value = "-verbose", description = "Enable verbose logging output")
-    public boolean verbose;
-
-    @Argument(value = "-version", description = "Display compiler version")
-    public boolean version;
-
-    @Argument(value = "-help", shortName = "-h", description = "Print a synopsis of standard options")
-    public boolean help;
-
-    @Argument(value = "-X", description = "Print a synopsis of advanced options")
-    public boolean extraHelp;
-
     @Argument(value = "-P", valueDescription = PLUGIN_OPTION_FORMAT, description = "Pass an option to a plugin")
     public String[] pluginOptions;
 
@@ -110,10 +87,6 @@ public abstract class CommonCompilerArguments implements Serializable {
     )
     public String coroutinesState = WARN;
 
-    public List<String> freeArgs = new SmartList<>();
-
-    public transient ArgumentParseErrors errors = new ArgumentParseErrors();
-
     @NotNull
     public static CommonCompilerArguments createDefaultInstance() {
         return new DummyImpl();

compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/CommonToolArguments.java

@@ -0,0 +1,47 @@
+/*
+ * Copyright 2010-2017 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.jetbrains.kotlin.cli.common.arguments;
+
+import org.jetbrains.kotlin.utils.SmartList;
+
+import java.io.Serializable;
+import java.util.List;
+
+public abstract class CommonToolArguments implements Serializable {
+    private static final long serialVersionUID = 0L;
+
+    public List<String> freeArgs = new SmartList<>();
+
+    public transient ArgumentParseErrors errors = new ArgumentParseErrors();
+
+    @Argument(value = "-help", shortName = "-h", description = "Print a synopsis of standard options")
+    public boolean help;
+
+    @Argument(value = "-X", description = "Print a synopsis of advanced options")
+    public boolean extraHelp;
+
+    @Argument(value = "-version", description = "Display compiler version")
+    public boolean version;
+
+    @GradleOption(DefaultValues.BooleanFalseDefault.class)
+    @Argument(value = "-verbose", description = "Enable verbose logging output")
+    public boolean verbose;
+
+    @GradleOption(DefaultValues.BooleanFalseDefault.class)
+    @Argument(value = "-nowarn", description = "Generate no warnings")
+    public boolean suppressWarnings;
+}

compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/K2JSDceArguments.kt

@@ -0,0 +1,33 @@
+/*
+ * Copyright 2010-2017 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.jetbrains.kotlin.cli.common.arguments
+
+class K2JSDceArguments : CommonToolArguments() {
+    companion object {
+        const val serialVersionUID = 0L
+    }
+
+    @field:GradleOption(DefaultValues.StringNullDefault::class)
+    @field:Argument(value = "-output-dir", valueDescription = "<path>", description = "Output directory")
+    @JvmField
+    var outputDirectory: String? = null
+
+    @field:GradleOption(DefaultValues.BooleanFalseDefault::class)
+    @field:Argument(value = "-Xprint-reachability-info", description = "Print declarations marked as reachable")
+    @JvmField
+    var printReachabilityInfo: Boolean = false
+}

compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/parseCommandLineArguments.kt

@@ -50,7 +50,7 @@ data class ArgumentParseErrors(
 )
 
 // Parses arguments in the passed [result] object, or throws an [IllegalArgumentException] with the message to be displayed to the user
-fun <A : CommonCompilerArguments> parseCommandLineArguments(args: Array<String>, result: A) {
+fun <A : CommonToolArguments> parseCommandLineArguments(args: Array<out String>, result: A) {
     data class ArgumentField(val field: Field, val argument: Argument)
 
     val fields = result::class.java.fields.mapNotNull { field ->
@@ -118,7 +118,7 @@ fun <A : CommonCompilerArguments> parseCommandLineArguments(args: Array<String>,
     }
 }
 
-private fun <A : CommonCompilerArguments> updateField(field: Field, result: A, value: Any, delimiter: String) {
+private fun <A : CommonToolArguments> updateField(field: Field, result: A, value: Any, delimiter: String) {
     when (field.type) {
         Boolean::class.java, String::class.java -> field.set(result, value)
         Array<String>::class.java -> {