Add jsNoOpt option and directive

Author: MaciejG604

modules/build/src/test/scala/scala/build/tests/BuildTests.scala

@@ -958,23 +958,23 @@ abstract class BuildTests(server: Boolean) extends TestUtil.ScalaCliBuildSuite {
     (modeStr, bloopMode) <-
       Seq("fastLinkJs" -> LinkerMode.Debug, "fullLinkJs" -> LinkerMode.Release)
     if server
-  }
+  } do {
     test(s"bloop config for $modeStr") {
       val testInputs = TestInputs(
         os.rel / "Simple.scala" ->
           """//> using platform js
             |def foo(): String = "foo"
             |""".stripMargin
       )
-      val fastLinkBuildOptions = defaultOptions.copy(
+      val jsLinkBuildOptions = defaultOptions.copy(
         scalaOptions = defaultOptions.scalaOptions.copy(
           scalaVersion = None
         ),
         scalaJsOptions = defaultOptions.scalaJsOptions.copy(
           mode = ScalaJsMode(Some(modeStr))
         )
       )
-      testInputs.withBuild(fastLinkBuildOptions, buildThreads, bloopConfigOpt) {
+      testInputs.withBuild(jsLinkBuildOptions, buildThreads, bloopConfigOpt) {
         (_, _, maybeBuild) =>
           maybeBuild match {
             case Right(b: Build.Successful) =>
@@ -984,4 +984,31 @@ abstract class BuildTests(server: Boolean) extends TestUtil.ScalaCliBuildSuite {
 
       }
     }
+
+    test(s"bloop config for noOpt and $modeStr") {
+      val testInputs = TestInputs(
+        os.rel / "Simple.scala" ->
+          """//> using platform js
+            |def foo(): String = "foo"
+            |""".stripMargin
+      )
+      val noOptBuildOptions = defaultOptions.copy(
+        scalaOptions = defaultOptions.scalaOptions.copy(
+          scalaVersion = None
+        ),
+        scalaJsOptions = defaultOptions.scalaJsOptions.copy(
+          mode = ScalaJsMode(Some(modeStr)),
+          noOpt = Some(true)
+        )
+      )
+      testInputs.withBuild(noOptBuildOptions, buildThreads, bloopConfigOpt) {
+        (_, _, maybeBuild) =>
+          maybeBuild match {
+            case Right(b: Build.Successful) =>
+              assert(b.project.scalaJsOptions.exists(_.mode == LinkerMode.Debug))
+            case _ => fail("Build failed")
+          }
+      }
+    }
+  }
 }

modules/build/src/test/scala/scala/build/tests/SourcesTests.scala

@@ -494,6 +494,7 @@ class SourcesTests extends TestUtil.ScalaCliBuildSuite {
       os.rel / "something.sc" ->
         """//> using jsVersion "1.8.0"
           |//> using jsMode "mode"
+          |//> using jsNoOpt
           |//> using jsModuleKind "commonjs"
           |//> using jsCheckIr true
           |//> using jsEmitSourceMaps true
@@ -533,7 +534,8 @@ class SourcesTests extends TestUtil.ScalaCliBuildSuite {
         jsOptions.moduleKindStr == Some("commonjs"),
         jsOptions.checkIr == Some(true),
         jsOptions.emitSourceMaps == true,
-        jsOptions.dom == Some(true)
+        jsOptions.dom == Some(true),
+        jsOptions.noOpt == Some(true)
       )
       expect(
         jsConfig.moduleKind == ScalaJsLinkerConfig.ModuleKind.CommonJSModule,

modules/cli/src/main/scala/scala/cli/commands/shared/ScalaJsOptions.scala

@@ -24,6 +24,12 @@ final case class ScalaJsOptions(
   @HelpMessage("The Scala.js mode, for `fastLinkJS` use one of [`dev`, `fastLinkJS` or `fast`], for `fullLinkJS` use one of [`release`, `fullLinkJS`, `full`]")
     jsMode: Option[String] = None,
 
+  @Group(HelpGroup.ScalaJs.toString)
+  @HelpMessage("Disable optimalisation for Scala.js, overrides `--js-mode`")
+  @Tag(tags.implementation)
+  @Hidden
+    jsNoOpt: Option[Boolean] = None,
+
   @HelpMessage("The Scala.js module kind: commonjs/common, esmodule/es, nomodule/none")
   @Group(HelpGroup.ScalaJs.toString)
   @Tag(tags.should)

modules/cli/src/main/scala/scala/cli/commands/shared/SharedOptions.scala

@@ -244,7 +244,8 @@ final case class SharedOptions(
       avoidLetsAndConsts = jsAvoidLetsAndConsts,
       moduleSplitStyleStr = jsModuleSplitStyle,
       smallModuleForPackage = jsSmallModuleForPackage,
-      esVersionStr = jsEsVersion
+      esVersionStr = jsEsVersion,
+      noOpt = jsNoOpt
     )
   }
 

modules/directives/src/main/scala/scala/build/preprocessing/directives/ScalaJs.scala

@@ -16,6 +16,8 @@ import scala.cli.commands.SpecificationLevel
     |
     |`//> using jsMode` _value_
     |
+    |`//> using jsNoOpt` _true|false_
+    |
     |`//> using jsModuleKind` _value_
     |
     |`//> using jsSmallModuleForPackage` _value1_ _value2_ …
@@ -45,6 +47,7 @@ import scala.cli.commands.SpecificationLevel
 final case class ScalaJs(
   jsVersion: Option[String] = None,
   jsMode: Option[String] = None,
+  jsNoOpt: Option[Boolean] = None,
   jsModuleKind: Option[String] = None,
   jsCheckIr: Option[Boolean] = None,
   jsEmitSourceMaps: Option[Boolean] = None,
@@ -72,7 +75,8 @@ final case class ScalaJs(
       avoidClasses = jsAvoidClasses,
       avoidLetsAndConsts = jsAvoidLetsAndConsts,
       moduleSplitStyleStr = jsModuleSplitStyleStr,
-      esVersionStr = jsEsVersionStr
+      esVersionStr = jsEsVersionStr,
+      noOpt = jsNoOpt
     )
     BuildOptions(
       scalaJsOptions = scalaJsOptions

modules/integration/src/test/scala/scala/cli/integration/RunScalaJsTestDefinitions.scala

@@ -33,17 +33,27 @@ trait RunScalaJsTestDefinitions { _: RunTestDefinitions =>
   test(s"simple script JS in fullLinkJs mode") {
     val output = simpleJsTestOutput("--js-mode", "fullLinkJs", "-v", "-v", "-v")
     expect(output.contains("--fullOpt"))
+
     expect(!output.contains("--fastOpt"))
     expect(!output.contains("--noOpt"))
   }
 
   test(s"simple script JS in fastLinkJs mode") {
     val output = simpleJsTestOutput("--js-mode", "fastLinkJs", "-v", "-v", "-v")
     expect(output.contains("--fastOpt"))
+
     expect(!output.contains("--fullOpt"))
     expect(!output.contains("--noOpt"))
   }
 
+  test(s"simple script JS with noOpt") {
+    val output = simpleJsTestOutput("--js-mode", "fullLinkJs", "--js-no-opt", "-v", "-v", "-v")
+    expect(output.contains("--noOpt"))
+
+    expect(!output.contains("--fastOpt"))
+    expect(!output.contains("--fullOpt"))
+  }
+
   test("without node on the PATH") {
     val fileName = "simple.sc"
     val message  = "Hello"

modules/options/src/main/scala/scala/build/options/ScalaJsOptions.scala

@@ -26,8 +26,18 @@ final case class ScalaJsOptions(
   esVersionStr: Option[String] = None,
   noOpt: Option[Boolean] = None
 ) {
-
-  def fullOpt: Either[UnrecognizedJsOptModeError, Boolean] = mode.fullOpt
+  def fullOpt: Either[UnrecognizedJsOptModeError, Boolean] =
+    if (mode.isValid)
+      if (noOpt.contains(true))
+        Right(false)
+      else
+        Right(mode.nameOpt.exists(ScalaJsMode.validFullLinkAliases.contains))
+    else
+      Left(UnrecognizedJsOptModeError(
+        mode.nameOpt.getOrElse("None"), // shouldn't happen since None is valid
+        ScalaJsMode.validFullLinkAliases.toSeq,
+        ScalaJsMode.validFastLinkAliases.toSeq
+      ))
   def platformSuffix: String =
     "sjs" + ScalaVersion.jsBinary(finalVersion).getOrElse(finalVersion)
   def jsDependencies(scalaVersion: String): Seq[AnyDependency] =
@@ -95,7 +105,7 @@ final case class ScalaJsOptions(
   def finalVersion = version.map(_.trim).filter(_.nonEmpty).getOrElse(Constants.scalaJsVersion)
 
   private def configUnsafe(logger: Logger): Either[BuildException, BloopConfig.JsConfig] = for {
-    isFullOpt <- mode.fullOpt
+    isFullOpt <- fullOpt
   } yield {
     val kind = moduleKind(logger) match {
       case ScalaJsLinkerConfig.ModuleKind.CommonJSModule => BloopConfig.ModuleKindJS.CommonJSModule
@@ -144,28 +154,22 @@ final case class ScalaJsOptions(
 }
 
 case class ScalaJsMode(nameOpt: Option[String] = None) {
-  private val validFullLinkAliases = Set(
+  lazy val isValid = nameOpt.isEmpty ||
+    nameOpt.exists(
+      ScalaJsMode.validFullLinkAliases.union(ScalaJsMode.validFastLinkAliases).contains
+    )
+}
+object ScalaJsMode {
+  val validFullLinkAliases = Set(
     "release",
     "fullLinkJs",
     "full"
   )
-  private val validFastLinkAliases = Set(
+  val validFastLinkAliases = Set(
     "dev",
     "fastLinkJs",
     "fast"
   )
-
-  def fullOpt: Either[UnrecognizedJsOptModeError, Boolean] =
-    if (
-      nameOpt.isEmpty || nameOpt.exists(validFullLinkAliases.union(validFastLinkAliases).contains)
-    )
-      Right(nameOpt.exists(validFullLinkAliases.contains))
-    else
-      Left(UnrecognizedJsOptModeError(
-        nameOpt.get,
-        validFullLinkAliases.toSeq,
-        validFastLinkAliases.toSeq
-      ))
 }
 
 object ScalaJsOptions {

website/docs/reference/cli-options.md

@@ -1257,6 +1257,11 @@ The Scala.js version (1.14.0 by default).
 
 The Scala.js mode, for `fastLinkJS` use one of [`dev`, `fastLinkJS` or `fast`], for `fullLinkJS` use one of [`release`, `fullLinkJS`, `full`]
 
+### `--js-no-opt`
+
+[Internal]
+Disable optimalisation for Scala.js, overrides `--js-mode`
+
 ### `--js-module-kind`
 
 The Scala.js module kind: commonjs/common, esmodule/es, nomodule/none

website/docs/reference/directives.md

@@ -373,6 +373,8 @@ Add Scala.js options
 
 `//> using jsMode` _value_
 
+`//> using jsNoOpt` _true|false_
+
 `//> using jsModuleKind` _value_
 
 `//> using jsSmallModuleForPackage` _value1_ _value2_ …

website/docs/reference/scala-command/cli-options.md

@@ -714,6 +714,12 @@ The Scala.js version (1.14.0 by default).
 
 The Scala.js mode, for `fastLinkJS` use one of [`dev`, `fastLinkJS` or `fast`], for `fullLinkJS` use one of [`release`, `fullLinkJS`, `full`]
 
+### `--js-no-opt`
+
+`IMPLEMENTATION specific` per Scala Runner specification
+
+Disable optimalisation for Scala.js, overrides `--js-mode`
+
 ### `--js-module-kind`
 
 `SHOULD have` per Scala Runner specification

website/docs/reference/scala-command/directives.md

@@ -259,6 +259,8 @@ Add Scala.js options
 
 `//> using jsMode` _value_
 
+`//> using jsNoOpt` _true|false_
+
 `//> using jsModuleKind` _value_
 
 `//> using jsSmallModuleForPackage` _value1_ _value2_ …

website/docs/reference/scala-command/runner-specification.md

@@ -358,6 +358,10 @@ Aliases: `-q`
 
 Use progress bars
 
+**--js-no-opt**
+
+Disable optimalisation for Scala.js, overrides `--js-mode`
+
 **--js-allow-big-ints-for-longs**
 
 Primitive Longs *may* be compiled as primitive JavaScript bigints
@@ -1085,6 +1089,10 @@ Aliases: `-q`
 
 Use progress bars
 
+**--js-no-opt**
+
+Disable optimalisation for Scala.js, overrides `--js-mode`
+
 **--js-allow-big-ints-for-longs**
 
 Primitive Longs *may* be compiled as primitive JavaScript bigints
@@ -1638,6 +1646,10 @@ Aliases: `-q`
 
 Use progress bars
 
+**--js-no-opt**
+
+Disable optimalisation for Scala.js, overrides `--js-mode`
+
 **--js-allow-big-ints-for-longs**
 
 Primitive Longs *may* be compiled as primitive JavaScript bigints
@@ -2221,6 +2233,10 @@ Aliases: `-q`
 
 Use progress bars
 
+**--js-no-opt**
+
+Disable optimalisation for Scala.js, overrides `--js-mode`
+
 **--js-allow-big-ints-for-longs**
 
 Primitive Longs *may* be compiled as primitive JavaScript bigints
@@ -2813,6 +2829,10 @@ Aliases: `-q`
 
 Use progress bars
 
+**--js-no-opt**
+
+Disable optimalisation for Scala.js, overrides `--js-mode`
+
 **--js-allow-big-ints-for-longs**
 
 Primitive Longs *may* be compiled as primitive JavaScript bigints
@@ -3363,6 +3383,10 @@ Aliases: `-q`
 
 Use progress bars
 
+**--js-no-opt**
+
+Disable optimalisation for Scala.js, overrides `--js-mode`
+
 **--js-allow-big-ints-for-longs**
 
 Primitive Longs *may* be compiled as primitive JavaScript bigints
@@ -3988,6 +4012,10 @@ Aliases: `-q`
 
 Use progress bars
 
+**--js-no-opt**
+
+Disable optimalisation for Scala.js, overrides `--js-mode`
+
 **--js-allow-big-ints-for-longs**
 
 Primitive Longs *may* be compiled as primitive JavaScript bigints
@@ -4620,6 +4648,10 @@ Aliases: `-q`
 
 Use progress bars
 
+**--js-no-opt**
+
+Disable optimalisation for Scala.js, overrides `--js-mode`
+
 **--js-allow-big-ints-for-longs**
 
 Primitive Longs *may* be compiled as primitive JavaScript bigints
@@ -5507,6 +5539,10 @@ Aliases: `-q`
 
 Use progress bars
 
+**--js-no-opt**
+
+Disable optimalisation for Scala.js, overrides `--js-mode`
+
 **--js-allow-big-ints-for-longs**
 
 Primitive Longs *may* be compiled as primitive JavaScript bigints