Merge branch 'cljs-2250'

Author: swannodette

src/main/clojure/cljs/build/api.clj

@@ -193,7 +193,10 @@
      (if-not (nil? env/*compiler*)
        env/*compiler*
        (env/default-compiler-env
-         (closure/add-externs-sources opts)))))
+         ;; need to dissoc :foreign-libs since we won't know what overriding
+         ;; foreign libspecs are referring to until after add-implicit-options
+         ;; - David
+         (closure/add-externs-sources (dissoc opts :foreign-libs))))))
   ([source opts compiler-env]
    (doseq [[unknown-opt suggested-opt] (util/unknown-opts (set (keys opts)) closure/known-opts)]
      (when suggested-opt

src/main/clojure/cljs/closure.clj

@@ -1995,21 +1995,23 @@
                 (string/includes? p' "_")
                 (conj (string/replace p' "_" "-")))))
           (expand-lib* [{:keys [file] :as lib}]
-            (let [root (.getAbsolutePath (io/file file))
-                  dir  (io/file file)]
-              (if (.isDirectory dir)
-                (into []
-                  (comp
-                    (filter #(.endsWith (.getName ^File %) ".js"))
-                    (filter #(not (.isHidden ^File %)))
-                    (map
-                      (fn [^File f]
-                        (let [p  (.getPath f)
-                              ap (.getAbsolutePath f)]
-                          (merge lib
-                            {:file p :provides (path->provides (prep-path ap root))})))))
-                  (file-seq dir))
-                [lib])))]
+            (if-not file
+              [lib] ;; foreign-lib override case - David
+              (let [root (.getAbsolutePath (io/file file))
+                    dir (io/file file)]
+                (if (.isDirectory dir)
+                  (into []
+                    (comp
+                      (filter #(.endsWith (.getName ^File %) ".js"))
+                      (filter #(not (.isHidden ^File %)))
+                      (map
+                        (fn [^File f]
+                          (let [p (.getPath f)
+                                ap (.getAbsolutePath f)]
+                            (merge lib
+                              {:file p :provides (path->provides (prep-path ap root))})))))
+                    (file-seq dir))
+                  [lib]))))]
     (into [] (mapcat expand-lib* libs))))
 
 (declare index-node-modules)
@@ -2432,7 +2434,10 @@
       (if-not (nil? env/*compiler*)
         env/*compiler*
         (env/default-compiler-env
-          (add-externs-sources opts)))))
+          ;; need to dissoc :foreign-libs since we won't know what overriding
+          ;; foreign libspecs are referring to until after add-implicit-options
+          ;; - David
+          (add-externs-sources (dissoc opts :foreign-libs))))))
   ([source opts compiler-env]
      (env/with-compiler-env compiler-env
        ;; we want to warn about NPM dep conflicts before installing the modules

src/main/clojure/cljs/js_deps.cljc

@@ -130,6 +130,16 @@ case."
   (-requires [this] "A list of namespaces that this JavaScript requires.")
   (-source [this] [this opts] "The JavaScript source string."))
 
+(defn get-file [lib-spec index]
+  (or (:file lib-spec)
+      (some (fn [provide] (get-in index [provide :file]))
+        (:provides lib-spec))))
+
+(defn lib-spec-merge [a b]
+  (merge a
+    (cond-> b
+      (contains? a :provides) (dissoc :provides))))
+
 (defn build-index
   "Index a list of dependencies by namespace and file name. There can
   be zero or more namespaces provided per file. Upstream foreign libraies
@@ -143,7 +153,7 @@ case."
                        (reduce
                          (fn [index' provide]
                            (if (:foreign dep)
-                             (update-in index' [provide] merge dep)
+                             (update-in index' [provide] lib-spec-merge dep)
                              ;; when building the dependency index, we need to
                              ;; avoid overwriting a CLJS dep with a CLJC dep of
                              ;; the same namespace - António Monteiro
@@ -159,7 +169,11 @@ case."
                          index provides)
                        index)]
         (if (:foreign dep)
-          (update-in index' [(:file dep)] merge dep)
+          (if-let [file (get-file dep index')]
+            (update-in index' [file] lib-spec-merge dep)
+            (throw
+              (Exception.
+                (str "No :file provided for :foreign-libs spec " (pr-str dep)))))
           (assoc index' (:file dep) dep))))
     {} deps))