Compare commits
No commits in common. "md" and "master" have entirely different histories.
|
@ -34,7 +34,7 @@
|
|||
inherit (tix.packages.${system}) watch watchpipe results;
|
||||
|
||||
test = tix.run [
|
||||
./testing/md.test.nix
|
||||
# ./testing/md.test.nix
|
||||
./testing/html.test.nix
|
||||
./testing/elems.test.nix
|
||||
./testing/builder.test.nix
|
||||
|
|
|
@ -1,16 +1,19 @@
|
|||
rec {
|
||||
processMd = elems: md:
|
||||
let
|
||||
elems = import ./elems.nix;
|
||||
html = import ./html.nix;
|
||||
in rec {
|
||||
processMd = md:
|
||||
if builtins.isPath md
|
||||
then processStr elems (builtins.readFile md)
|
||||
else processStr elems md;
|
||||
then processStr (builtins.readFile md)
|
||||
else processStr md;
|
||||
|
||||
recReadMd = toPage: elems: root:
|
||||
recReadMd = root:
|
||||
assert builtins.isPath root;
|
||||
builtins.mapAttrs (path: type:
|
||||
if type == "directory"
|
||||
then recReadMd (root + (/. + path))
|
||||
else if type == "regular"
|
||||
then toPage (processMd elems (root + (/. + path)))
|
||||
then mdToPage (root + (/. + path))
|
||||
else throw "Cannot read ${path}, file type ${type}") (builtins.readDir root);
|
||||
|
||||
recFixAppendix = site:
|
||||
|
@ -25,13 +28,19 @@ rec {
|
|||
|
||||
fixAppendix = builtins.replaceStrings [".md"] [".html"];
|
||||
|
||||
readDir = toPage: elems: root: recFixAppendix (recReadMd toPage elems root);
|
||||
readDir = root: recFixAppendix (recReadMd root);
|
||||
|
||||
splitList = elems: block:
|
||||
map listItem elems (builtins.filter (s: builtins.isString s && s != "")
|
||||
mdToPage = md:
|
||||
html.document {
|
||||
head = [];
|
||||
body = elems.main (elems.article (processMd md));
|
||||
};
|
||||
|
||||
splitList = block:
|
||||
map listItem (builtins.filter (s: builtins.isString s && s != "")
|
||||
(builtins.split "\n" block));
|
||||
|
||||
listItem = elems: str: let
|
||||
listItem = str: let
|
||||
li = builtins.match "- (.*)" str;
|
||||
checkbox = builtins.match "- \\[(.)] (.*)" str;
|
||||
checked = builtins.elemAt checkbox 0;
|
||||
|
@ -49,48 +58,47 @@ rec {
|
|||
];
|
||||
|
||||
replace = regex: apply: block:
|
||||
if toString block == ""
|
||||
then ""
|
||||
else
|
||||
(let
|
||||
match = builtins.match regex block;
|
||||
before = builtins.elemAt match 0;
|
||||
matchCount = builtins.length match;
|
||||
after = builtins.elemAt match (matchCount - 1);
|
||||
assert builtins.isString block; (let
|
||||
m = builtins.match regex block;
|
||||
before = builtins.elemAt m 0;
|
||||
after = toString (builtins.elemAt m (matchCount - 1));
|
||||
matchCount = builtins.length m;
|
||||
in
|
||||
if match == null
|
||||
if m == null
|
||||
then block
|
||||
else
|
||||
(
|
||||
replace regex apply before
|
||||
if before == null
|
||||
then ""
|
||||
else replace regex apply before
|
||||
)
|
||||
+ (apply match)
|
||||
+ (apply m)
|
||||
+ after);
|
||||
|
||||
rule = matcher: apply: blocks:
|
||||
if builtins.isString blocks
|
||||
then replace matcher apply blocks
|
||||
else if builtins.isList blocks
|
||||
then map (replace matcher apply) blocks
|
||||
else throw "replace rule should be applied to string or list of strings";
|
||||
map (block:
|
||||
if builtins.isString block
|
||||
then replace matcher apply block
|
||||
else block)
|
||||
blocks;
|
||||
|
||||
applyRules = index: rules: input: let
|
||||
applyRules = i: rules: input: let
|
||||
group =
|
||||
if builtins.isString input
|
||||
then [input]
|
||||
else input;
|
||||
len = builtins.length rules;
|
||||
rule = builtins.elemAt rules index;
|
||||
next = index + 1;
|
||||
rule = builtins.elemAt rules i;
|
||||
next = i + 1;
|
||||
in
|
||||
assert index < len;
|
||||
assert i < len;
|
||||
if next < len
|
||||
then rule (applyRules next rules group)
|
||||
else rule group;
|
||||
|
||||
basicRule = matcher: elem: rule matcher (m: elem (builtins.elemAt m 1));
|
||||
|
||||
processStr = elems: applyRules 0 [
|
||||
processStr = applyRules 0 [
|
||||
(basicRule (wrap "\\^") elems.sup)
|
||||
(basicRule (wrap "~") elems.sub)
|
||||
(basicRule (wrap "\\*") elems.em)
|
||||
|
@ -103,8 +111,8 @@ rec {
|
|||
(rule (contains "\\[(.*)]\\((.*)\\)") (m: let
|
||||
href = builtins.elemAt m 2;
|
||||
text = builtins.elemAt m 1;
|
||||
in (elems.a {inherit href;} text)))
|
||||
(list elems)
|
||||
in (elems.a href text)))
|
||||
list
|
||||
(basicRule "(.*\n\n)?(.+)\n(.*)?" elems.p)
|
||||
(basicRule "(.*\n\n)?```(.*)```(.*)?" (elems.textarea {readonly = true;}))
|
||||
(basicRule (containsBreak "###### ([^\n]+)") (elems.h6))
|
||||
|
@ -113,25 +121,18 @@ rec {
|
|||
(basicRule (containsBreak "### ([^\n]+)") (elems.h3))
|
||||
(basicRule (containsBreak "## ([^\n]+)") (elems.h2))
|
||||
(basicRule (containsBreak "# ([^\n]+)") (elems.h1))
|
||||
(basicRule (containsBreak "<(${linkmatcher})>") (m: elems.a {href = m;} m))
|
||||
(basicRule (containsBreak "<(${linkmatcher})>") (m: elems.a m m))
|
||||
];
|
||||
|
||||
list = elems: let
|
||||
addCheckboxes = basicRule "()\\[(.)] (.*)" (check:
|
||||
list = rule "((.*)(\n([^-\n][^\n]+)?\n))?((- [^\n]+\n)+)(.*)" (
|
||||
l: (elems.ul (basicRule "(.*\n)?- ([^\n]+)\n(.*)" (m:
|
||||
elems.li (basicRule "()\\[(.)] (.*)" (check:
|
||||
elems.input {
|
||||
type = "checkbox";
|
||||
checked = check != " ";
|
||||
disabled = true;
|
||||
});
|
||||
|
||||
listitems =
|
||||
basicRule "(.*\n)?- ([^\n]+)\n(.*)" (contents:
|
||||
elems.li (addCheckboxes contents));
|
||||
in (rule "((.*)(\n([^-\n][^\n]+)?\n))?((- [^\n]+\n)+)(.*)" (
|
||||
match: let
|
||||
listString = builtins.elemAt match 4;
|
||||
in (elems.ul (listitems listString))
|
||||
));
|
||||
}) [m])) [(builtins.elemAt l 4)]))
|
||||
);
|
||||
|
||||
linkmatcher = "[-[:alnum:].%?&#=:/]+";
|
||||
contains = matcher: "(.*)?${matcher}(.*)";
|
||||
|
|
Loading…
Reference in a new issue