fix test

Author: borkdude

src/nextjournal/clerk/analyzer.clj

@@ -100,8 +100,7 @@
 
 (defn analyze-form [form]
   (with-bindings {clojure.lang.Compiler/LOADER (clojure.lang.RT/makeClassLoader)}
-    (binding [ana/*deps* (or ana/*deps* (atom #{}))
-              ana/*global-env* (ana/global-env)]
+    (binding [ana/*deps* (or ana/*deps* (atom #{}))]
       (-> (analyze-form* (rewrite-defcached form))
           (ana/resolve-syms-pass)))))
 

src/nextjournal/clerk/analyzer/impl.clj

@@ -465,7 +465,8 @@
                (:macro (meta maybe-macro)))
         (do
           (swap! *deps* conj maybe-macro)
-          (analyze* env (macroexpand-hook maybe-macro form env (rest form))))
+          (let [expanded (macroexpand-hook maybe-macro form env (rest form))]
+            (analyze* env expanded)))
         {:op       :invoke
          :form     form
          :env      env

test/nextjournal/clerk/analyzer_test.clj

@@ -11,6 +11,7 @@
             [nextjournal.clerk.config :as config]
             [nextjournal.clerk.fixtures.dep-a]
             [nextjournal.clerk.fixtures.dep-b]
+            [nextjournal.clerk.fixtures.issue-660-repro]
             [nextjournal.clerk.parser :as parser]
             [weavejester.dependency :as dep])
   (:import (clojure.lang ExceptionInfo)))
@@ -182,7 +183,11 @@
              (dissoc (ana/analyze '(nextjournal.clerk/defcached answer (do (Thread/sleep 4200) (inc 41)))) :form)))))
 
   (testing "tools.analyzer AssertionError is rethrown as ExceptionInfo (#307)"
-    (is (thrown? ExceptionInfo (ana/analyze '(def foo [] :bar))))))
+    (is (thrown? ExceptionInfo (ana/analyze '(def foo [] :bar)))))
+
+  (testing "macro-expansion defining var occurs in deps"
+    (with-ns-binding 'nextjournal.clerk.fixtures.issue-660-repro
+      (= 2 (count (:deps (ana/analyze '(nextjournal.clerk.fixtures.macros/emit-nonsense))))))))
 
 (deftest symbol->jar
   (is (ana/symbol->jar 'io.methvin.watcher.PathUtils))
@@ -403,7 +408,6 @@ my-uuid")]
       (-> specter-repro-analysis
           (assoc :record-missing-hash-fn (fn [report-entry] (swap! !missing-hash-store conj report-entry)))
           ana/hash)
-      
       (def missing-hash-report (first (deref !missing-hash-store)))
 
       (is (= 'nextjournal.clerk.fixtures.issue-660-repro/nonsense