CLJS-2676: Bad cljs.loader behavior for modules with multiple provides

Make the type of :out-file consistent - should be string

When computing orphans we need to dissoc all the :provided names of
the module, not just the canonical one.

Update tests

Author: swannodette

src/main/clojure/cljs/closure.clj

@@ -541,7 +541,7 @@
   IJavaScript."
   [^File file {:keys [output-file] :as opts}]
     (if output-file
-      (let [out-file (io/file (util/output-directory opts) output-file)]
+      (let [out-file (.toString (io/file (util/output-directory opts) output-file))]
         (compiled-file (comp/compile-file file out-file opts)))
       (let [path (.getPath ^File file)]
         (binding [ana/*cljs-file* path]

src/main/clojure/cljs/compiler.cljc

@@ -1423,7 +1423,7 @@
                                               (get-in @env/*compiler* [:options :emit-constants])
                                               (conj ana/constants-ns-sym)))
                               :file        dest
-                              :out-file    dest
+                              :out-file    (.toString dest)
                               :source-file src}
                              (when sm-data
                                {:source-map (:source-map sm-data)}))]
@@ -1557,7 +1557,7 @@
                               (and (true? (:optimize-constants opts))
                                    (nil? (get-in nses [ns :defs]))))
                       (with-core-cljs opts (fn [] (ana/analyze-file src-file opts))))
-                    (assoc ns-info :out-file dest-file))))
+                    (assoc ns-info :out-file (.toString dest-file)))))
               (catch Exception e
                 (throw (ex-info (str "failed compiling file:" src) {:file src} e))))
             (throw (java.io.FileNotFoundException. (str "The file " src " does not exist.")))))))))

src/main/clojure/cljs/module_graph.cljc

@@ -231,7 +231,10 @@
                    (into {} (map assign1) e->ms))
         orphans  (zipmap
                    (map (comp str comp/munge first :provides)
-                     (-> (reduce-kv (fn [m k _] (dissoc m k)) index assigned)
+                     (-> (reduce-kv
+                           (fn [m k _]
+                             (reduce dissoc m (get-in m [k :provides])))
+                           index assigned)
                        vals set))
                    (repeat :cljs-base))]
     (merge assigned orphans)))

src/test/clojure/cljs/module_graph_tests.clj

@@ -115,7 +115,10 @@
     (is (every?
           (fn [[e m]]
             (= m (get assigns e)))
-          assigns'))))
+          assigns'))
+    ;; events should not have been moved to :cljs-base as an orphan even though
+    ;; it provides multiple nses
+    (is (= (get assigns "events") :shared))))
 
 (def bad-modules
   {:page1 {:entries '[page1.a page1.b events]
@@ -139,10 +142,10 @@
            {:output-dir (:output-dir opts)
             :asset-path "/asset/js"
             :optimizations :none})
-        {:shared ["/asset/js/shared/a.js" "/asset/js/shared/b.js"]
-         :page1 ["/asset/js/cljs/reader.js" "/asset/js/page1/a.js" "/asset/js/page1/b.js"]
-         :page2 ["/asset/js/page2/a.js" "/asset/js/page2/b.js"]
-         :cljs-base ["/asset/js/goog/base.js" "/asset/js/cljs/core.js" "/asset/js/events.js"]}))
+        {:shared ["/asset/js/events.js" "/asset/js/shared/a.js" "/asset/js/shared/b.js"],
+         :page1 ["/asset/js/cljs/reader.js" "/asset/js/page1/a.js" "/asset/js/page1/b.js"],
+         :page2 ["/asset/js/page2/a.js" "/asset/js/page2/b.js"],
+         :cljs-base ["/asset/js/goog/base.js" "/asset/js/cljs/core.js"]}))
   (is (= (module-graph/modules->module-uris (modules opts) (inputs opts)
            {:output-dir (:output-dir opts)
             :asset-path "/asset/js"