Fix :clojure.core/eval-file metadata when calling show! with ns arg (#684)

Closes #681.

Author: mk

src/nextjournal/clerk/analyzer.clj

@@ -360,6 +360,17 @@
           state
           (info-store-keys info)))
 
+(defn extract-file
+  "Extracts the string file path from the given `resource` to for usage
+  on the `:clojure.core/eval-file` form meta key."
+  [^java.net.URL resource]
+  (case (.getProtocol resource)
+    "file" (str (.getFile resource))
+    "jar" (str (.getJarEntry ^java.net.JarURLConnection (.openConnection resource)))))
+
+#_(extract-file (io/resource "clojure/core.clj"))
+#_(extract-file (io/resource "nextjournal/clerk.clj"))
+
 (defn analyze-doc
   "Goes through `:blocks` of `doc`, reads and analyzes block forms, populates `:->analysis-info`"
   ([doc]
@@ -380,10 +391,12 @@
                                  form+loc (cond-> form
                                             (instance? clojure.lang.IObj form)
                                             (vary-meta merge (cond-> loc
-                                                               (:file doc) (assoc :clojure.core/eval-file (str (:file doc))))))
+                                                               (:file doc) (assoc :clojure.core/eval-file
+                                                                                  (str (cond-> (:file doc)
+                                                                                         (instance? java.net.URL (:file doc)) extract-file))))))
                                  {:as analyzed :keys [ns-effect?]} (cond-> (analyze form+loc)
                                                                      (:file doc) (assoc :file (:file doc)))
-                                 _ (when ns-effect?         ;; needs to run before setting doc `:ns` via `*ns*`
+                                 _ (when ns-effect? ;; needs to run before setting doc `:ns` via `*ns*`
                                      (eval form))
                                  block-id (get-block-id !id->count (merge analyzed block))
                                  analyzed (assoc analyzed :id block-id)]
@@ -394,10 +407,10 @@
                                  (update :blocks conj (-> block
                                                           (merge (dissoc analyzed :deps :no-cache? :ns-effect?))
                                                           (cond->
-                                                            (parser/ns? form) (assoc :ns? true)
-                                                            doc? (assoc :text-without-meta (parser/text-with-clerk-metadata-removed text (ns-resolver notebook-ns))))))
+                                                              (parser/ns? form) (assoc :ns? true)
+                                                              doc? (assoc :text-without-meta (parser/text-with-clerk-metadata-removed text (ns-resolver notebook-ns))))))
                                  (cond->
-                                   (and doc? (not (contains? state :ns)))
+                                     (and doc? (not (contains? state :ns)))
                                    (merge (parser/->doc-settings form) {:ns *ns*}))))))
 
                        (-> state

test/nextjournal/clerk/eval_test.clj

@@ -1,5 +1,6 @@
 (ns nextjournal.clerk.eval-test
-  (:require [clojure.java.io :as io]
+  (:require [babashka.fs :as fs]
+            [clojure.java.io :as io]
             [clojure.string :as str]
             [clojure.test :refer [deftest is testing]]
             [matcher-combinators.test :refer [match?]]
@@ -267,3 +268,11 @@
              (catch Exception _ nil))
         (clerk/show! (java.io.StringReader. code))
         (is (= result-first-run (get-result)))))))
+
+(deftest file-var-metadata-test
+  (testing "show with file string arg"
+    (clerk/show! "test/nextjournal/clerk/fixtures/hello.clj")
+    (is (fs/exists? (:file (meta (resolve 'nextjournal.clerk.fixtures.hello/answer))))))
+  (testing "show with ns arg"
+    (clerk/show! 'nextjournal.clerk.fixtures.hello)
+    (is (fs/exists? (:file (meta (resolve 'nextjournal.clerk.fixtures.hello/answer)))))))

test/nextjournal/clerk/fixtures/hello.clj

@@ -0,0 +1,4 @@
+(ns nextjournal.clerk.fixtures.hello
+  {:nextjournal.clerk/no-cache true})
+
+(def answer 42)