Unify the parameter names of external JS env constructors.

They all standardize on `executable`, `args` en `env`, which are
the names used by the `Initialize` constructors in `ScalaJSPlugin`.

Author: sjrd

js-envs/src/main/scala/org/scalajs/jsenv/ExternalJSEnv.scala

@@ -11,8 +11,11 @@ import scala.concurrent.{Future, Promise}
 import scala.util.Try
 
 abstract class ExternalJSEnv(
-  final protected val additionalArgs: Seq[String],
-  final protected val additionalEnv:  Map[String, String]) extends AsyncJSEnv {
+    @deprecatedName('additionalArgs)
+    final protected val args: Seq[String],
+    @deprecatedName('additionalEnv)
+    final protected val env: Map[String, String])
+    extends AsyncJSEnv {
 
   import ExternalJSEnv._
 
@@ -24,6 +27,12 @@ abstract class ExternalJSEnv(
   /** Command to execute (on shell) for this VM */
   protected def executable: String
 
+  @deprecated("Use `args` instead.", "0.6.16")
+  final protected def additionalArgs: Seq[String] = args
+
+  @deprecated("Use `env` instead.", "0.6.16")
+  final protected def additionalEnv: Map[String, String] = env
+
   /** Custom initialization scripts. */
   protected def customInitFiles(): Seq[VirtualJSFile] = Nil
 
@@ -51,16 +60,17 @@ abstract class ExternalJSEnv(
     protected def sendVMStdin(out: OutputStream): Unit = {}
 
     /** VM arguments excluding executable. Override to adapt.
-     *  Overrider is responsible to add additionalArgs.
+     *
+     *  The default value in `ExternalJSEnv` is `args`.
      */
-    protected def getVMArgs(): Seq[String] = additionalArgs
+    protected def getVMArgs(): Seq[String] = args
 
     /** VM environment. Override to adapt.
      *
-     *  Default is `sys.env` and [[additionalEnv]]
+     *  The default value in `ExternalJSEnv` is `sys.env ++ env`.
      */
     protected def getVMEnv(): Map[String, String] =
-      sys.env ++ additionalEnv
+      sys.env ++ env
 
     /** Get files that are a library (i.e. that do not run anything) */
     protected def getLibJSFiles(): Seq[VirtualJSFile] =

js-envs/src/main/scala/org/scalajs/jsenv/nodejs/AbstractNodeJSEnv.scala

@@ -22,9 +22,15 @@ import org.scalajs.jsenv.Utils.OptDeadline
 import scala.concurrent.TimeoutException
 import scala.concurrent.duration._
 
-abstract class AbstractNodeJSEnv(nodejsPath: String, addArgs: Seq[String],
-    addEnv: Map[String, String], val sourceMap: Boolean)
-    extends ExternalJSEnv(addArgs, addEnv) with ComJSEnv {
+abstract class AbstractNodeJSEnv(
+    @deprecatedName('nodejsPath)
+    protected val executable: String,
+    @deprecatedName('addArgs)
+    args: Seq[String],
+    @deprecatedName('addEnv)
+    env: Map[String, String],
+    val sourceMap: Boolean)
+    extends ExternalJSEnv(args, env) with ComJSEnv {
 
   /** True, if the installed node executable supports source mapping.
    *
@@ -43,8 +49,6 @@ abstract class AbstractNodeJSEnv(nodejsPath: String, addArgs: Seq[String],
     }
   }
 
-  protected def executable: String = nodejsPath
-
   /** Retry-timeout to wait for the JS VM to connect */
   protected val acceptTimeout = 5000
 

js-envs/src/main/scala/org/scalajs/jsenv/nodejs/NodeJSEnv.scala

@@ -19,27 +19,31 @@ import org.scalajs.core.tools.logging._
 
 import java.io.{ Console => _, _ }
 
-
 class NodeJSEnv private (
-  nodejsPath: String,
-  addArgs: Seq[String],
-  addEnv: Map[String, String],
-  sourceMap: Boolean
-) extends AbstractNodeJSEnv(nodejsPath, addArgs, addEnv, sourceMap) {
-
-  def this(nodejsPath: String = "node", addArgs: Seq[String] = Seq.empty,
-      addEnv: Map[String, String] = Map.empty) = {
-    this(nodejsPath, addArgs, addEnv, sourceMap = true)
+    @deprecatedName('nodejsPath)
+    override protected val executable: String, // override val for bin compat
+    @deprecatedName('addArgs)
+    args: Seq[String],
+    @deprecatedName('addEnv)
+    env: Map[String, String],
+    sourceMap: Boolean)
+    extends AbstractNodeJSEnv(executable, args, env, sourceMap) {
+
+  def this(
+      @deprecatedName('nodejsPath)
+      executable: String = "node",
+      @deprecatedName('addArgs)
+      args: Seq[String] = Seq.empty,
+      @deprecatedName('addEnv)
+      env: Map[String, String] = Map.empty) = {
+    this(executable, args, env, sourceMap = true)
   }
 
   def withSourceMap(sourceMap: Boolean): NodeJSEnv =
-    new NodeJSEnv(nodejsPath, addArgs, addEnv, sourceMap)
+    new NodeJSEnv(executable, args, env, sourceMap)
 
   protected def vmName: String = "Node.js"
 
-  // For binary compatibility, now `executable` is defined in AbstractNodeJSEnv
-  override protected def executable: String = super.executable
-
   override def jsRunner(libs: Seq[ResolvedJSDependency],
       code: VirtualJSFile): JSRunner = {
     new NodeRunner(libs, code)