CLJS-2022: cljs.spec -> cljs.spec.alpha fixes

Author: anmonteiro

src/main/cljs/cljs/repl.cljs

@@ -8,7 +8,7 @@
 
 (ns cljs.repl
   (:require-macros cljs.repl)
-  (:require [cljs.spec :as spec]))
+  (:require [cljs.spec.alpha :as spec]))
 
 (defn print-doc [{n :ns nm :name :as m}]
   (println "-------------------------")
@@ -29,7 +29,7 @@
   (if (:special-form m)
     (do
       (println "Special Form")
-      (println " " (:doc m)) 
+      (println " " (:doc m))
       (if (contains? m :url)
         (when (:url m)
           (println (str "\n  Please see http://clojure.org/" (:url m))))

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

@@ -104,7 +104,7 @@ invokes the fn you provide, enabling arbitrary stubbing and mocking.
 Returns a collection of syms naming the vars instrumented."
   ([]
    `(instrument '[~@(#?(:clj  s/speced-vars
-                        :cljs cljs.spec$macros/speced-vars))]))
+                        :cljs cljs.spec.alpha$macros/speced-vars))]))
   ([xs]
    `(instrument ~xs nil))
   ([sym-or-syms opts]

src/main/clojure/cljs/analyzer.cljc

@@ -2150,7 +2150,7 @@
           (when (some? alias)
             {rk (merge {alias lib} {lib lib}
                   (when js-module-provides {js-module-provides lib}))})
-          (when (some? referred-without-renamed) 
+          (when (some? referred-without-renamed)
             {uk (apply hash-map (interleave referred-without-renamed (repeat lib)))})
           (when (some? renamed)
             {renk (reduce (fn [m [original renamed]]
@@ -2950,9 +2950,9 @@
       mvar)))
 
 #?(:cljs
-   (let [cached-var (delay (get (ns-interns* 'cljs.spec) 'macroexpand-check))]
+   (let [cached-var (delay (get (ns-interns* 'cljs.spec.alpha) 'macroexpand-check))]
      (defn get-macroexpand-check-var []
-       (when (some? (find-ns-obj 'cljs.spec))
+       (when (some? (find-ns-obj 'cljs.spec.alpha))
          @cached-var))))
 
 (defn macroexpand-1*
@@ -2964,7 +2964,7 @@
         (if-some [mac-var (when (symbol? op) (get-expander op env))]
           (#?@(:clj [binding [*ns* (create-ns *cljs-ns*)]]
                :cljs [do])
-            (let [mchk  #?(:clj  (some-> (find-ns 'clojure.spec)
+            (let [mchk  #?(:clj  (some-> (find-ns 'clojure.spec.alpha)
                                    (ns-resolve 'macroexpand-check))
                            :cljs (get-macroexpand-check-var))
                   _     (when (some? mchk)