CLJS-3421: Throw when calling ana-api/ns-publics on non-existing ns

Author: borkdude

src/main/clojure/cljs/analyzer/api.cljc

@@ -10,7 +10,7 @@
 "This is intended to be a stable api for those who need programmatic access
  to the analyzer."
  (:refer-clojure:exclude [all-ns ns-interns ns-resolve resolve find-ns
- ns-publics remove-ns])
+ ns-publics remove-ns the-ns])
  #?(:clj (:require [cljs.analyzer :as ana]
  [cljs.env :as env]
  [cljs.util :as util]
@@ -227,16 +227,27 @@
  {:pre [(symbol? sym)]}
  (get-in @state [::ana/namespaces sym])))
 
+(defnthe-ns
+"Given a namespace return the corresponding namespace analysis map, throwing an
+ exception if not found. Analagous to clojure.core/the-ns."
+ ([ns]
+ (the-ns env/*compiler* ns))
+ ([state sym]
+ {:pre [(symbol? sym)]}
+ (or (find-ns state sym)
+ (throw (ex-info (str"No namespace found: " sym) {:ns sym})))))
+
 (defnns-interns
 "Given a namespace return all the var analysis maps. Analagous to
  clojure.core/ns-interns but returns var analysis maps not vars."
  ([ns]
  (ns-interns env/*compiler* ns))
  ([state ns]
  {:pre [(symbol?ns)]}
- (merge
- (get-in @state [::ana/namespacesns:macros])
- (get-in @state [::ana/namespacesns:defs]))))
+ (let [ns (the-ns state ns)]
+ (merge
+ (:macrosns)
+ (:defsns)))))
 
 (defnns-publics
 "Given a namespace return all the public var analysis maps. Analagous to
@@ -245,9 +256,7 @@
  (ns-publics env/*compiler* ns))
  ([state ns]
  {:pre [(symbol?ns)]}
- (->> (merge
- (get-in @state [::ana/namespacesns:macros])
- (get-in @state [::ana/namespacesns:defs]))
+ (->> (ns-interns state ns)
  (remove (fn [[k v]] (:private v)))
  (into {}))))
 

src/test/clojure/cljs/analyzer_api_tests.clj

@@ -52,3 +52,9 @@
  (is (= {:a1} (ana-api/get-js-index state)))
  (ana-api/with-state state
  (is (= {:a1} (ana-api/get-js-index))))))
+
+(deftestthrow-test
+ (let [state (atom {})]
+ (is (thrown? Exception (ana-api/the-ns state 'non.existing)))
+ (is (thrown? Exception (ana-api/ns-interns state 'non.existing)))
+ (is (thrown? Exception (ana-api/ns-publics state 'non.existing)))))