- parse-global-refer-spec is more like parse-ns-excludes

- basic impl test

Author: swannodette

src/main/clojure/cljs/analyzer.cljc

@@ -3039,19 +3039,26 @@
               ret
               (recur fs ret true)))))
 
-;; this case is like :refer-clojure it cannot be used as a spec parser
 (defn parse-global-refer-spec
-  [env spec]
-  (let [{referred :refer-global
-         renamed  :rename} (apply hash-map (concat [:refer-global] [spec]))
-        referred-without-renamed (remove (set (keys renamed)) referred)]
-    ;; TODO: refer validation, this can be lifted easily into common helper from parse-require-spec
-    ;; TODO: rename validation, harder to lift
-    {:use    (zipmap referred-without-renamed (repeat 'js))
-     :rename (into {}
-               (map (fn [[orig new-name]]
-                      [new-name (symbol "js" (str orig))]))
-               renamed)}))
+  [env args]
+  (let [xs (filter #(-> % first (= :refer-global)) args)]
+    (if-not (= 1 (count xs))
+      (throw (error env "Only one :refer-global form is allowed per namespace definition"))
+      (let [[_ refers & {:keys [rename] :as renames-only}] (first xs)
+            err-str "Only [:refer-global (names)] and optionally `:rename {from to}` specs supported"]
+        (when-not (and (vector? refers) (every? symbol refers))
+          (throw (error env err-str)))
+        (when-not (or (empty? renames-only)
+                      (and (= 1 (count renames-only))
+                           (contains? renames-only :rename)
+                           (map? rename)
+                           (every? symbol (mapcat identity rename))))
+          (throw (error env (str err-str (pr-str renames-only)))))
+        {:use    (zipmap refers (repeat 'js))
+         :rename (into {}
+                   (map (fn [[orig new-name]]
+                          [new-name (symbol "js" (str orig))]))
+                   rename)}))))
 
 #_(defn parse-global-require-spec
   [env deps aliases spec]

src/test/clojure/cljs/analyzer_tests.clj

@@ -387,6 +387,13 @@
             :renames  {map clj-map}}))
     (is (set? (:excludes parsed)))))
 
+(deftest test-parse-global-refer
+  (let [parsed (ana/parse-global-refer-spec {}
+                '((:refer-global [Date] :rename {Symbol JSSymbol})))]
+    (is (= parsed
+           '{:use {Date js}
+             :rename {JSSymbol js/Symbol}}))))
+
 (deftest test-cljs-1785-js-shadowed-by-local
   (let [ws (atom [])]
     (ana/with-warning-handlers [(collecting-warning-handler ws)]