CLJS-3137: fspec cannot be reused in clojurescript but can be in clojure

move the var fdef vars bits into def, add tests

Author: swannodette

src/main/cljs/cljs/spec/alpha.cljc

@@ -60,13 +60,23 @@
              (ana/resolve-var env s)))
     (symbol (str ana/*cljs-ns*) (str s))))
 
+(defonce ^:private _speced_vars (atom #{}))
+
+(defn speced-vars []
+  @_speced_vars)
+
 (defmacro def
   "Given a namespace-qualified keyword or resolveable symbol k, and a
   spec, spec-name, predicate or regex-op makes an entry in the
   registry mapping k to the spec. Use nil to remove an entry in
   the registry for k."
   [k spec-form]
-  (let [k    (if (symbol? k) (ns-qualify &env k) k)
+  (let [k    (if (symbol? k)
+               (let [sym (ns-qualify &env k)]
+                 (swap! _speced_vars conj
+                   (vary-meta sym assoc :fdef-ns (-> &env :ns :name)))
+                 sym)
+               k)
         form (res &env spec-form)]
     (swap! registry-ref (fn [r]
                           (if (nil? form)
@@ -403,11 +413,6 @@
   (clojure.core/assert (not (empty? preds)))
   `(tuple-impl '~(mapv #(res &env %) preds) ~(vec preds)))
 
-(defonce ^:private _speced_vars (atom #{}))
-
-(defn speced-vars []
-  @_speced_vars)
-
 (defmacro fdef
   "Takes a symbol naming a function, and one or more of the following:
 
@@ -441,9 +446,6 @@
                  :sym symbol?)
     :ret symbol?)"
   [fn-sym & specs]
-  (swap! _speced_vars conj
-    (vary-meta (ns-qualify &env fn-sym)
-      assoc :fdef-ns (-> &env :ns :name)))
   `(cljs.spec.alpha/def ~fn-sym (fspec ~@specs)))
 
 (defmacro keys*

src/test/cljs/cljs/spec_test.cljs

@@ -455,6 +455,19 @@
   (is (thrown? js/Error (defk :foo 1)))
   (is (= [:foo "bar"] (defk :foo "bar"))))
 
+(s/def ::add-spec
+  (s/fspec :args (s/cat :n pos?)
+    :ret number?))
+
+(s/def add2 ::add-spec)
+(defn add2 [n]
+  (+ n 2))
+
+(st/instrument `add2)
+
+(deftest cljs-3137
+  (is (thrown? js/Error (add2 0))))
+
 (comment
 
   (run-tests)