CLJS-1668: Self-host: Macro checking support

Author: mfikes

src/main/cljs/cljs/spec.cljs

@@ -299,20 +299,18 @@
           (apply f args)))
       (gobj/extend f))))
 
-;(defn- macroexpand-check
-;  [v args]
-;  (let [specs (fn-specs v)]
-;    (when-let [arg-spec (:args specs)]
-;      (when (= ::invalid (conform arg-spec args))
-;        (let [ed (assoc (explain-data* arg-spec [:args]
-;                                       (if-let [name (spec-name arg-spec)] [name] []) [] args)
-;                   ::args args)]
-;          (throw (js/Error.
-;                   (str
-;                     "Call to " (->sym v) " did not conform to spec:\n"
-;                     (with-out-str (explain-out ed))))))))))
-
-
+(defn- macroexpand-check
+  [v args]
+  (let [specs (fn-specs v)]
+    (when-let [arg-spec (:args specs)]
+      (when (= ::invalid (conform arg-spec args))
+        (let [ed (assoc (explain-data* arg-spec [:args]
+                          (if-let [name (spec-name arg-spec)] [name] []) [] args)
+                   ::args args)]
+          (throw (js/Error.
+                   (str
+                     "Call to " (->sym v) " did not conform to spec:\n"
+                     (with-out-str (explain-out ed))))))))))
 
 (defn- no-fn-specs
   [v specs]

src/main/clojure/cljs/analyzer.cljc

@@ -2375,10 +2375,12 @@
         (if-not (nil? mac-var)
           (#?@(:clj [binding [*ns* (create-ns *cljs-ns*)]]
                :cljs [do])
-            (let [#?@(:clj [mchk (some-> (find-ns 'clojure.spec)
+            (let [mchk  #?(:clj  (some-> (find-ns 'clojure.spec)
                                    (ns-resolve 'macroexpand-check))
-                            _    (when mchk
-                                   (mchk mac-var (next form)))])
+                           :cljs (and ^::no-resolve cljs.spec
+                                      ^::no-resolve cljs.spec/macroexpand-check))
+                  _     (when mchk
+                          (mchk mac-var (next form)))
                   form' (try
                           (apply @mac-var form env (rest form))
                           #?(:clj (catch ArityException e