Merge next br changes in

.gitignore

@@ -22,3 +22,7 @@ resources/oz/public/js/cljs-runtime/
 node_modules
 resources/oz/public/js/devcards.js
 resources/oz/public/js/manifest.edn
+.clj-kondo
+.lh
+.lsp
+.portal

README.md

@@ -480,6 +480,9 @@ When you're done, one of the easiest ways to deploy is with the excellent `surge
 You can also use GitHub Pages or S3 or really whatever if you prefer.
 The great thing about static sites is that they are easy and cheap to deploy and scale, so you have plenty of options at your disposal.
 
+## Styling options
+
+[Styling options](doc/styling-options.md)
 
 ## Local CLJS development
 

deps.edn

@@ -1,16 +1,15 @@
-{:paths ["src/clj" "src/cljs" "resources"]
+{:paths ["src/clj" "src/cljs" "src/cljc" "resources"]
  :deps {org.clojure/clojure {:mvn/version "1.10.1"}
         org.clojure/clojurescript {:mvn/version "1.10.764"} ;; equivalent of :scope "provided"?
-        ;; this appears to be necessary for fiwheel to work for some applications
         org.clojure/tools.reader {:mvn/version "1.3.2"}
-        org.clojure/core.async {:mvn/version "0.4.490"}
+        org.clojure/core.async {:mvn/version "1.4.627"}
         cheshire/cheshire {:mvn/version "5.8.1"}
         clj-http/clj-http {:mvn/version "3.9.1"}
         com.taoensso/sente {:mvn/version "1.13.1"}
         com.taoensso/timbre {:mvn/version "4.10.0"}
         com.taoensso/encore {:mvn/version "2.120.0"}
         devcards/devcards {:mvn/version "0.2.6"}
-        reagent/reagent {:mvn/version "0.10.0"}
+        reagent/reagent {:mvn/version "1.1.0"}
         ;; consider using this for lazy loading clojupyter stuff
         ;com.clojure-goes-fast/lazy-require {:mvn/version "0.1.1"}
         aleph/aleph {:mvn/version "0.4.6"}
@@ -32,7 +31,17 @@
         respeced/respeced {:mvn/version "0.0.1"}
         org.clojure/test.check {:mvn/version "0.10.0"}
         hawk/hawk {:mvn/version "0.2.11"}
-        metasoarous/darkstar {:mvn/version "0.1.0"}}
+        com.nextjournal/beholder {:mvn/version "1.0.0"}
+        metasoarous/darkstar {:mvn/version "0.1.0"}
+        rewrite-clj/rewrite-clj {:mvn/version "1.0.644-alpha"}
+        org.clojure/tools.analyzer {:mvn/version "1.0.0"}
+        weavejester/dependency {:mvn/version "0.2.1"}
+        carocad/parcera {:mvn/version "0.11.6"}
+        org.antlr/antlr4-runtime {:mvn/version "4.7.1"}
+        io.replikativ/hasch {:mvn/version "0.3.7"}
+        org.clojure/tools.analyzer.jvm {:mvn/version "1.1.0"}
+        superstructor/re-highlight {:mvn/version "1.1.0"}}
+        ;viebel/klipse {:mvn/version "7.10.6"}}
         ;applied-science/darkstar {:git/url "https://github.com/applied-science/darkstar/"
                                   ;:sha "ef93147377d09a3894959c2c43faabf1a527a7d5"}}
         ;timofreiberg/bultitude {:mvn/version "0.3.0"}

dev/user.clj

@@ -96,6 +96,20 @@
   (oz/kill-watchers!)
   (oz/live-view! "resources/oz/examples/clj/clj_test.clj")
 
+
+  (oz/build! [{:from "notebook-demo.clj"
+               :to "notebook-demo.html"}]
+     :port 9988)
+               ;:template-fn (fn [& blocks] [:div {:style {:max-width 200
+                                                          ;:margin :auto
+                                                          ;:color :blue}}
+                                            ;[:h1 "hello stever"]
+                                            ;blocks])
+               ;:header-extras [[:style "h1 {color: \"red\";}"]]}])
+              ;{:from "src/clj/oz/next.clj"
+               ;:to "oz-next.clj"}])
+
+
   :end-examples)
 
 

doc/build.md

@@ -0,0 +1,111 @@
+# Build
+
+[`build!`](#static-site-generation): generate a static website from
+directories of markdown, hiccup &/or interactive Vega-Lite & Vega visualizations, while being able to see changes live (as with `live-view!`)
+
+## Static site generation
+
+If you've ever thought, "man, I wish there was a static site generation
+toolkit which had live code reloading of whatever page you're currently
+editing, and it would be great if it was in Clojure and let me embed data
+visualizations and math formulas via LaTeX in Markdown & Hiccup documents",
+boy, are you in for a treat!
+
+Oz now features exactly such features in the form of the `oz/build!`.
+A very simple site might be generated with:
+
+```clojure
+(build!
+  [{:from "examples/static-site/src/"
+    :to "examples/static-site/build/"}])
+```
+
+The input formats currently supported by `oz/build!` are
+
+* `md`: As described above, markdown with embedded Vega-Lite or Vega visualizations, Latex, and hiccup
+* `json`, `edn`: You can directly supply hiccup data for more control over layout and content
+* `clj`: Will `live-reload!` Clojure files (as described above), and render the last form evaluated as hiccup
+
+Oz should handle image and css files it comes across by simply copying them over.
+However, if you have any `json` or `edn` assets (datasets perhaps) which need to pass through unchanged,
+you can separate these into their own build specification, like so:
+
+```clojure
+(defn site-template
+  [spec]
+  [:div {:style {:max-width 900 :margin-left "auto" :margin-right "auto"}}
+   spec])
+
+(build!
+  [{:from "examples/static-site/src/site/"
+    :to "examples/static-site/build/"
+    :template-fn site-template}
+   ;; If you have static assets, like datasets or imagines which need to be simply copied over
+   {:from "examples/static-site/src/assets/"
+    :to "examples/static-site/build/"
+    :as-assets? true}])
+```
+
+This can be a good way to separate document code from other static assets.
+
+Specifying multiple builds like this can be used to do other things as well.
+For example, if you wanted to render a particular set of pages using a different
+template function (for example, so that your blog posts style differently than the main pages),
+you can do that easily
+
+```clojure
+(defn blog-template
+  [spec]
+  (site-template
+    (let [{:as spec-meta :keys [title published-at tags]} (meta spec)]
+      [:div
+       [:h1 {:style {:line-height 1.35}} title]
+       [:p "Published on: " published-at]
+       [:p "Tags: " (string/join ", " tags)]
+       spec])))
+
+(build!
+  [{:from "examples/static-site/src/site/"
+    :to "examples/static-site/build/"
+    :template-fn site-template}
+   {:from "examples/static-site/src/blog/"
+    :to "examples/static-site/build/blog/"
+    :template-fn blog-template}
+   ;; If you have static assets, like datasets or imagines which need to be simply copied over
+   {:from "examples/static-site/src/assets/"
+    :to "examples/static-site/build/"
+    :as-assets? true}])
+```
+
+Note that the `blog-template` above is using metadata about the spec to inform how it renders.
+This metadata can be written into Markdown files using a yaml markdown metadata header (see `/examples/static-site/src/`)
+
+```
+---
+title: Oz static websites rock
+tags: oz, dataviz
+---
+
+# Oz static websites!
+
+Some markdown content...
+```
+
+The title in particular here will wind it's way into the `Title` metadata tag of your output HTML
+document, and thus will be visible at the top of your browser window when you view the file.
+This is a pattern that Jekyll and some other blogging engines use, and `markdown-clj` now
+supports extracting this data.
+
+Again, as you edit and save these files, the outputs just automatically update for you, both as
+compiled HTML files, and in the live-view window which lets you see your changes as you make em.
+If you need to change a template, or some other detail of the specs, you can simply rerun `build!`
+with the modified arguments, and the most recently edited page will updated before your eyes.
+This provides for a lovely live-view editing experience from the comfort of your favorite editor.
+
+### Deploy
+
+When you're done, one of the easiest ways to deploy is with the excellent `surge.sh` toolkit,
+which makes static site deployment a breeze.
+You can also use GitHub Pages or S3 or really whatever if you prefer.
+The great thing about static sites is that they are easy and cheap to deploy and scale, so you
+have plenty of options at your disposal.

doc/styling-options.md

@@ -0,0 +1,62 @@
+# Styling options
+
+## html
+
+### from-format or mode
+
+Used interchangeably, where from-format takes precedent. Possible values are:
+
+:vega :vega-lite :markdown :md :pprint :print
+
+Passes along any options to html-head.
+
+## html-head
+
+### description
+
+Used as the meta "description" element. Otherwise set to "Oz document".
+
+### title
+
+Used as the "title" element. Otherwise set to "Oz document".
+
+### author
+
+Used as the meta "author" element. Otherwise empty.
+
+### keywords
+
+Used as the meta "keywords" element concatenated with ",". Should be a vector of strings.
+If (:tag (meta doc)) it is merged on top.
+Otherwise empty.
+
+### omit-shortcut-icon? and shortcut-icon-url
+
+If not true, a link shortcut-icon-url is used as the "link"
+(displays as a little icon in the browser title bar) element. If empty "http://ozviz.io/oz.svg"
+gets used.
+
+### omit-styles?
+
+If not true, "oz/public/css/style.css", "http://ozviz.io/fonts/lmroman12-regular.woff" and
+"https://fonts.googleapis.com/css?family=Open+Sans" are included.
+
+### omit-vega-libs?
+
+If not true, the cdn versions of vega, vega-lite, and vega-embed are included.
+
+### omit-highlightjs?
+
+If not true, "metasoarous/highlight.js" is included per cdn.
+
+### omit-mathjax?
+
+If not true, "mathjax" is included per cdn.
+
+### omit-charset?
+
+If not true, "UTF-8" is set to as the default
+
+### header-extras
+
+Is passed along without modification at the end of the header. Must be valid hiccup.