Build site using new API

This includes an extremely kludgy use of eval to get the page <style> tags working properly, but it demonstrates how simple and effective the new API can be.
fabricate-site · Jan 9, 2024 · af78a21 · af78a21
1 parent 22e83f0
commit af78a21
Show file tree

Hide file tree

Showing 19 changed files with 139 additions and 121 deletions.
diff --git a/dev/site/fabricate/dev/build.clj b/dev/site/fabricate/dev/build.clj
@@ -6,16 +6,20 @@
             [site.fabricate.prototype.read :as read]
             [site.fabricate.prototype.page :as page]
             [site.fabricate.prototype.html :as html]
+            [garden.core :as garden]
+            [garden.stylesheet :refer [at-import]]
             [babashka.fs :as fs]
             [hiccup.page]
+            [hiccup.core :as hiccup]
             [clojure.string :as str]
             [clojure.java.io :as io]))
 
 
 (defn create-dir-recursive
   [target-dir]
-  (->> (str/split (str (fs/relativize (fs/cwd) (fs/path (fs/cwd) target-dir)))
-                  (re-pattern fs/file-separator))
+  (->> (fs/path (fs/cwd) target-dir)
+       (fs/relativize (fs/cwd))
+       fs/components
        (reduce (fn [paths path] (conj paths (fs/path (peek paths) path))) [])
        (filter #(not (fs/exists? %)))
        (run! fs/create-dir)))
@@ -93,9 +97,11 @@
   [entry]
   (let [parsed-page (read/parse (slurp (:site.fabricate.source/location entry)))
         evaluated-page (read/eval-all parsed-page)
-        page-metadata (page/lift-metadata evaluated-page
-                                          (last (read/get-metadata
-                                                 parsed-page)))
+        page-metadata (update (page/lift-metadata evaluated-page
+                                                  (last (read/get-metadata
+                                                         parsed-page)))
+                              :page-style
+                              eval)
         hiccup-page [:html (page/doc-header page-metadata)
                      [:body
                       [:main
@@ -122,22 +128,34 @@
 ;; (defmethod assemble "index.html" [entry] (assemble-index entry))
 
 
-
 (defn write-hiccup-html!
   "Generate HTML from Hiccup data and write it to the given file."
   [hiccup-page-data output-file]
-  (spit output-file (hiccup.page/html5 hiccup-page-data)))
+  (let [parent-dir (fs/parent output-file)]
+    (create-dir? parent-dir)
+    (spit output-file (hiccup/html hiccup-page-data))))
+
+(defn subpath
+  ([dir p] (apply fs/path (drop 1 (fs/components (fs/relativize dir p)))))
+  ([p] (subpath (fs/cwd) p)))
+
+(comment
+  (fs/parent "docs/README.md")
+  (subpath "docs/path/to/some/file"))
 
 (defn output-path
   [input-file output-location]
-  (cond (fs/directory? output-location)
-        (fs/file (str output-location "/" (fs/file-name input-file)))
+  (cond (fs/directory? output-location) (fs/file (fs/path output-location
+                                                          (subpath input-file)))
         (instance? java.io.File output-location) output-location))
 
 (defmethod api/produce! [:hiccup :html]
   [entry]
   (let [output-file (fs/file (str (output-path
-                                   (:site.fabricate.source/location entry)
+                                   (fs/strip-ext
+                                    (fs/strip-ext
+                                     (:site.fabricate.source/location
+                                      entry)))
                                    (:site.fabricate.page/location entry))
                                   ".html"))]
     (write-hiccup-html! (:site.fabricate.document/data entry) output-file)
@@ -147,23 +165,23 @@
 
 (defmethod api/produce! [:markdown :markdown]
   [entry]
-  (let [output-file (fs/file (str (output-path
-                                   (:site.fabricate.source/location entry)
-                                   (:site.fabricate.page/location entry))
-                                  ".md"))]
+  (let [output-file (fs/file (output-path
+                              (:site.fabricate.source/location entry)
+                              (:site.fabricate.page/location entry)))]
     (spit output-file (:site.fabricate.document/data entry))
     (assoc entry :site.fabricate.page/output output-file)))
 
-(defn doc->page
-  [{:keys [site.fabricate.document/title site.fabricate.document/data
-           site.fabricate.document/id],
-    :as entry}]
-  (assoc entry
-         :site.fabricate.page/data data
-         :site.fabricate.page/title title
-         :site.fabricate.page/id id))
-
-
-
 (comment
-  (api/plan! setup-tasks options))
+  (require '[http.server :as server])
+  (defonce srv
+    (server/start {:cors-allow-headers nil,
+                   :dir (str (fs/path (fs/cwd) "docs")),
+                   :port 8002,
+                   :no-cache true}))
+  (let [entries (api/plan! setup-tasks options)
+        assembled-entries (api/combine []
+                                       {:site.fabricate.api/options options,
+                                        :site.fabricate.api/entries entries})]
+    (api/construct! [] assembled-entries))
+  (garden/css styles/docs)
+  (run! fs/delete (fs/glob "docs" "**.html")))
diff --git a/pages/background/finite-schema-machines.html.fab b/pages/background/finite-schema-machines.html.fab
@@ -1,11 +1,11 @@
 ✳(ns site.fabricate.docs.background.fsm
-                 (:require [site.fabricate.prototype.page :refer :all]
-                           [site.fabricate.prototype.read :as read]
-                           [site.fabricate.styles :as styles]
-                           [clojure.repl :as repl]
-                           [garden.core :as garden]
-                           [garden.stylesheet :refer [at-import]])) 🔚
-✳ (def metadata
+  (:require [site.fabricate.prototype.page :refer :all]
+            [site.fabricate.prototype.read :as read]
+            [site.fabricate.dev.styles :as styles]
+            [clojure.repl :as repl]
+            [garden.core :as garden]
+            [garden.stylesheet :refer [at-import]])) 🔚
+            ✳ (def metadata
 {:title "Organizing computation with Finite Schema Machines"
 :description "Using precise schemas to map from data states to functions in Clojure."
 :page-style

diff --git a/pages/design/queue.html.fab b/pages/design/queue.html.fab
@@ -4,7 +4,7 @@
    [site.fabricate.prototype.write :as write]  
    [garden.core  :as garden]
    [garden.stylesheet :as stylesheet]
-   [site.fabricate.styles :as styles]
+   [site.fabricate.dev.styles :as styles]
    [site.fabricate.prototype.page :as page])) 🔚
 
 ✳(def metadata {:title "Design Doc for Work Queue"
@@ -29,4 +29,4 @@ Wrapping a PersistentQueue in a atom may be the way to obtain a synchronization
 
 The page-rerendering loop could be implemented via ✳=[:code "future"]🔚. Since the contents of the page aren't actually needed by the main loop of Fabricate until they are to be written to output HTML, there could simply be a queue of Futures, executed in the background, then dereferenced sequentially when the program needs to write. This atomic operation could also ✳=[:code "swap!"]🔚 the finished page into an atom containing all the "current" pages.
 
-It isn't at all clear to me that it needs to be more complicated than this. ✳=[:code "core.async"]🔚 is probably overkill at this point.
+It isn't at all clear to me that it needs to be more complicated than this. ✳=[:code "core.async"]🔚 is probably overkill at this point.
diff --git a/pages/extended-forms.html.fab b/pages/extended-forms.html.fab
@@ -3,21 +3,22 @@
                            [garden.core :as garden]
 [garden.stylesheet :refer [at-import]]))🔚
 
-✳(def page-style
-  (garden/css
-   (list
-    (at-import "https://fonts.googleapis.com/css2?family=Zen+Kaku+Gothic+New:wght@300;400;500;700;900&display=swap")
-    [:body {:font-family "'Zen Kaku Gothic New', sans-serif"
-            :max-width "60ch"}]
-    [:h1 {:font-size "3rem"
-          :font-weight "900"
-          :max-width "90ch"}]
-    [:.cols-2 {:display "flex"}]
-    [:.col {:flex "50%"}]
-    )))🔚
+✳(def page-style nil)🔚
 
 ✳(def metadata {:title "Putting text into columns with extended forms"
-:page-style page-style})🔚
+               :page-style
+               (garden/css
+                (list
+                 (at-import "https://fonts.googleapis.com/css2?family=Zen+Kaku+Gothic+New:wght@300;400;500;700;900&display=swap")
+                 [:body {:font-family "'Zen Kaku Gothic New', sans-serif"
+                         :max-width "60ch"}]
+                 [:h1 {:font-size "3rem"
+                       :font-weight "900"
+                       :max-width "90ch"}]
+                 [:.cols-2 {:display "flex"}]
+                 [:.col {:flex "50%"}]
+                 ))
+               #_page-style})🔚
 
 ✳=[:h1 (:title metadata)]🔚
 

diff --git a/pages/fab.html.fab b/pages/fab.html.fab
@@ -5,30 +5,32 @@
 [site.fabricate.prototype.page :refer :all]
 [garden.stylesheet :as stylesheet])) 🔚
 
-✳ (def page-css
+✳ (def page-css nil) 🔚
+
+✳ (def metadata
+  {:title "Introduction"
+   :page-style
    (garden/css
-    (garden.stylesheet/at-import  "https://fonts.googleapis.com/css2?family=Inria+Sans:ital,wght@0,300;0,400;0,700;1,300;1,400;1,700&family=Inter:wght@900&display=swap")
-    [:body {:background-image "linear-gradient(34deg, #9CC0DA, #ECD8D8 45%)"
-            :font-family "'Inria Sans', sans-serif"
-            :font-size "22px"}]
-    [:header {:font-family "Inter"}
-     [:h1 {:font-size "8rem"
-           :color "#dc4032"
-           :line-height "7rem"}]]
-    [:.red {:color "#FF0000"}]
-    [:pre {:white-space "pre-wrap"
-           :font-size "0.95rem"}]
-    [:.scarlet  {:color "#a1010c"}]
-    [:.vermilion {:color "#dc4032"}]
-    [:.txt-1999 {:text-transform "uppercase"}]
-    [:code {:color "#333"}]
-    [:article {:color "#222"
-               :max-width "60rem"}]
-    [:p {:margin-bottom "2rem"}]
-    )) 🔚
-
-✳ (def metadata {:title "Introduction"
-                  :page-style page-css}) 🔚
+    (list
+     (garden.stylesheet/at-import  "https://fonts.googleapis.com/css2?family=Inria+Sans:ital,wght@0,300;0,400;0,700;1,300;1,400;1,700&family=Inter:wght@900&display=swap")
+     [:body {:background-image "linear-gradient(34deg, #9CC0DA, #ECD8D8 45%)"
+             :font-family "'Inria Sans', sans-serif"
+             :font-size "22px"}]
+     [:header {:font-family "Inter"}
+      [:h1 {:font-size "8rem"
+            :color "#dc4032"
+            :line-height "7rem"}]]
+     [:.red {:color "#FF0000"}]
+     [:pre {:white-space "pre-wrap"
+            :font-size "0.95rem"}]
+     [:.scarlet  {:color "#a1010c"}]
+     [:.vermilion {:color "#dc4032"}]
+     [:.txt-1999 {:text-transform "uppercase"}]
+     [:code {:color "#333"}]
+     [:article {:color "#222"
+                :max-width "60rem"}]
+     [:p {:margin-bottom "2rem"}]))
+   #_page-css}) 🔚
 
 
 ✳= [:header [:h1 "fab" [:br] "ri" [:br]  "cate"] ] 🔚

diff --git a/pages/finite-schema-machines.html.fab b/pages/finite-schema-machines.html.fab
@@ -2,7 +2,7 @@
                  (:require [site.fabricate.prototype.page :refer :all]
                            [site.fabricate.prototype.read :as read]
                            [site.fabricate.prototype.write :as write]
-                           [site.fabricate.styles :as styles]
+                           [site.fabricate.dev.styles :as styles]
                            [malli.core :as m]
                            [clojure.repl :as repl]
                            [garden.core :as garden]
@@ -12,9 +12,7 @@
 {:title "Organizing computation with Finite Schema Machines"
 :description "Using precise schemas to map from data states to functions in Clojure."
 :page-style
-   (garden/css
-    (concat
-     styles/docs)
+   (garden/css styles/docs
     )}) 🔚
 
 ✳= [:header [:h1 (:title metadata)]

diff --git a/pages/how-to-guides/emacs-setup.html.fab b/pages/how-to-guides/emacs-setup.html.fab
@@ -2,7 +2,7 @@
   (:require [site.fabricate.prototype.page :as page]
             [site.fabricate.prototype.read :as read]
             [garden.core :as garden]
-            [site.fabricate.styles :as styles])) 🔚
+            [site.fabricate.dev.styles :as styles])) 🔚
 
 ✳(def metadata {:title "Supporting Fabricate's templates in Emacs"
                :page-style (garden/css styles/docs)}) 🔚

diff --git a/pages/index.html.fab b/pages/index.html.fab
@@ -3,18 +3,17 @@
    [garden.core :as garden]
    [garden.selectors :refer [root]]
    [garden.stylesheet :as stylesheet]
-   [site.fabricate.styles :as styles]
+   [site.fabricate.dev.styles :as styles]
    [site.fabricate.prototype.check]
    [site.fabricate.prototype.read]
    [site.fabricate.prototype.schema]
    [site.fabricate.prototype.fsm]
    [site.fabricate.prototype.write]
    [site.fabricate.prototype.page])) 🔚
 
-✳ (def page-css (garden/css styles/docs)) 🔚
 
 ✳(def metadata {:title "Fabricate"
-                :page-style page-css} )🔚
+:page-style (garden/css styles/docs)} )🔚
 
 ✳= [:div [:h1 {:class "xl-text"} (:title metadata)] [:hr]
     [:h4 "Form by art and labor"]]🔚

diff --git a/pages/reference/fabricate-fsm.html.fab b/pages/reference/fabricate-fsm.html.fab
@@ -2,7 +2,7 @@
   (:require [site.fabricate.prototype.page :as page]
             [garden.core :as garden]
             [clojure.string :as str]
-            [site.fabricate.styles :as styles]
+            [site.fabricate.dev.styles :as styles]
             [site.fabricate.prototype.fsm :as fsm]
             [site.fabricate.prototype.schema :as schema]
             [site.fabricate.prototype.write :as write]

diff --git a/pages/reference/namespaces/site.fabricate.prototype.fsm.html.fab b/pages/reference/namespaces/site.fabricate.prototype.fsm.html.fab
@@ -4,7 +4,7 @@
             [site.fabricate.prototype.fsm :as fsm]
                [malli.core :as m]
                [garden.core :as garden]
-               [site.fabricate.styles :as styles]))🔚
+               [site.fabricate.dev.styles :as styles]))🔚
 
 ✳(def metadata {:title "site.fabricate.prototype.fsm Namespace"
                :page-style  (garden/css styles/docs)})🔚

diff --git a/pages/reference/namespaces/site.fabricate.prototype.html.html.fab b/pages/reference/namespaces/site.fabricate.prototype.html.html.fab
@@ -4,7 +4,7 @@
             [site.fabricate.prototype.page :as page]
                [malli.core :as m]
                [garden.core :as garden]
-               [site.fabricate.styles :as styles]))🔚
+               [site.fabricate.dev.styles :as styles]))🔚
 
 ✳(def metadata {:title "site.fabricate.prototype.html Namespace"
                :page-style  (garden/css styles/docs)})🔚

diff --git a/pages/reference/namespaces/site.fabricate.prototype.page.html.fab b/pages/reference/namespaces/site.fabricate.prototype.page.html.fab
@@ -3,7 +3,7 @@
             [site.fabricate.prototype.page :as page]
                [malli.core :as m]
                [garden.core :as garden]
-               [site.fabricate.styles :as styles]))🔚
+               [site.fabricate.dev.styles :as styles]))🔚
 
 ✳(def metadata {:title "site.fabricate.prototype.page Namespace"
                :page-style  (garden/css styles/docs)})🔚

diff --git a/pages/reference/namespaces/site.fabricate.prototype.read.grammar.html.fab b/pages/reference/namespaces/site.fabricate.prototype.read.grammar.html.fab
@@ -5,7 +5,7 @@
                [site.fabricate.prototype.page :as page]
                [malli.core :as m]
                [garden.core :as garden]
-               [site.fabricate.styles :as styles])) 🔚
+               [site.fabricate.dev.styles :as styles])) 🔚
 
 ✳(def metadata {:title "site.fabricate.prototype.read.grammar Namespace"
                :page-style  (garden/css styles/docs)}) 🔚

diff --git a/pages/reference/namespaces/site.fabricate.prototype.read.html.fab b/pages/reference/namespaces/site.fabricate.prototype.read.html.fab
@@ -3,7 +3,7 @@
                [site.fabricate.prototype.page :as page]
                [malli.core :as m]
                [garden.core :as garden]
-               [site.fabricate.styles :as styles]))🔚
+               [site.fabricate.dev.styles :as styles]))🔚
 
 ✳(def metadata {:title "site.fabricate.prototype.read Namespace"
                :page-style  (garden/css styles/docs)})🔚

diff --git a/pages/reference/namespaces/site.fabricate.prototype.schema.html.fab b/pages/reference/namespaces/site.fabricate.prototype.schema.html.fab
@@ -4,7 +4,7 @@
             [site.fabricate.prototype.schema :as schema]
                [malli.core :as m]
                [garden.core :as garden]
-               [site.fabricate.styles :as styles]))🔚
+               [site.fabricate.dev.styles :as styles]))🔚
 
 ✳(def metadata {:title "site.fabricate.prototype.schema Namespace"
                :page-style  (garden/css styles/docs)})🔚

diff --git a/pages/reference/namespaces/site.fabricate.prototype.write.html.fab b/pages/reference/namespaces/site.fabricate.prototype.write.html.fab
@@ -3,7 +3,7 @@
                [site.fabricate.prototype.page :as page]
                [malli.core :as m]
                [garden.core :as garden]
-               [site.fabricate.styles :as styles]))🔚
+               [site.fabricate.dev.styles :as styles]))🔚
 
 ✳(def metadata {:title "site.fabricate.prototype.write Namespace"
                :page-style  (garden/css styles/docs)})🔚

diff --git a/pages/reference/template-structure.html.fab b/pages/reference/template-structure.html.fab
@@ -6,7 +6,7 @@
    [site.fabricate.prototype.read.grammar :as grammar]
    [garden.core  :as garden]
    [garden.stylesheet :as stylesheet]
-   [site.fabricate.styles :as styles]
+   [site.fabricate.dev.styles :as styles]
    [site.fabricate.prototype.page :as page])) 🔚
 
 ✳(def metadata {:title "A Reference to Fabricate's Page Templates"

diff --git a/pages/tutorials/fabricate-for-docs.html.fab b/pages/tutorials/fabricate-for-docs.html.fab
@@ -2,7 +2,7 @@
 (:require
  [clojure.string :as str]
  [site.fabricate.prototype.read.grammar :as grammar]
- [site.fabricate.styles :as styles]
+ [site.fabricate.dev.styles :as styles]
  [garden.core :as garden]
  [garden.selectors :as select]
  [garden.stylesheet :as stylesheet]