commonlisp
diff --git a/‎ci/matrix.xml
Lines changed: 2 additions & 1 deletion b/‎ci/matrix.xml
Lines changed: 2 additions & 1 deletion
diff --git a/‎project/BinaryIncompatibilities.scala
Lines changed: 14 additions & 0 deletions b/‎project/BinaryIncompatibilities.scala
Lines changed: 14 additions & 0 deletions
diff --git a/‎sbt-plugin-test/build.sbt
Lines changed: 50 additions & 0 deletions b/‎sbt-plugin-test/build.sbt
Lines changed: 50 additions & 0 deletions
diff --git a/‎sbt-plugin-test/jsDependenciesTest/src/main/resources/js/foo.js
Lines changed: 1 addition & 0 deletions b/‎sbt-plugin-test/jsDependenciesTest/src/main/resources/js/foo.js
Lines changed: 1 addition & 0 deletions
diff --git a/‎sbt-plugin-test/jsDependenciesTest/src/main/resources/js/some-jquery-plugin.js
Lines changed: 1 addition & 0 deletions b/‎sbt-plugin-test/jsDependenciesTest/src/main/resources/js/some-jquery-plugin.js
Lines changed: 1 addition & 0 deletions
diff --git a/‎sbt-plugin-test/project/build.properties
Lines changed: 1 addition & 1 deletion b/‎sbt-plugin-test/project/build.properties
Lines changed: 1 addition & 1 deletion
diff --git a/‎tools/jvm/src/test/scala/org/scalajs/core/tools/classpath/builder/test/ClasspathElementsTraverserTest.scala
Lines changed: 1 addition & 1 deletion b/‎tools/jvm/src/test/scala/org/scalajs/core/tools/classpath/builder/test/ClasspathElementsTraverserTest.scala
Lines changed: 1 addition & 1 deletion
diff --git a/‎tools/shared/src/main/scala/org/scalajs/core/tools/classpath/Exceptions.scala
Lines changed: 32 additions & 2 deletions b/‎tools/shared/src/main/scala/org/scalajs/core/tools/classpath/Exceptions.scala
Lines changed: 32 additions & 2 deletions
diff --git a/‎tools/shared/src/main/scala/org/scalajs/core/tools/classpath/PartialClasspath.scala
Lines changed: 65 additions & 7 deletions b/‎tools/shared/src/main/scala/org/scalajs/core/tools/classpath/PartialClasspath.scala
Lines changed: 65 additions & 7 deletions
diff --git a/‎tools/shared/src/main/scala/org/scalajs/core/tools/classpath/builder/AbstractJarLibClasspathBuilder.scala
Lines changed: 4 additions & 3 deletions b/‎tools/shared/src/main/scala/org/scalajs/core/tools/classpath/builder/AbstractJarLibClasspathBuilder.scala
Lines changed: 4 additions & 3 deletions
@@ -129,7 +129,8 @@
     cd sbt-plugin-test
     sbt noDOM/run withDOM/run test \
         'set scalaJSStage in Global := FastOptStage' \
-        jetty9/run test
+        jetty9/run test \
+        jsDependenciesTest/packageJSDependencies
   ]]></task>
 
   <task id="partest-noopt"><![CDATA[
 
@@ -37,6 +37,20 @@ object BinaryIncompatibilities {
       ProblemFilters.exclude[MissingMethodProblem](
           "org.scalajs.core.tools.optimizer.LinkedClass.this"),
 
+      /* Breaking changes: ClasspathContentHandler.handleJS takes an
+       * additional parameter.
+       */
+      ProblemFilters.exclude[MissingMethodProblem](
+          "org.scalajs.core.tools.classpath.builder.ClasspathContentHandler.handleJS"),
+      ProblemFilters.exclude[MissingMethodProblem](
+          "org.scalajs.core.tools.classpath.builder.AbstractJarLibClasspathBuilder.handleJS"),
+      ProblemFilters.exclude[MissingMethodProblem](
+          "org.scalajs.core.tools.classpath.builder.AbstractPartialClasspathBuilder.handleJS"),
+      ProblemFilters.exclude[MissingMethodProblem](
+          "org.scalajs.core.tools.classpath.builder.JarLibClasspathBuilder.handleJS"),
+      ProblemFilters.exclude[MissingMethodProblem](
+          "org.scalajs.core.tools.classpath.builder.PartialClasspathBuilder.handleJS"),
+
       /* In theory, this is a problem, but no one but us is going to
        * *implement* Analysis.ClassInfo.
        */
 
@@ -85,6 +85,56 @@ lazy val multiTest = crossProject.
 lazy val multiTestJS = multiTest.js
 lazy val multiTestJVM = multiTest.jvm
 
+lazy val jsDependenciesTest = project.settings(versionSettings: _*).
+  enablePlugins(ScalaJSPlugin).
+  settings(
+    jsDependencies ++= Seq(
+        "org.webjars" % "historyjs" % "1.8.0" / "uncompressed/history.js",
+        ProvidedJS / "some-jquery-plugin.js" dependsOn "1.10.2/jquery.js",
+        ProvidedJS / "js/foo.js" dependsOn "uncompressed/history.js",
+
+        // cause a circular dependency error if both "history.js"'s are considered equal
+        "org.webjars" % "historyjs" % "1.8.0" / "compressed/history.js" dependsOn "foo.js",
+
+        // cause a duplicate commonJSName if the following are not considered equal
+        "org.webjars" % "mustachejs" % "0.8.2" / "mustache.js" commonJSName "Mustache",
+        "org.webjars" % "mustachejs" % "0.8.2" / "0.8.2/mustache.js" commonJSName "Mustache"
+    )
+  ).
+  settings(inConfig(Compile)(Seq(
+    skip in packageJSDependencies := false,
+    packageJSDependencies <<= packageJSDependencies.dependsOn(Def.task {
+      // perform verifications on the ordering and deduplications
+      val cp = scalaJSPreLinkClasspath.value
+      val relPaths = cp.jsLibs.map(_.info.relPath)
+
+      assert(relPaths.toSet == Set(
+          "META-INF/resources/webjars/mustachejs/0.8.2/mustache.js",
+          "META-INF/resources/webjars/historyjs/1.8.0/scripts/uncompressed/history.js",
+          "META-INF/resources/webjars/historyjs/1.8.0/scripts/compressed/history.js",
+          "META-INF/resources/webjars/jquery/1.10.2/jquery.js",
+          "js/foo.js",
+          "js/some-jquery-plugin.js"),
+          s"Bad set of relPathes: ${relPaths.toSet}")
+
+      val jQueryIndex = relPaths.indexWhere(_ endsWith "/jquery.js")
+      val jQueryPluginIndex = relPaths.indexWhere(_ endsWith "/some-jquery-plugin.js")
+      assert(jQueryPluginIndex > jQueryIndex,
+
+      val uncompressedHistoryIndex = relPaths.indexWhere(_ endsWith "/uncompressed/history.js")
+      val fooIndex = relPaths.indexWhere(_ endsWith "/foo.js")
+      val compressedHistoryIndex = relPaths.indexWhere(_ endsWith "/compressed/history.js")
+      assert(fooIndex > uncompressedHistoryIndex,
+          "foo.js appears before uncompressed/history.js")
+      assert(compressedHistoryIndex > fooIndex,
+          "compressed/history.js appears before foo.js")
+
+      streams.value.log.info("jsDependencies resolution test passed")
+    })
+  )): _*).
+  dependsOn(jetty9) // depends on jQuery
+
 // Test %%% macro - #1331
 val unusedSettings = Seq(
   libraryDependencies += "org.example" %%% "dummy" % "0.1"
 
@@ -0,0 +1 @@
+// js/foo.js
@@ -0,0 +1 @@
+// js/some-jquery-plugin.js
@@ -1 +1 @@
-sbt.version=0.13.6
+sbt.version=0.13.7
@@ -14,7 +14,7 @@ class ClasspathElementsTraverserTest {
   class TestElementTraverser extends ClasspathElementsTraverser with PhysicalFileSystem {
     protected def handleDepManifest(m: => JSDependencyManifest): Unit = ???
     protected def handleIR(relPath: String, ir: => VirtualScalaJSIRFile): Unit = ???
-    protected def handleJS(js: => VirtualJSFile): Unit = ???
+    protected def handleJS(relPath: String, js: => VirtualJSFile): Unit = ???
 
     def test(f: File): String = traverseClasspathElements(Seq(f))
   }
 
@@ -9,17 +9,47 @@
 
 package org.scalajs.core.tools.classpath
 
-import org.scalajs.core.tools.jsdep.ResolutionInfo
+import org.scalajs.core.tools.jsdep.{Origin, ResolutionInfo}
 
+class JSLibResolveException(val problems: List[JSLibResolveException.Problem])
+    extends Exception(JSLibResolveException.mkMsg(problems))
+
+object JSLibResolveException {
+  final class Problem(val resourceName: String,
+      val possiblePaths: List[String], val origins: List[Origin]) {
+    def isMissing: Boolean = possiblePaths.isEmpty
+    def isAmbiguous: Boolean = possiblePaths.nonEmpty
+  }
+
+  private def mkMsg(problems: List[Problem]): String = {
+    val msg = new StringBuilder
+    msg.append("Some references to JS libraries could not be resolved:\n")
+    for (p <- problems) {
+      if (p.isMissing) {
+        msg.append(s"- Missing JS library: ${p.resourceName}\n")
+      } else {
+        msg.append(s"- Ambiguous reference to a JS library: ${p.resourceName}\n")
+        msg.append("  Possible paths found on the classpath:\n")
+        for (relPath <- p.possiblePaths)
+          msg.append(s"  - $relPath\n")
+      }
+      msg.append(s"  originating from: ${p.origins.mkString(", ")}\n")
+    }
+    msg.toString()
+  }
+}
+
+@deprecated("MissingJSLibException has been replaced by JSLibResolveException.", "0.6.1")
 class MissingJSLibException(val dependencies: List[ResolutionInfo])
   extends Exception(MissingJSLibException.mkMsg(dependencies))
 
+@deprecated("MissingJSLibException has been replaced by JSLibResolveException.", "0.6.1")
 object MissingJSLibException {
   private def mkMsg(deps: List[ResolutionInfo]): String = {
     val msg = new StringBuilder()
     msg.append("Missing dependencies: \n")
     for (d <- deps) {
-      msg.append(s"- ${d.resourceName}")
+      msg.append(s"- ${d.relPath}")
       msg.append(s" originating from: ${d.origins.mkString(", ")}\n")
     }
     msg.toString()
 
@@ -10,11 +10,14 @@
 package org.scalajs.core.tools.classpath
 
 import scala.collection.immutable.{Seq, Traversable}
+import scala.collection.mutable
 
 import org.scalajs.core.tools.jsdep._
 import org.scalajs.core.tools.io._
 import org.scalajs.core.tools.corelib.CoreJSLibs
 
+import JSLibResolveException.Problem
+
 /** A partial Scala.js classpath is a collection of:
  *  - Scala.js binary files *.sjsir
  *  - Native JavaScript libraries
@@ -56,23 +59,78 @@ final class PartialClasspath(
   }
 
   /** Constructs an ordered list of JS libraries to include. Fails if:
+   *  - Resource names do not identify a unique resource on the classpath
    *  - Dependencies have cycles
    *  - Not all dependencies are available
    */
   protected def resolveDependencies(
       filter: DependencyFilter): List[ResolvedJSDependency] = {
-    val flatDeps = filter(dependencies.flatMap(_.flatten))
+    val resourceNames = collectAllResourceNames()
+    val resolvedJSLibs = resolveAllResourceNames(resourceNames)
+
+    val allFlatDeps = for {
+      manifest <- dependencies
+      dep <- manifest.libDeps
+    } yield {
+      new FlatJSDependency(manifest.origin, resolvedJSLibs(dep.resourceName),
+          dep.dependencies.map(resolvedJSLibs), dep.commonJSName)
+    }
+
+    val flatDeps = filter(allFlatDeps)
     val includeList = JSDependencyManifest.createIncludeList(flatDeps)
 
-    val missingDeps = includeList.filterNot { info =>
-      availableLibs.contains(info.resourceName)
+    for (info <- includeList)
+      yield new ResolvedJSDependency(availableLibs(info.relPath), info)
+  }
+
+  /** Collects all the resource names mentioned in the manifests.
+   *  @return Map from resource name to the list of origins mentioning them
+   */
+  private def collectAllResourceNames(): Map[String, List[Origin]] = {
+    val nameOriginPairs = for {
+      manifest <- dependencies.toList
+      dep <- manifest.libDeps
+      resourceName <- dep.resourceName :: dep.dependencies
+    } yield (resourceName, manifest.origin)
+
+    nameOriginPairs.groupBy(_._1).mapValues(_.map(_._2))
+  }
+
+  /** Resolves all the resource names wrt to the current classpath.
+   *  @throws JSLibResolveException if any of the resource names cannot be resolved
+   *  @return Map from resource name to relative path
+   */
+  private def resolveAllResourceNames(
+      allResourceNames: Map[String, List[Origin]]): Map[String, String] = {
+    val problems = mutable.ListBuffer.empty[Problem]
+    val resolvedLibs = Map.newBuilder[String, String]
+
+    for ((resourceName, origins) <- allResourceNames) {
+      resolveResourceName(resourceName, origins).fold[Unit](
+          problems += _,
+          resolvedLibs += resourceName -> _)
     }
 
-    if (missingDeps.nonEmpty)
-      throw new MissingJSLibException(missingDeps)
+    if (problems.nonEmpty)
+      throw new JSLibResolveException(problems.toList)
+    else
+      resolvedLibs.result()
+  }
 
-    for (info <- includeList)
-      yield new ResolvedJSDependency(availableLibs(info.resourceName), info)
+  /** Resolves one resource name wrt to the current classpath. */
+  private def resolveResourceName(resourceName: String,
+      origins: List[Origin]): Either[Problem, String] = {
+    val candidates = (availableLibs.keys collect {
+      case relPath if ("/" + relPath).endsWith("/" + resourceName) =>
+        relPath
+    }).toList
+
+    candidates match {
+      case relPath :: Nil =>
+        Right(relPath)
+      case _ =>
+        Left(new Problem(resourceName, candidates, origins))
+    }
   }
 
   protected def mergeCompliance(): Traversable[ComplianceRequirement] = {
 
@@ -38,10 +38,11 @@ trait AbstractJarLibClasspathBuilder extends JarTraverser {
     irFiles += ir
   }
 
-  override protected def handleJS(js: => VirtualJSFile): Unit = {
+  override protected def handleJS(relPath: String,
+      js: => VirtualJSFile): Unit = {
     val file = js
-    if (!jsFiles.contains(file.name))
-      jsFiles += file.name -> file
+    if (!jsFiles.contains(relPath))
+      jsFiles += relPath -> file
   }
 
   override protected def handleDepManifest(m: => JSDependencyManifest): Unit = {
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-sbt.version=0.13.6`
	`1`	`+sbt.version=0.13.7`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ class ClasspathElementsTraverserTest {`
`14`	`14`	`class TestElementTraverser extends ClasspathElementsTraverser with PhysicalFileSystem {`
`15`	`15`	`protected def handleDepManifest(m: => JSDependencyManifest): Unit = ???`
`16`	`16`	`protected def handleIR(relPath: String, ir: => VirtualScalaJSIRFile): Unit = ???`
`17`		`- protected def handleJS(js: => VirtualJSFile): Unit = ???`
	`17`	`+ protected def handleJS(relPath: String, js: => VirtualJSFile): Unit = ???`
`18`	`18`
`19`	`19`	`def test(f: File): String = traverseClasspathElements(Seq(f))`
`20`	`20`	`}`
Original file line number	Diff line number	Diff line change
`@@ -38,10 +38,11 @@ trait AbstractJarLibClasspathBuilder extends JarTraverser {`
`38`	`38`	`irFiles += ir`
`39`	`39`	`}`
`40`	`40`
`41`		`- override protected def handleJS(js: => VirtualJSFile): Unit = {`
	`41`	`+ override protected def handleJS(relPath: String,`
	`42`	`+ js: => VirtualJSFile): Unit = {`
`42`	`43`	`val file = js`
`43`		`- if (!jsFiles.contains(file.name))`
`44`		`- jsFiles += file.name -> file`
	`44`	`+ if (!jsFiles.contains(relPath))`
	`45`	`+ jsFiles += relPath -> file`
`45`	`46`	`}`
`46`	`47`
`47`	`48`	`override protected def handleDepManifest(m: => JSDependencyManifest): Unit = {`