Add support for fiddles using Scala.js 1.x.

This adds a new column `scalajs_version` in the `Fiddle` table.
The correct value for existing values should be `0.6`.

Author: sjrd

client/src/main/scala/scalafiddle/client/CompilerHandler.scala

@@ -1,13 +1,14 @@
 package scalafiddle.client
 
+import java.nio.charset.StandardCharsets
+
 import autowire._
 import diode._
 import org.scalajs.dom
 import org.scalajs.dom.ext.Ajax
 import upickle.default._
 
 import scala.scalajs.js
-import scala.scalajs.niocharset.StandardCharsets
 import scala.concurrent.ExecutionContext.Implicits.global
 import scalafiddle.shared.{Api, FiddleVersions}
 

client/src/main/scala/scalafiddle/client/FiddleHandler.scala

@@ -15,6 +15,8 @@ case class DeselectLibrary(lib: Library) extends Action
 
 case class SelectScalaVersion(version: String) extends Action
 
+case class SelectScalaJSVersion(version: String) extends Action
+
 case class UpdateInfo(name: String, description: String) extends Action
 
 case class UpdateSource(source: String) extends Action
@@ -43,6 +45,9 @@ class FiddleHandler[M](modelRW: ModelRW[M, FiddleData], fidRW: ModelRW[M, Option
     case SelectScalaVersion(version) =>
       updated(value.copy(scalaVersion = version))
 
+    case SelectScalaJSVersion(version) =>
+      updated(value.copy(scalaJSVersion = version))
+
     case UpdateInfo(name, description) =>
       updated(value.copy(name = name, description = description))
 

client/src/main/scala/scalafiddle/client/Utils.scala

@@ -76,9 +76,10 @@ object SHA1 extends js.Object {
 @js.native
 @JSGlobal("ScalaFiddleConfig")
 object ScalaFiddleConfig extends js.Object {
-  val compilerURL: String             = js.native
-  val helpURL: String                 = js.native
-  val scalaVersions: js.Array[String] = js.native
+  val compilerURL: String               = js.native
+  val helpURL: String                   = js.native
+  val scalaVersions: js.Array[String]   = js.native
+  val scalaJSVersions: js.Array[String] = js.native
 }
 
 @js.native

client/src/main/scala/scalafiddle/client/component/FiddleEditor.scala

@@ -176,9 +176,11 @@ object FiddleEditor {
                           .flatMap(version => Seq[TagMod](fLink(f)(version)(version.toString), span(" | ")))
                           .init
 
-                      def config[B: Ordering](name: String,
-                                              renderer: CellRenderer[FiddleVersions],
-                                              order: FiddleVersions => B) =
+                      def config[B: Ordering](
+                          name: String,
+                          renderer: CellRenderer[FiddleVersions],
+                          order: FiddleVersions => B
+                      ) =
                         ColumnConfig[FiddleVersions](name, renderer)(DefaultOrdering[FiddleVersions, B](order))
 
                       val configs = List(
@@ -290,12 +292,13 @@ object FiddleEditor {
       source
     }
 
-    def addDeps(source: String, deps: Seq[Library], scalaVersion: String): String = {
+    def addDeps(source: String, deps: Seq[Library], scalaVersion: String, scalaJSVersion: String): String = {
       val extraDeps = deps.flatMap(_.extraDeps)
       val allDeps   = extraDeps ++ deps.map(Library.stringify)
       source + "\n" +
         allDeps.map(dep => s"// $$FiddleDependency $dep\n").mkString +
-        s"// $$ScalaVersion $scalaVersion\n"
+        s"// $$ScalaVersion $scalaVersion\n" +
+        s"// $$ScalaJSVersion $scalaJSVersion\n"
     }
 
     def buildFullSource: CallbackTo[String] = {
@@ -304,7 +307,8 @@ object FiddleEditor {
         state <- $.state
       } yield {
         val source = reconstructSource(state)
-        addDeps(source, props.data().libraries, props.data().scalaVersion)
+        val data   = props.data()
+        addDeps(source, data.libraries, data.scalaVersion, data.scalaJSVersion)
       }
     }
 
@@ -472,10 +476,11 @@ object FiddleEditor {
       } >>
         props.dispatch(UpdateLoginInfo) >>
         updateFiddle(props.data()) >>
-        Callback.when(props.fiddleId.isDefined)(
+        Callback.when(props.fiddleId.isDefined) {
+          val data = props.data()
           props
-            .dispatch(compile(addDeps(props.data().sourceCode, props.data().libraries, props.data().scalaVersion), FastOpt))
-        )
+            .dispatch(compile(addDeps(data.sourceCode, data.libraries, data.scalaVersion, data.scalaJSVersion), FastOpt))
+        }
     }
 
     val fiddleStart = """\s*// \$FiddleStart\s*$""".r

client/src/main/scala/scalafiddle/client/component/Sidebar.scala

@@ -37,6 +37,7 @@ object Sidebar {
       val availableVersions = fd.available
         .filterNot(lib => fd.libraries.exists(_.name == lib.name))
         .filter(lib => lib.scalaVersions.contains(fd.scalaVersion))
+        .filter(lib => lib.scalaJSVersions.contains(fd.scalaJSVersion))
 
       // hide alternative versions, if requested
       val available =
@@ -140,6 +141,31 @@ object Sidebar {
                   }
                 )
               )
+            ),
+            div(cls := "ui grid")(
+              div(cls := "eight wide column")(
+                h4("Scala.js version")
+              ),
+              div(cls := "eight wide column right aligned")(
+                div(cls := "grouped fields")(
+                  ScalaFiddleConfig.scalaJSVersions.toTagMod { version =>
+                    div(cls := "field")(
+                      div(cls := "ui radio checkbox")(
+                        input.radio(
+                          name := "scalajsversion",
+                          value := version,
+                          checked := props.data().scalaJSVersion == version,
+                          onChange ==> { (e: ReactEventFromInput) =>
+                            val newVersion = e.currentTarget.value
+                            props.dispatch(SelectScalaJSVersion(newVersion))
+                          }
+                        ),
+                        label(version + ".x")
+                      )
+                    )
+                  }
+                )
+              )
             )
           )
         ),

server/src/main/resources/application.conf

@@ -57,6 +57,9 @@ scalafiddle {
   scalaVersions = ["2.11", "2.12"]
   defaultScalaVersion = "2.12"
 
+  scalaJSVersions = ["0.6", "1"]
+  defaultScalaJSVersion = "0.6"
+
   refreshLibraries = 300
   refreshLibraries = ${?SCALAFIDDLE_REFRESH_LIBRARIES}
 

server/src/main/scala/controllers/Application.scala

@@ -47,6 +47,7 @@ class Application @Inject() (
   val scalafiddleUrl   = new URL(config.get[String]("scalafiddle.scalafiddleURL"))
   val compilerUrl      = config.get[String]("scalafiddle.compilerURL")
   val scalaVersions    = config.get[Seq[String]]("scalafiddle.scalaVersions")
+  val scalaJSVersions  = config.get[Seq[String]]("scalafiddle.scalaJSVersions")
 
   Kamon.start()
 
@@ -133,6 +134,7 @@ class Application @Inject() (
         val allLibs = fd.libraries.flatMap(lib => Library.stringify(lib) +: lib.extraDeps)
         sourceCode.append(allLibs.map(lib => s"// $$FiddleDependency $lib").mkString("\n", "\n", "\n"))
         sourceCode.append(s"// $$ScalaVersion ${fd.scalaVersion}\n")
+        sourceCode.append(s"// $$ScalaJSVersion ${fd.scalaJSVersion}\n")
         nameOpt.foreach(name => sourceCode.append(s"// $$FiddleName $name\n"))
 
         Ok(sourceCode.toString).withHeaders(CACHE_CONTROL -> "max-age=7200")
@@ -317,7 +319,7 @@ class Application @Inject() (
 
   private def loadFiddle(id: String, version: Int, sourceOpt: Option[String] = None): Future[Try[FiddleData]] = {
     if (id == "") {
-      val (source, libs, scalaVersion) = parseFiddle(sourceOpt.fold(defaultSource)(identity))
+      val (source, libs, scalaVersion, scalaJSVersion) = parseFiddle(sourceOpt.fold(defaultSource)(identity))
       Future.successful(
         Success(
           FiddleData(
@@ -329,6 +331,9 @@ class Application @Inject() (
             scalaVersion
               .flatMap(v => scalaVersions.find(_ == v))
               .getOrElse(config.get[String]("scalafiddle.defaultScalaVersion")),
+            scalaJSVersion
+              .flatMap(v => scalaJSVersions.find(_ == v))
+              .getOrElse(config.get[String]("scalafiddle.defaultScalaJSVersion")),
             None,
             System.currentTimeMillis()
           )
@@ -346,6 +351,7 @@ class Application @Inject() (
                 f.libraries.flatMap(librarian.findLibrary),
                 librarian.libraries,
                 f.scalaVersion,
+                f.scalaJSVersion,
                 None,
                 f.created
               )
@@ -363,6 +369,7 @@ class Application @Inject() (
                   f.libraries.flatMap(librarian.findLibrary),
                   librarian.libraries,
                   f.scalaVersion,
+                  f.scalaJSVersion,
                   Some(user),
                   f.created
                 )
@@ -376,6 +383,7 @@ class Application @Inject() (
                   f.libraries.flatMap(librarian.findLibrary),
                   librarian.libraries,
                   f.scalaVersion,
+                  f.scalaJSVersion,
                   None,
                   f.created
                 )
@@ -387,16 +395,20 @@ class Application @Inject() (
     }
   }
 
-  private def parseFiddle(source: String): (String, Seq[Library], Option[String]) = {
-    val dependencyRE = """ *// \$FiddleDependency +(.+)""".r
-    val versionRE    = """ *// \$ScalaVersion +([0-9]+\.[0-9]+)""".r
-    val lines        = source.split("\n")
+  private def parseFiddle(source: String): (String, Seq[Library], Option[String], Option[String]) = {
+    val dependencyRE     = """ *// \$FiddleDependency +(.+)""".r
+    val scalaVersionRE   = """ *// \$ScalaVersion +([0-9]+\.[0-9]+)""".r
+    val scalaJSVersionRE = """ *// \$ScalaJSVersion +([0-9]+(?:\.[0-9]+)?)""".r
+    val lines            = source.split("\n")
     val (libLines, codeLines) = lines.partition { line =>
-      dependencyRE.findFirstIn(line).isDefined || versionRE.findFirstIn(line).isDefined
+      dependencyRE.findFirstIn(line).isDefined ||
+      scalaVersionRE.findFirstIn(line).isDefined ||
+      scalaVersionRE.findFirstIn(line).isDefined
     }
-    val libs    = libLines.flatMap(line => dependencyRE.findFirstMatchIn(line).flatMap(d => librarian.findLibrary(d.group(1))))
-    val version = libLines.flatMap(line => versionRE.findFirstMatchIn(line).map(_.group(1))).headOption
-    (codeLines.mkString("\n"), libs, version)
+    val libs           = libLines.flatMap(line => dependencyRE.findFirstMatchIn(line).flatMap(d => librarian.findLibrary(d.group(1))))
+    val scalaVersion   = libLines.flatMap(line => scalaVersionRE.findFirstMatchIn(line).map(_.group(1))).headOption
+    val scalaJSVersion = libLines.flatMap(line => scalaJSVersionRE.findFirstMatchIn(line).map(_.group(1))).headOption
+    (codeLines.mkString("\n"), libs, scalaVersion, scalaJSVersion)
   }
 
   private def decodeSource(b64: String): Option[String] = {

server/src/main/scala/scalafiddle/server/Librarian.scala

@@ -12,6 +12,7 @@ class Librarian(libSource: () => BufferedSource) {
   case class LibraryVersion(
       version: String,
       scalaVersions: Seq[String],
+      scalaJSVersions: Seq[String],
       extraDeps: Seq[String],
       organization: Option[String],
       artifact: Option[String],
@@ -25,6 +26,7 @@ class Librarian(libSource: () => BufferedSource) {
       LibraryVersion(
         readJs[String](values("version")),
         readJs[Seq[String]](values("scalaVersions")),
+        values.get("scalaJSVersions").map(readJs[Seq[String]]).getOrElse(Seq("0.6")),
         readJs[Seq[String]](values.getOrElse("extraDeps", Js.Arr())),
         values.get("organization").map(readJs[String]),
         values.get("artifact").map(readJs[String]),
@@ -80,6 +82,7 @@ class Librarian(libSource: () => BufferedSource) {
         versionDef.version,
         lib.compileTimeOnly,
         versionDef.scalaVersions,
+        versionDef.scalaJSVersions,
         versionDef.extraDeps,
         f"$idx%02d:${group.group}",
         createDocURL(versionDef.doc.getOrElse(lib.doc)),

server/src/main/scala/scalafiddle/server/Persistence.scala

@@ -87,6 +87,7 @@ class Persistence @Inject() (config: Configuration) extends Actor with ActorLogg
         fiddle.sourceCode,
         fiddle.libraries.map(Library.stringify).toList,
         fiddle.scalaVersion,
+        fiddle.scalaJSVersion,
         user
       )
       runAndReply(dal.insertFiddle(newFiddle))(r => Success(FiddleId(id, 0))) pipeTo sender()
@@ -101,6 +102,7 @@ class Persistence @Inject() (config: Configuration) extends Actor with ActorLogg
         fiddle.sourceCode,
         fiddle.libraries.map(Library.stringify).toList,
         fiddle.scalaVersion,
+        fiddle.scalaJSVersion,
         user,
         Some(s"$id/$version")
       )
@@ -142,6 +144,7 @@ class Persistence @Inject() (config: Configuration) extends Actor with ActorLogg
               fiddle.sourceCode,
               fiddle.libraries.map(Library.stringify).toList,
               fiddle.scalaVersion,
+              fiddle.scalaJSVersion,
               latest.user,
               Some(s"${latest.id}/${latest.version}")
             )

server/src/main/scala/scalafiddle/server/dao/FiddleDAO.scala

@@ -8,6 +8,7 @@ case class Fiddle(
     sourceCode: String,
     libraries: List[String],
     scalaVersion: String,
+    scalaJSVersion: String,
     user: String,
     parent: Option[String] = None,
     created: Long = System.currentTimeMillis(),
@@ -24,21 +25,22 @@ trait FiddleDAO { self: DriverComponent =>
   )
 
   class Fiddles(tag: Tag) extends Table[Fiddle](tag, "fiddle") {
-    def id           = column[String]("id")
-    def version      = column[Int]("version")
-    def name         = column[String]("name")
-    def description  = column[String]("description")
-    def sourceCode   = column[String]("sourcecode")
-    def libraries    = column[List[String]]("libraries")
-    def scalaVersion = column[String]("scala_version")
-    def user         = column[String]("user")
-    def parent       = column[Option[String]]("parent")
-    def created      = column[Long]("created")
-    def removed      = column[Boolean]("removed")
-    def pk           = primaryKey("pk_fiddle", (id, version))
+    def id             = column[String]("id")
+    def version        = column[Int]("version")
+    def name           = column[String]("name")
+    def description    = column[String]("description")
+    def sourceCode     = column[String]("sourcecode")
+    def libraries      = column[List[String]]("libraries")
+    def scalaVersion   = column[String]("scala_version")
+    def scalaJSVersion = column[String]("scalajs_version")
+    def user           = column[String]("user")
+    def parent         = column[Option[String]]("parent")
+    def created        = column[Long]("created")
+    def removed        = column[Boolean]("removed")
+    def pk             = primaryKey("pk_fiddle", (id, version))
 
     def * =
-      (id, version, name, description, sourceCode, libraries, scalaVersion, user, parent, created, removed) <> (Fiddle.tupled, Fiddle.unapply)
+      (id, version, name, description, sourceCode, libraries, scalaVersion, scalaJSVersion, user, parent, created, removed) <> (Fiddle.tupled, Fiddle.unapply)
   }
 
   val fiddles = TableQuery[Fiddles]

server/src/main/twirl/views/index.scala.html

@@ -43,6 +43,7 @@
           cfg.compilerURL = "@config.get[String]("scalafiddle.compilerURL")";
           cfg.helpURL = "@config.get[String]("scalafiddle.helpURL")";
           cfg.scalaVersions = @Html(config.get[Seq[String]]("scalafiddle.scalaVersions").mkString("[\"","\",\"","\"]"));
+          cfg.scalaJSVersions = @Html(config.get[Seq[String]]("scalafiddle.scalaJSVersions").mkString("[\"","\",\"","\"]"));
           window.ScalaFiddleConfig = cfg;
           window.ScalaFiddleData = @Html(fiddleData);
         </script>

server/src/main/twirl/views/resultframe.scala.html

@@ -56,7 +56,7 @@
                             loads.then(function() {
                                 try {
                                     eval(msg.data.code);
-                                    eval("var sf = ScalaFiddle;if(typeof sf === 'function') { if(typeof sf().main === 'function') sf().main() } else if(typeof sf.main === 'function') sf.main();");
+                                    eval("if(typeof ScalaFiddle !== 'undefined') { var sf = ScalaFiddle;if(typeof sf === 'function') { if(typeof sf().main === 'function') sf().main() } else if(typeof sf.main === 'function') sf.main(); }");
                                 } catch(ex) {
                                     result.insertAdjacentHTML('beforeend', '<pre class="error">ERROR: ' + ex.message + '\n' + ex.stack + '</pre>')
                                 } finally {

shared/src/main/scala/scalafiddle/shared/FiddleData.scala

@@ -11,6 +11,7 @@ case class Library(
     version: String,
     compileTimeOnly: Boolean,
     scalaVersions: Seq[String],
+    scalaJSVersions: Seq[String],
     extraDeps: Seq[String],
     group: String,
     docUrl: String,
@@ -32,6 +33,7 @@ case class FiddleData(
     libraries: Seq[Library],
     available: Seq[Library],
     scalaVersion: String,
+    scalaJSVersion: String,
     author: Option[UserInfo],
     modified: Long
 )