require-cljs misc. improvements (#680)

Author: borkdude

.github/workflows/main.yml

@@ -145,7 +145,7 @@ jobs:
       - name: 📓 Build Clerk Book
         run: |
           cp notebooks/editor.clj editor.clj
-          clojure -J-Dclojure.main.report=stderr -X:demo:nextjournal/clerk :git/sha '"${{ github.sha }}"' :git/url '"https://github.com/nextjournal/clerk"' :paths '["book.clj" "CHANGELOG.md" "editor.clj"]'
+          clojure -J-Dclojure.main.report=stderr -X:dev:demo:nextjournal/clerk :git/sha '"${{ github.sha }}"' :git/url '"https://github.com/nextjournal/clerk"' :paths '["book.clj" "CHANGELOG.md" "editor.clj"]'
 
       - name: 🏗 Build Clerk Static App with default Notebooks
         run: clojure -J-Dclojure.main.report=stderr -X:demo:nextjournal/clerk :package :single-file

notebooks/eval_cljs.clj

@@ -1,7 +1,6 @@
 ;; # 📑 Eval CLJS
 (ns eval-cljs
-  (:require [nextjournal.clerk :as clerk]
-            [viewers.viewer-with-cljs-source :as wcs]))
+  (:require [nextjournal.clerk :as clerk]))
 
 ;; > ⚠️ Please see [require_cljs.clj](/notebooks/require_cljs.clj) for a much easier way to do the same thing.
 

notebooks/render_fns.cljs

@@ -4,5 +4,3 @@
 
 (defn motion-div [props]
   [:> (.-div motion) props])
-
-(js/console.log :foo!!)

notebooks/require_cljs_test.clj

@@ -0,0 +1,11 @@
+(ns require-cljs-test
+  (:require [nextjournal.clerk :as clerk]
+            [viewers.viewer-with-cljs-source :as wcs]))
+
+;; This notebook tests that:
+;; - [x] You can load a viewer in a notebook that uses :require-cljs without using :require-cljs itself in the notebook
+;; - [x] The used viewer can have a transitive .cljs or .cljc dependency
+
+^{::clerk/no-cache true}
+(clerk/with-viewer wcs/my-cool-viewer
+  [1 2 3 4])

src/nextjournal/clerk/cljs_libs.clj

@@ -12,32 +12,32 @@
    [rewrite-clj.node :as rnode]
    [rewrite-clj.parser :as rparse]))
 
-(def ^:private already-loaded-sci-namespaces
-  '#{applied-science.js-interop
-     cljs.math
-     cljs.repl
-     clojure.core
-     clojure.edn
-     clojure.repl
-     clojure.set
-     clojure.string
-     clojure.template
-     clojure.walk
-     nextjournal.clerk
-     nextjournal.clerk.parser
-     nextjournal.clerk.render
-     nextjournal.clerk.render.code
-     nextjournal.clerk.render.editor
-     nextjournal.clerk.render.hooks
-     nextjournal.clerk.render.navbar
-     nextjournal.clerk.viewer
-     nextjournal.clojure-mode.commands
-     nextjournal.clojure-mode.extensions.eval-region
-     nextjournal.clojure-mode.keymap
-     reagent.core
-     reagent.debug
-     reagent.ratom
-     user})
+(def already-loaded-sci-namespaces
+  (atom '#{applied-science.js-interop
+          cljs.math
+          cljs.repl
+          clojure.core
+          clojure.edn
+          clojure.repl
+          clojure.set
+          clojure.string
+          clojure.template
+          clojure.walk
+          nextjournal.clerk
+          nextjournal.clerk.parser
+          nextjournal.clerk.render
+          nextjournal.clerk.render.code
+          nextjournal.clerk.render.editor
+          nextjournal.clerk.render.hooks
+          nextjournal.clerk.render.navbar
+          nextjournal.clerk.viewer
+          nextjournal.clojure-mode.commands
+          nextjournal.clojure-mode.extensions.eval-region
+          nextjournal.clojure-mode.keymap
+          reagent.core
+          reagent.debug
+          reagent.ratom
+          user}))
 
 (defn- ns-decl?
   "Returns true if form is a (ns ...) declaration."
@@ -72,24 +72,25 @@
         exts ["cljs" "cljc"]]
     (or (some #(io/resource (str prefix "." %))
               exts)
-        (binding [*out* *err*]
-          (println "[clerk] Could not find source for CLJS namespace:" ns)))))
+        (throw (ex-info (str "Could not find source for CLJS namespace: " ns)
+                        {:ns ns
+                         :already-loaded-sci-namespaces @already-loaded-sci-namespaces})))))
 
 (comment
   (ns->resource 'viewers.viewer-with-cljs-source)
   (ns->resource 'viewers.viewer-lib)
   )
 
-(defn require-cljs* [state & nss]
+(defn- require-cljs* [state & nss]
   (doseq [ns nss]
-    (when-not (or (contains? already-loaded-sci-namespaces ns)
+    (when-not (or (contains? @already-loaded-sci-namespaces ns)
                   (contains? (:loaded-libs @state) ns))
       (when-let [cljs-file (ns->resource ns)]
         (let [ns-decl (with-open [^java.io.Closeable rdr (e/reader (io/reader cljs-file))]
                         (read-ns-decl rdr))
               ns-decl (e/parse-ns-form ns-decl)
               nom (name-from-ns-decl ns-decl)
-              deps (remove already-loaded-sci-namespaces
+              deps (remove @already-loaded-sci-namespaces
                            (deps-from-ns-decl ns-decl))]
           (apply require-cljs* state deps)
           (swap! state (fn [state]
@@ -109,13 +110,13 @@
 
 ;;;; Selection of reader conditionals, borrowed from clj-kondo.impl.utils
 
-(defn first-non-whitespace [nodes]
+(defn- first-non-whitespace [nodes]
   (some #(when (and (not (rnode/whitespace-or-comment? %))
                     (not= :uneval (rnode/tag %)))
            %)
         nodes))
 
-(defn process-reader-conditional [node langs splice?]
+(defn- process-reader-conditional [node langs]
   (if (and node
            (= :reader-macro (rnode/tag node))
            (let [sv (-> node :children first :string-value)]
@@ -136,12 +137,12 @@
 
 (declare select-langs)
 
-(defn select-lang-children [node langs]
+(defn- select-lang-children [node langs]
   (if-let [children (:children node)]
     (let [new-children (reduce
                         (fn [acc node]
                           (let [splice? (= "?@" (some-> node :children first :string-value))]
-                            (if-let [processed (select-langs node langs splice?)]
+                            (if-let [processed (select-langs node langs)]
                               (if splice?
                                 (into acc (:children processed))
                                 (conj acc processed))
@@ -152,15 +153,14 @@
              new-children))
     node))
 
-(defn select-langs
-  ([node langs] (select-langs node langs nil))
-  ([node langs splice?]
-   (when-let [processed (process-reader-conditional node langs splice?)]
+(defn- select-langs
+  ([node langs]
+   (when-let [processed (process-reader-conditional node langs)]
      (select-lang-children processed langs))))
 
 ;;;; End selection of reader conditionals
 
-(defn slurp-resource [resource]
+(defn- slurp-resource [resource]
   (if (str/ends-with? (str resource) ".cljc")
     (-> (slurp resource)
         (rparse/parse-string-all)