Properly identify and check Scala.js dependencies

src/main/scala/explicitdeps/BoringStuff.scala

@@ -6,11 +6,15 @@ import scala.util.control.NonFatal
 import scala.xml.XML
 
 import sbt.util.Logger
+import sbt.librarymanagement.ModuleID
 
 case class ScalaVersion(
   binary: String,
   full: String
-)
+) {
+  def binarySuffix = "_" + binary
+  def fullSuffix = "_" + full
+}
 
 object BoringStuff {
 
@@ -67,9 +71,9 @@ object BoringStuff {
       // We use the parent dir to get the version because it's sometimes not present in the pom file
       val version = file.getParentFile.getName
 
-      val (name, crossVersion) = parseModuleName(scalaVersion)(rawName)
+      val (name, crossVersion, platform) = parseModuleName(scalaVersion)(rawName)
 
-      Some(Dependency(organization, name, version, crossVersion))
+      Some(Dependency(organization, name, version, crossVersion, platform))
     } catch {
       case NonFatal(e) =>
         log.warn(s"Failed to parse dependency information from POM file ${file.getAbsolutePath}")
@@ -84,22 +88,45 @@ object BoringStuff {
       val rawName = xml \ "info" \@ "module"
       val version = xml \ "info" \@ "revision"
 
-      val (name, crossVersion) = parseModuleName(scalaVersion)(rawName)
+      val (name, crossVersion, scalajs) = parseModuleName(scalaVersion)(rawName)
 
-      Some(Dependency(organization, name, version, crossVersion))
+      Some(Dependency(organization, name, version, crossVersion, scalajs))
     } catch {
       case NonFatal(e) =>
         log.warn(s"Failed to parse dependency information from Ivy file ${file.getAbsolutePath}")
         None
     }
   }
 
-  private def parseModuleName(scalaVersion: ScalaVersion)(rawName: String): (String, Boolean) =
-    if (rawName.endsWith(s"_${scalaVersion.binary}"))
-      (rawName.replaceAllLiterally(s"_${scalaVersion.binary}", ""), true)
-    else if (rawName.endsWith(s"_${scalaVersion.full}"))
-      (rawName.replaceAllLiterally(s"_${scalaVersion.full}", ""), true)
+  private def parseModuleName(scalaVersion: ScalaVersion)(rawName: String): (String, Boolean, Option[ScalaJSVersion]) = {
+    if (rawName.endsWith(scalaVersion.binarySuffix)) {
+      val name = rawName.dropRight(scalaVersion.binarySuffix.length)
+      val platform = parseScalaPlatform(name)
+      val newName = name.dropRight(platform.map(_.suffix.length).getOrElse(0))
+      (name, true, platform)
+    }
+    else if (rawName.endsWith(scalaVersion.fullSuffix))
+      (rawName.dropRight(scalaVersion.fullSuffix.length), true, None)
     else
-      (rawName, false)
-
+      (rawName, false, None)
+  }
+
+  private def parseScalaPlatform(rawName: String): Option[ScalaJSVersion] = 
+    if(rawName.endsWith(ScalaJSVersion.V1.suffix)) Some(ScalaJSVersion.V1)
+    else if (rawName.endsWith(ScalaJSVersion.V06.suffix)) Some(ScalaJSVersion.V06)
+    else None
+
+
+  def moduleIDToDependency(moduleId: ModuleID): Dependency = {
+    val isCross = moduleId.crossVersion.isInstanceOf[Binary] ||  moduleId.crossVersion.isInstanceOf[Full]
+    val platform = modulePlatform(moduleId) 
+
+    Dependency(
+      moduleId.organization, 
+      moduleId.name + platform.map(_.suffix).getOrElse(""), 
+      moduleId.revision, 
+      isCross, 
+      platform
+    )
+  }
 }

src/main/scala/explicitdeps/Dependency.scala

@@ -1,12 +1,25 @@
 package explicitdeps
 
-final case class Dependency(organization: String, name: String, version: String, crossVersion: Boolean) {
+private[explicitdeps] sealed abstract class ScalaJSVersion(val suffix: String, val prefix: String)
+private[explicitdeps] object ScalaJSVersion {
+  case object V1 extends ScalaJSVersion("_sjs1", "sjs1_")
+  case object V06 extends ScalaJSVersion("_sjs0.6", "sjs0.6_")
+}
+
+final case class Dependency(organization: String, name: String, version: String, crossVersion: Boolean, scalaJS: Option[ScalaJSVersion]) {
+
+  override def toString: String = {
+    val platformDimension = if(scalaJS.isDefined) "%%%" else "%%"
+    val nameWithoutPlatform = scalaJS match { 
+      case Some(sjs) => name.dropRight(sjs.suffix.length())  
+      case None => name
+    } 
 
-  override def toString: String =
     if (crossVersion)
-      s""""$organization" %% "$name" % "$version""""
+      s""""$organization" $platformDimension "$nameWithoutPlatform" % "$version""""
     else
       s""""$organization" % "$name" % "$version""""
+  }
 
 }
 

src/main/scala/explicitdeps/Logic.scala

@@ -87,11 +87,10 @@ object Logic {
       .filterNot(_.name == "scala3-library")
 
 
-    val declaredCompileDependencies = compileConfigLibraryDependencies
-      .map{moduleId => 
-        val isCross = moduleId.crossVersion.isInstanceOf[Binary] ||  moduleId.crossVersion.isInstanceOf[Full]
-        Dependency(moduleId.organization, moduleId.name, moduleId.revision, isCross)
-      }
+    val declaredCompileDependencies = 
+      compileConfigLibraryDependencies
+        .map(BoringStuff.moduleIDToDependency)
+
     log.debug(s"Declared dependencies:\n${declaredCompileDependencies.mkString("  ", "\n  ", "")}")
 
     declaredCompileDependencies.toSet

src/main/scala/explicitdeps/package.scala

@@ -1,3 +1,4 @@
+import sbt.librarymanagement.ModuleID
 package object explicitdeps {
 
   type Binary = sbt.librarymanagement.Binary
@@ -33,5 +34,16 @@ package object explicitdeps {
     log.debug(s"Library dependencies:\n${allLibraryDeps.mkString("  ", "\n  ", "")}")
     allLibraryDeps
   }
+
+  def modulePlatform(moduleId: ModuleID): Option[ScalaJSVersion] = 
+    moduleId.crossVersion match {
+      case b: sbt.librarymanagement.Binary => 
+        if(b.prefix == ScalaJSVersion.V1.prefix)
+          Some(ScalaJSVersion.V1)
+        else if (b.prefix == ScalaJSVersion.V06.prefix)
+          Some(ScalaJSVersion.V06)
+        else None
+      case _ => None
+    }
 
 }

src/sbt-test/1.3+/scala-js-issues/build.sbt

@@ -0,0 +1,7 @@
+libraryDependencies ++= Seq(
+  "com.raquo" %%% "laminar" % "0.11.0"
+)
+
+scalaJSUseMainModuleInitializer := true
+
+enablePlugins(ScalaJSPlugin)

src/sbt-test/1.3+/scala-js-issues/project/plugins.sbt

@@ -0,0 +1,3 @@
+addSbtPlugin("com.github.cb372" % "sbt-explicit-dependencies" % sys.props("plugin.version"))
+
+addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.5.0")

src/sbt-test/1.3+/scala-js-issues/src/main/scala/Main.scala

@@ -0,0 +1,13 @@
+import com.raquo.laminar.api.L._
+
+import org.scalajs.dom
+
+object Main {
+  val app = div("hello")
+
+  def main(args: Array[String]): Unit = {
+    documentEvents.onDomContentLoaded.foreach { _ =>
+      render(dom.document.getElementById("appContainer"), app)
+    }(unsafeWindowOwner)
+  }
+}

src/sbt-test/1.3+/scala-js-issues/test

@@ -0,0 +1 @@
+-> undeclaredCompileDependenciesTest

src/sbt-test/1.3+/scala-js-no-issues/build.sbt

@@ -0,0 +1,10 @@
+libraryDependencies ++= Seq(
+  "com.raquo" %%% "laminar" % "0.11.0",
+  "com.raquo" %%% "airstream" % "0.11.0",
+  "com.raquo" %%% "domtypes" % "0.10.1",
+  "org.scala-js" %%% "scalajs-dom" % "1.1.0"
+)
+
+scalaJSUseMainModuleInitializer := true
+
+enablePlugins(ScalaJSPlugin)

src/sbt-test/1.3+/scala-js-no-issues/project/plugins.sbt

@@ -0,0 +1,3 @@
+addSbtPlugin("com.github.cb372" % "sbt-explicit-dependencies" % sys.props("plugin.version"))
+
+addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.5.0")

src/sbt-test/1.3+/scala-js-no-issues/src/main/scala/Main.scala

@@ -0,0 +1,13 @@
+import com.raquo.laminar.api.L._
+
+import org.scalajs.dom
+
+object Main {
+  val app = div("hello")
+
+  def main(args: Array[String]): Unit = {
+    documentEvents.onDomContentLoaded.foreach { _ =>
+      render(dom.document.getElementById("appContainer"), app)
+    }(unsafeWindowOwner)
+  }
+}

src/sbt-test/1.3+/scala-js-no-issues/test

@@ -0,0 +1,2 @@
+> undeclaredCompileDependenciesTest
+> unusedCompileDependenciesTest

src/sbt-test/basic/scala-js-issues/build.sbt

@@ -0,0 +1,7 @@
+libraryDependencies ++= Seq(
+  "com.raquo" %%% "laminar" % "0.11.0"
+)
+
+scalaJSUseMainModuleInitializer := true
+
+enablePlugins(ScalaJSPlugin)

src/sbt-test/basic/scala-js-issues/project/plugins.sbt

@@ -0,0 +1,3 @@
+addSbtPlugin("com.github.cb372" % "sbt-explicit-dependencies" % sys.props("plugin.version"))
+
+addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.5.0")

src/sbt-test/basic/scala-js-issues/src/main/scala/Main.scala

@@ -0,0 +1,13 @@
+import com.raquo.laminar.api.L._
+
+import org.scalajs.dom
+
+object Main {
+  val app = div("hello")
+
+  def main(args: Array[String]): Unit = {
+    documentEvents.onDomContentLoaded.foreach { _ =>
+      render(dom.document.getElementById("appContainer"), app)
+    }(unsafeWindowOwner)
+  }
+}

src/sbt-test/basic/scala-js-issues/test

@@ -0,0 +1 @@
+-> undeclaredCompileDependenciesTest