- refactor validation

- :refer-global :only semantically more aligned w/ Clojure

Author: swannodette

src/main/clojure/cljs/analyzer.cljc

@@ -3045,20 +3045,22 @@
         cnt (count xs)]
     (cond
       (> cnt 1)
-      (throw (error env (str "Only one :refer-global form is allowed per namespace definition " (count xs))))
+      (throw (error env "Only one :refer-global form is allowed per namespace definition"))
 
       (== cnt 1)
-      (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))
+      (let [[_ & {:keys [only rename] :as parsed-spec}] (first xs)
+            err-str "Only (:refer-global :only [names]) and optionally `:rename {from to}` specs supported"]
+        (when-not (or (empty? only)
+                      (and (vector? only)
+                           (every? symbol only)))
           (throw (error env err-str)))
-        (when-not (or (empty? renames-only)
-                      (and (= 1 (count renames-only))
-                           (contains? renames-only :rename)
-                           (map? rename)
+        (when-not (or (empty? rename)
+                      (and (map? rename)
                            (every? symbol (mapcat identity rename))))
-          (throw (error env (str err-str (pr-str renames-only)))))
-        {:use    (zipmap refers (repeat 'js))
+          (throw (error env (str err-str (pr-str parsed-spec)))))
+        (when-not (every? #{:only :rename} (keys parsed-spec))
+          (throw (error env (str err-str (pr-str parsed-spec)))))
+        {:use    (zipmap only (repeat 'js))
          :rename (into {}
                    (map (fn [[orig new-name]]
                           [new-name (symbol "js" (str orig))]))

src/main/clojure/cljs/core.cljc

@@ -3116,6 +3116,13 @@
   [& args]
   `(~'ns* ~(cons :refer-clojure args)))
 
+(core/defmacro refer-global
+  "Refer global js vars. Supports renaming via :rename.
+
+  (refer-global :only '[Date Symbol] :rename '{Symbol Sym})"
+  [& args]
+  `(~'ns* ~(cons :refer-global args)))
+
 ;; INTERNAL - do not use, only for Node.js
 (core/defmacro load-file* [f]
   `(goog/nodeGlobalRequire ~f))

src/test/clojure/cljs/analyzer_tests.clj

@@ -389,7 +389,7 @@
 
 (deftest test-parse-global-refer
   (let [parsed (ana/parse-global-refer-spec {}
-                '((:refer-global [Date] :rename {Symbol JSSymbol})))]
+                '((:refer-global :only [Date] :rename {Symbol JSSymbol})))]
     (is (= parsed
            '{:use {Date js}
              :rename {JSSymbol js/Symbol}}))))