Scala 3 JS modifier

build.sbt

@@ -275,12 +275,11 @@ val jsdocs = project
   .settings(
     sharedSettings,
     publish / skip := true,
-    crossScalaVersions --= scala3,
     scalaJSLinkerConfig ~= {
       _.withModuleKind(ModuleKind.CommonJSModule)
     },
     libraryDependencies ++= List(
-      "org.scala-js" %%% "scalajs-dom" % scalajsDom
+      "org.scala-js" %%% "scalajs-dom" % scalajsDom cross CrossVersion.for3Use2_13
     ),
     scalaJSUseMainModuleInitializer := true,
     Compile / npmDependencies ++= List(
@@ -342,7 +341,6 @@ lazy val unitJS = project
   .settings(
     sharedSettings,
     publish / skip := true,
-    crossScalaVersions --= scala3,
     Compile / unmanagedSourceDirectories ++= multiScalaDirectories("tests/unit-js").value,
     libraryDependencies ++= List(
       "org.scalameta" %% "munit" % V.munit % Test
@@ -400,7 +398,6 @@ lazy val js = project
   .in(file("mdoc-js"))
   .settings(
     sharedSettings,
-    crossScalaVersions --= scala3,
     moduleName := "mdoc-js",
     Compile / unmanagedSourceDirectories ++= multiScalaDirectories("js").value,
     libraryDependencies ++= crossSetting(
@@ -409,7 +406,9 @@ lazy val js = project
         "org.scala-js" % "scalajs-compiler" % scalajs cross CrossVersion.full,
         "org.scala-js" %% "scalajs-linker" % scalajs
       ),
-      if3 = List()
+      if3 = List(
+        "org.scala-js" %% "scalajs-linker" % scalajs cross CrossVersion.for3Use2_13
+      )
     )
   )
   .dependsOn(mdoc)

mdoc-js/src/main/scala-2/mdoc/modifiers/CompilerCompat.scala

@@ -0,0 +1,12 @@
+package mdoc.modifiers
+
+import scala.reflect.io.VirtualDirectory
+import mdoc.internal.markdown.MarkdownCompiler
+import scala.meta.inputs.Input
+import mdoc.Reporter
+import mdoc.internal.pos.TokenEditDistance
+import mdoc.internal.markdown.FileImport
+
+private[modifiers] object CompilerCompat {
+  def abstractFile(tg: String) = new VirtualDirectory(tg, None)
+}

mdoc-js/src/main/scala-3/mdoc/modifiers/CompilerCompat.scala

@@ -0,0 +1,13 @@
+package mdoc.modifiers
+
+import dotty.tools.io.{AbstractFile, VirtualDirectory}
+
+import mdoc.internal.markdown.MarkdownCompiler
+import scala.meta.inputs.Input
+import mdoc.Reporter
+import mdoc.internal.pos.TokenEditDistance
+import mdoc.internal.markdown.FileImport
+
+private[modifiers] object CompilerCompat {
+  def abstractFile(tg: String) = new VirtualDirectory(tg, None)
+}

mdoc-js/src/main/scala-2/mdoc/modifiers/JsModifier.scala → mdoc-js/src/main/scala/mdoc/modifiers/JsModifier.scala

@@ -15,7 +15,6 @@ import scala.collection.mutable.ListBuffer
 import scala.meta.Term
 import scala.meta.inputs.Input
 import scala.meta.io.{AbsolutePath, Classpath}
-import scala.reflect.io.VirtualDirectory
 import org.scalajs.linker.interface.StandardConfig
 import org.scalajs.linker.StandardImpl
 import org.scalajs.linker.PathIRContainer
@@ -35,7 +34,7 @@ class JsModifier extends mdoc.PreModifier {
   override val name = "js"
   override def toString: String = s"JsModifier($config)"
   val irCache = new StandardIRFileCache
-  val target = new VirtualDirectory("(memory)", None)
+  val target = CompilerCompat.abstractFile("(memory)")
   var maybeCompiler: Option[MarkdownCompiler] = None
   var config = JsConfig()
   var linker: ClearableLinker = newLinker()
@@ -147,6 +146,7 @@ class JsModifier extends mdoc.PreModifier {
     val input = Input.VirtualFile(ctx.relativePath.toString(), wrapped)
     val edit = TokenEditDistance.fromInputs(inputs, input)
     val oldErrors = ctx.reporter.errorCount
+
     compiler.compileSources(input, ctx.reporter, edit, fileImports = Nil)
     val hasErrors = ctx.reporter.errorCount > oldErrors
     val sjsir = for {

mdoc/src/main/scala-3/mdoc/internal/markdown/MarkdownCompiler.scala

@@ -53,14 +53,22 @@ class MarkdownCompiler(
     target: AbstractFile = new VirtualDirectory("(memory)")
 ) {
 
+
   private def newContext: FreshContext = {
     val defaultFlags =
       List("-color:never", "-unchecked", "-deprecation", "-Ximport-suggestion-timeout", "0")
     val options = scalacOptions.split("\\s+").toList
     val settings =
       options ::: defaultFlags ::: "-classpath" :: classpath :: Nil
     val driver = new InteractiveDriver(settings.distinct)
-    driver.currentCtx.fresh.setReporter(new CollectionReporter)
+
+    val ctx = driver.currentCtx.fresh
+
+    ctx
+      .setReporter(new CollectionReporter)
+      .setSetting(
+        ctx.settings.outputDir, target
+      )
   }
 
   private var context = newContext
@@ -106,13 +114,14 @@ class MarkdownCompiler(
       vreporter: Reporter,
       edit: TokenEditDistance,
       fileImports: List[FileImport],
-      context: Context
+      freshContext: Option[Context] = None
   ): Unit = {
     clearTarget()
+    val context = freshContext.getOrElse(newContext)
     val compiler = new Compiler
     val run = compiler.newRun(using context)
     val inputs = List(input)
-    scala.util.Try(run.compileSources(inputs.map(toSource)))
+    val res = scala.util.Try(run.compileSources(inputs.map(toSource)))
     report(vreporter, input, fileImports, run.runContext, edit)
   }
 
@@ -139,7 +148,7 @@ class MarkdownCompiler(
       target
     )
 
-    compileSources(input, vreporter, edit, fileImports, freshContext)
+    compileSources(input, vreporter, edit, fileImports, Some(freshContext))
     if (!freshContext.reporter.hasErrors) {
       val loader = new AbstractFileClassLoader(target, appClassLoader)
       try {
@@ -226,7 +235,6 @@ class MarkdownCompiler(
   ): Unit = {
 
     val infos = context.reporter.pendingMessages(using context).toSeq.sortBy(_.pos.source.path)
-
     infos.foreach {
       case diagnostic if diagnostic.position.isPresent =>
         val pos = diagnostic.position.get

project/plugins.sbt

@@ -1,7 +1,7 @@
 addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.10.0")
 addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.15.0")
 addSbtPlugin("com.geirsson" % "sbt-ci-release" % "1.5.7")
-addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.5.0")
+addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.5.1")
 addSbtPlugin("ch.epfl.scala" % "sbt-scalajs-bundler" % "0.20.0")
 
 libraryDependencies ++= List(

tests/unit-js/src/test/scala-2/tests/js/JsSuite.scala → tests/unit-js/src/test/scala/tests/js/JsSuite.scala

@@ -44,7 +44,15 @@ class JsSuite extends BaseMarkdownSuite {
       | required: Int
       |val x: Int = ""
       |             ^^
-    """.stripMargin
+    """.stripMargin,
+    compat = Map(
+      "3.0" ->
+        """
+          |error: error.md:3:14
+          |Found:    ("" : String)
+          |Required: Int
+      """.stripMargin
+    )
   )
 
   check(
@@ -93,7 +101,21 @@ class JsSuite extends BaseMarkdownSuite {
        | required: String
        |val y: String = 42
        |                ^^
-    """.stripMargin
+    """.stripMargin,
+    compat = Map(
+      "3.0" ->
+        """
+          |error: edit.md:3:14:                
+          |Found:    ("" : String)             
+          |Required: Int                       
+          | val x: Int = ""                     
+          |              ^^                     
+          |error: edit.md:7:17:                
+          |Found:    (42 : Int)                
+          |Required: String                    
+          | val y: String = 42                  
+      """.stripMargin
+    )
   )
 
   checkError(
@@ -110,7 +132,14 @@ class JsSuite extends BaseMarkdownSuite {
     """|error: isolated.md:7:9: not found: value x
        |println(x)
        |        ^
-    """.stripMargin
+    """.stripMargin,
+    compat = Map(
+      "3.0" ->
+        """
+          |error: isolated.md:7:9
+          |Not found: x
+      """.stripMargin
+    )
   )
 
   checkCompiles(
@@ -171,7 +200,15 @@ class JsSuite extends BaseMarkdownSuite {
        | required: String
        |val x: String = 42
        |                ^^
-    """.stripMargin
+    """.stripMargin,
+    compat = Map(
+      "3.0" ->
+        """
+          |-error: compile-only-error.md:3:17:
+          |Found:    (42 : Int)
+          |Required: String              
+      """.stripMargin
+    )
   )
 
   // It's easy to mess up stripMargin multiline strings when generating code with strings.
@@ -247,7 +284,15 @@ class JsSuite extends BaseMarkdownSuite {
       baseSettings.copy(
         site = baseSettings.site.updated("js-classpath", Classpath(noScalajsDom).syntax)
       )
-    }
+    },
+    compat = Map(
+      "3.0" ->
+        """
+          |error:
+          |no-dom.md:3 (mdoc generated code)
+          | value scalajs is not a member of org
+      """.stripMargin
+    )
   )
 
   checkError(