From c36fece77670a711415ee162e8d025015df50d99 Mon Sep 17 00:00:00 2001
From: tristan <tristan@tristans.cloud>
Date: Sun, 31 Dec 2023 09:15:25 +0000
Subject: [PATCH] extract direct paths

---
 flake.nix               |   8 +++--
 nixite/site.nix         |  32 +++++++++++++++++++
 testing/site.test.nix   |  67 ++++++++++++++++++++++++++++++++++++++++
 testing/src/favicon.png | Bin 0 -> 1205 bytes
 4 files changed, 104 insertions(+), 3 deletions(-)
 create mode 100644 testing/src/favicon.png

diff --git a/flake.nix b/flake.nix
index 9f0e471..202cbc8 100644
--- a/flake.nix
+++ b/flake.nix
@@ -20,14 +20,16 @@
     style = nixite.style;
 
     packages.${system} = {
-      default = nixite.mkSite (nixite.site.applyStyle ./testing/src/style.css {
+      default = nixite.mkSite (
+        nixite.site.applyStyle ./testing/src/style.css 
+        (nixite.site.extractPaths {
         "index.html" = with nixite.elems; (doc [
           [
             (title "Nixite")
           ]
           (main [
-            (nixite.md.readMd ./testing/src/index.md)
             (link "/blog" "blog")
+            (nixite.html.tag "img" {src = ./testing/src/favicon.png;} "")
             (list [
               "item 1"
               "item 2"
@@ -48,7 +50,7 @@
             ])
           ]);
         };
-      });
+      }));
 
       serve = self.serve self.packages.${system}.default;
 
diff --git a/nixite/site.nix b/nixite/site.nix
index 3b21173..59f2fc0 100644
--- a/nixite/site.nix
+++ b/nixite/site.nix
@@ -14,6 +14,38 @@ in rec {
     )
     site);
 
+  extractPaths = content:
+    switchPaths content // {static = getPaths content;};
+
+  switchPaths = content: (
+    if builtins.isAttrs content
+    then
+      builtins.mapAttrs (key: value:
+        if builtins.isPath value
+        then ("/static/" + baseNameOf value)
+        else switchPaths value)
+      content
+    else if builtins.isList content
+    then (map switchPaths content)
+    else content
+  );
+
+  getPaths = content: (builtins.listToAttrs (getPathsKV content));
+
+  getPathsKV = path:
+      (if builtins.isPath path
+      then [
+        {
+          name = baseNameOf path;
+          value = path;
+        }
+      ]
+      else if builtins.isAttrs path
+      then builtins.concatLists (map getPathsKV ( builtins.attrValues path ))
+      else if builtins.isList path
+      then builtins.concatLists (map getPathsKV path)
+      else []);
+
   copyTo = prefix: site:
     builtins.toString (
       builtins.attrValues (
diff --git a/testing/site.test.nix b/testing/site.test.nix
index 1a905d3..f3b9fe4 100644
--- a/testing/site.test.nix
+++ b/testing/site.test.nix
@@ -37,4 +37,71 @@ in
           };
         };
     })
+    (it "extracts top level paths" {
+      actual = getPaths {
+        something = "";
+        src = ./src/index.md;
+      };
+      expected = {
+        "index.md" = ./src/index.md;
+      };
+    })
+    (it "extracts lower level paths" {
+      actual = getPaths {
+        something = "yes";
+        a-list = [
+          {thingy = ./src/index.md;}
+          [(html.tag "img" {src = ./src/favicon.png;} "")]
+        ];
+      };
+      expected = {
+        "index.md" = ./src/index.md;
+        "favicon.png" = ./src/favicon.png;
+      };
+    })
+    (it "switches paths" {
+      actual = switchPaths {
+        something = "";
+        a-thing = {
+          src = ./src/index.md;
+        };
+        a-list = [
+          {thingy = ./src/index.md;}
+        ];
+      };
+      expected = {
+        something = "";
+        a-thing = {
+          src = "/static/index.md";
+        };
+        a-list = [
+          {thingy = "/static/index.md";}
+        ];
+      };
+    })
+
+    (it "extracts paths" {
+      actual = extractPaths {
+        something = "";
+        a-thing = {
+          src = ./src/index.md;
+        };
+        a-list = [
+          {thingy = ./src/index.md;}
+        ];
+      };
+      expected = {
+        something = "";
+        a-thing = {
+          src = "/static/index.md";
+        };
+        a-list = [
+          {thingy = "/static/index.md";}
+        ];
+        static = {
+          "index.md" = ./src/index.md;
+        };
+      };
+    })
+
   ]
diff --git a/testing/src/favicon.png b/testing/src/favicon.png
new file mode 100644
index 0000000000000000000000000000000000000000..1ed2b5fe0fdf7a6144adc5cdfa31b5f553df4610
GIT binary patch
literal 1205
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbL!Lb6AYF9SoB8UsT^3j@P1pisjL
z28L1t28LG&3=CE?7#PG0=IjczVPIf#2=EDU1u6(CKb+Wiwr=O+;uW{c*4&A1Jrz{8
z)4ynQ?dJPcYwy%;xnI8WmUr$t-~6qfnQMIVwv;WuQL*Yq-L5CatL}tUABt^18CZ5O
zZ{c;IIY350$$p>|3flP?CbiEsc~jS!_w~D<f)wn0T(<*+fU-~p#e4k<cY0-S%A9!)
zB(?ofP#H)Hj)3O-gVgNs$=&Rmzp)hPjBO9=w>@-8-UT(J^iW{g;gG5$d2=oUQB>1m
z@0`tUsjG?>Uj}-le#`xk$|De!wc8%H9(?})|Nq7v4}s!!o9``u`G4xw?{%B*m9M-R
zQVF#5P*BAYs3W&O0$NnJ^+EmC2f#3iZ95)VdI0Dcpiyv-WY0P0p1#T_Z>w*?cE6%s
z0mXX*O7{cRz=NWC>%+j(ZC*JW9phIsFhqD|Z2-E>D|<5oL#Aiu_JGoT5S2AM9(m_%
z^2y&CR<plu)BT364|3<8i)h#r(|)KL=-J&*>-T^|Z`YHa^B;WkcK|~ywEAG>n%i}o
z?*m;33^cfn5C+gCK-VVsovq)Bq973HJg^IaA?BI2x8vB0x*d-|{@wK?2;{Xx@L&gd
z6Br#}DWLg41A!_7O7;R1&jO{3!1TqiyCldDl>V>-|M%V{f8t%=1*kvR${~LK!l5U+
zE;&bk_oXlWQ^n1wc;Wk}FW<i1zw^<YXR@}CmEH2Q;g;r+pC+dMh+<)9w0XObnR)KL
z`{$VF9oT*QslN7+7l#%vIr`$Lj_%{Tdk-yQQ8@eH?gD0}dGG9**jXcfq)+%1V__A3
zezm=|koGiQ(+~F^eEa_O^LHgip0dBo(|Uj9xM)8-c0qz;%R>#{_g-;-%DvtP?D4mF
z3v@eUlDE4HLkFv@2av;A;1O92%u<U$nDJ@>dl*pgo2QFoh{WaOgaa%+lY%b!7;P&0
z#MO01K~H({q)lC`X6<TQHqDG%SvkPLJ>38PfeR-pwsWptDH(9!&Y?@EZXLUJ?%u(R
zCvUb+Y&?7Q?A^ncPv1U%{k*+`LB~Wz3l$R`8>LBem9?zY%+A@&Q&cq6v{aosxqG&{
zZmqvtnwWE$-@AKzYU1qb8k-I+dNe7hZPTZ&Q>$J{IWD}l>sQ;cWoc{=r(N6jt?%5r
zck}M;`^PElD$%0uJI|=}))z_R^t1Df!;|M3G=KQRx`_L`Zq%NXmz(B1)oy8II+Uax
zzII#0=CZrLc%@q#nRs{}%{I%wxhr?~k-oXRTQ>fXWq5hY<KX;*4ex*<AX(xXQ4*Y=
qR#Ki=l*&+EUaps!mtCBkSdglhUz9%kosASw5re0zpUXO@geCy3nptoF

literal 0
HcmV?d00001