chore: format with treefmt

astro.config.mjs

@@ -1,25 +1,25 @@
-import { defineConfig } from 'astro/config';
+import { defineConfig } from "astro/config";
 
-import rehypeSanitize from 'rehype-sanitize';
-import rehypeStringify from 'rehype-stringify';
-import rehypeRaw from 'rehype-raw';
-import remarkParse from 'remark-parse';
-import remarkRehype from 'remark-rehype';
+import rehypeSanitize from "rehype-sanitize";
+import rehypeStringify from "rehype-stringify";
+import rehypeRaw from "rehype-raw";
+import remarkParse from "remark-parse";
+import remarkRehype from "remark-rehype";
 
 // https://astro.build/config
 export default defineConfig({
-    markdown: {
-        remarkRehype: {
-            allowDangerousHtml: true
-            // This is fine because we are using rehypeSanitize to sanitize XSS.
-            // See https://github.com/remarkjs/remark-rehype?tab=readme-ov-file#example-supporting-html-in-markdown-properly
-        },
-        remarkPlugins: [
-            remarkParse,
-            remarkRehype,
-            rehypeRaw,
-            rehypeSanitize,
-            rehypeStringify,
-        ]
-    }
+  markdown: {
+    remarkRehype: {
+      allowDangerousHtml: true,
+      // This is fine because we are using rehypeSanitize to sanitize XSS.
+      // See https://github.com/remarkjs/remark-rehype?tab=readme-ov-file#example-supporting-html-in-markdown-properly
+    },
+    remarkPlugins: [
+      remarkParse,
+      remarkRehype,
+      rehypeRaw,
+      rehypeSanitize,
+      rehypeStringify,
+    ],
+  },
 });

flake.lock

@@ -86,11 +86,28 @@
         "type": "github"
       }
     },
+    "nixpkgs_2": {
+      "locked": {
+        "lastModified": 1708475490,
+        "narHash": "sha256-g1v0TsWBQPX97ziznfJdWhgMyMGtoBFs102xSYO4syU=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "0e74ca98a74bc7270d28838369593635a5db3260",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
     "root": {
       "inputs": {
         "flake-utils": "flake-utils",
         "nixpkgs": "nixpkgs",
         "snowfall-lib": "snowfall-lib",
+        "treefmt-nix": "treefmt-nix",
         "wiki": "wiki"
       }
     },
@@ -146,6 +163,24 @@
         "type": "github"
       }
     },
+    "treefmt-nix": {
+      "inputs": {
+        "nixpkgs": "nixpkgs_2"
+      },
+      "locked": {
+        "lastModified": 1715940852,
+        "narHash": "sha256-wJqHMg/K6X3JGAE9YLM0LsuKrKb4XiBeVaoeMNlReZg=",
+        "owner": "numtide",
+        "repo": "treefmt-nix",
+        "rev": "2fba33a182602b9d49f0b2440513e5ee091d838b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "treefmt-nix",
+        "type": "github"
+      }
+    },
     "wiki": {
       "flake": false,
       "locked": {

flake.nix

@@ -12,6 +12,8 @@
     flake = false;
   };
 
+  inputs.treefmt-nix.url = "github:numtide/treefmt-nix";
+
   outputs =
     inputs:
     inputs.snowfall-lib.mkFlake {
@@ -26,6 +28,14 @@
         namespace = "auxolotl--docs-site";
       };
 
-      outputs-builder = channels: { formatter = channels.nixpkgs.nixfmt-rfc-style; };
+      outputs-builder =
+        channels:
+        let
+          treefmt = inputs.treefmt-nix.lib.evalModule channels.nixpkgs ./treefmt.nix;
+        in
+        {
+          formatter = treefmt.config.build.wrapper;
+          checks.formatting = treefmt.config.build.check inputs.self;
+        };
     };
 }

src/components/Renderer.astro

@@ -13,4 +13,4 @@ const { Content } = await post.render();
 
 <div class="contents">
     <Content />
-</div>
+</div>s

src/lib/pagePaths.ts

@@ -2,162 +2,181 @@ import type { CollectionEntry } from "astro:content";
 import { parse, join, sep } from "node:path";
 
 export interface PageLinkData {
-    id: string;
-    data: { title: string; };
+  id: string;
+  data: { title: string };
 }
 
 type AllPathInformation = Map<string, CollectionEntry<"wiki"> | null>;
 
 export interface Paths {
-    siblingPages: PageLinkData[];
-    siblingDirectories: PageLinkData[];
-    childPages: PageLinkData[];
-    childDirectories: PageLinkData[];
+  siblingPages: PageLinkData[];
+  siblingDirectories: PageLinkData[];
+  childPages: PageLinkData[];
+  childDirectories: PageLinkData[];
 
-    parentDirectory: PageLinkData | null;
-    currentPage: PageLinkData;
-};
-
-export function relativePagePaths(wikiEntries: PageLinkData[], currentPath: string): Paths {
-    let currentPage: PageLinkData | undefined;
-    let parentDirectory: PageLinkData | undefined | null;
-    const siblingPages: Map<string, PageLinkData> = new Map();
-    const childPages: Map<string, PageLinkData> = new Map();
-
-    const currentPathParsed = parse(currentPath);
-    const currentPathExtensionless = join(currentPathParsed.dir, currentPathParsed.name);
-
-    const childDirectoryPaths: Set<string> = new Set();
-    const siblingDirectoryPaths: Set<string> = new Set();
-
-    for (const entry of wikiEntries) {
-        const pagePathParsed = parse(entry.id);
-        const pagePathExtensionless = join(pagePathParsed.dir, pagePathParsed.name);
-
-        if (pagePathExtensionless === currentPathExtensionless) {
-            currentPage = entry
-            continue;
-        }
-
-        const isInCurrentDirectory = pagePathParsed.dir === currentPathParsed.dir;
-        if (isInCurrentDirectory) {
-            siblingPages.set(pagePathExtensionless, entry);
-            continue;
-        }
-
-        const isDirectChild = pagePathParsed.dir === currentPathExtensionless;
-        if (isDirectChild) {
-            childPages.set(pagePathExtensionless, entry);
-            continue;
-        }
-
-        const isIndirectChild = pagePathParsed.dir.startsWith(currentPathExtensionless + sep);
-        if (isIndirectChild) {
-            const nextPathSeparator = pagePathParsed.dir.indexOf(sep, currentPathExtensionless.length + 1);
-
-            if (nextPathSeparator === -1) {
-                childDirectoryPaths.add(pagePathParsed.dir);
-                continue;
-            }
-
-            childDirectoryPaths.add(pagePathParsed.dir.slice(0, nextPathSeparator));
-            continue;
-        }
-
-        const isIndirectInCurrentDirectory = currentPathParsed.dir === "" || pagePathParsed.dir.startsWith(currentPathParsed.dir + sep);
-        if (isIndirectInCurrentDirectory) {
-            const nextPathSeparator = pagePathParsed.dir.indexOf(sep, currentPathParsed.dir.length + 1);
-
-            if (nextPathSeparator === -1) {
-                siblingDirectoryPaths.add(pagePathParsed.dir);
-                continue;
-            }
-
-            siblingDirectoryPaths.add(pagePathParsed.dir.slice(0, nextPathSeparator));
-            continue;
-        }
-
-        const isParentDirectory = pagePathExtensionless === currentPathParsed.dir;
-        if (isParentDirectory) {
-            parentDirectory = entry;
-        }
-    }
-
-    const childDirectories: PageLinkData[] = [];
-    for (const childDirectoryPath of childDirectoryPaths.values()) {
-        const childDirectoryPage = childPages.get(childDirectoryPath);
-        if (childDirectoryPage) {
-            childDirectories.push(childDirectoryPage);
-            childPages.delete(childDirectoryPath);
-            continue;
-        }
-
-        const childDirectoryPathParsed = parse(childDirectoryPath);
-        childDirectories.push({
-            id: childDirectoryPath,
-            data: { title: childDirectoryPathParsed.name }
-        });
-    }
-
-    const siblingDirectories: PageLinkData[] = [];
-    for (const siblingDirectoryPath of siblingDirectoryPaths.values()) {
-        const siblingDirectoryPage = siblingPages.get(siblingDirectoryPath);
-        if (siblingDirectoryPage) {
-            siblingDirectories.push(siblingDirectoryPage);
-            siblingPages.delete(siblingDirectoryPath);
-            continue;
-        }
-
-        const siblingDirectoryPathParsed = parse(siblingDirectoryPath);
-        siblingDirectories.push({
-            id: siblingDirectoryPath,
-            data: { title: siblingDirectoryPathParsed.name }
-        });
-    }
-
-    if (currentPage === undefined) {
-        currentPage = {
-            id: currentPath,
-            data: { title: currentPathParsed.name }
-        };
-    }
-
-    if (parentDirectory === undefined) {
-        if (currentPathParsed.dir) {
-            const parentDirectoryPathParsed = parse(currentPathParsed.dir);
-            parentDirectory = {
-                id: currentPathParsed.dir,
-                data: { title: parentDirectoryPathParsed.name }
-            };
-        } else {
-            parentDirectory = null;
-        }
-    }
-
-    return {
-        siblingPages: Array.from(siblingPages.values()).sort(),
-        childPages: Array.from(childPages.values()).sort(),
-
-        siblingDirectories: siblingDirectories.sort(),
-        childDirectories: childDirectories.sort(),
-
-        currentPage,
-        parentDirectory,
-    }
+  parentDirectory: PageLinkData | null;
+  currentPage: PageLinkData;
 }
 
-export function allPageAndDirectoryPaths(wikiEntries: CollectionEntry<"wiki">[]): AllPathInformation {
-    const pathInformation: Map<string, CollectionEntry<"wiki"> | null> = new Map();
+export function relativePagePaths(
+  wikiEntries: PageLinkData[],
+  currentPath: string,
+): Paths {
+  let currentPage: PageLinkData | undefined;
+  let parentDirectory: PageLinkData | undefined | null;
+  const siblingPages: Map<string, PageLinkData> = new Map();
+  const childPages: Map<string, PageLinkData> = new Map();
 
-    for (const entry of wikiEntries) {
-        pathInformation.set(entry.id, entry);
+  const currentPathParsed = parse(currentPath);
+  const currentPathExtensionless = join(
+    currentPathParsed.dir,
+    currentPathParsed.name,
+  );
 
-        let parsedEntryPath = parse(entry.id);
-        while (parsedEntryPath.dir) {
-            pathInformation.set(parsedEntryPath.dir, null);
-            parsedEntryPath = parse(parsedEntryPath.dir);
-        }
+  const childDirectoryPaths: Set<string> = new Set();
+  const siblingDirectoryPaths: Set<string> = new Set();
+
+  for (const entry of wikiEntries) {
+    const pagePathParsed = parse(entry.id);
+    const pagePathExtensionless = join(pagePathParsed.dir, pagePathParsed.name);
+
+    if (pagePathExtensionless === currentPathExtensionless) {
+      currentPage = entry;
+      continue;
     }
 
-    return pathInformation;
+    const isInCurrentDirectory = pagePathParsed.dir === currentPathParsed.dir;
+    if (isInCurrentDirectory) {
+      siblingPages.set(pagePathExtensionless, entry);
+      continue;
+    }
+
+    const isDirectChild = pagePathParsed.dir === currentPathExtensionless;
+    if (isDirectChild) {
+      childPages.set(pagePathExtensionless, entry);
+      continue;
+    }
+
+    const isIndirectChild = pagePathParsed.dir.startsWith(
+      currentPathExtensionless + sep,
+    );
+    if (isIndirectChild) {
+      const nextPathSeparator = pagePathParsed.dir.indexOf(
+        sep,
+        currentPathExtensionless.length + 1,
+      );
+
+      if (nextPathSeparator === -1) {
+        childDirectoryPaths.add(pagePathParsed.dir);
+        continue;
+      }
+
+      childDirectoryPaths.add(pagePathParsed.dir.slice(0, nextPathSeparator));
+      continue;
+    }
+
+    const isIndirectInCurrentDirectory =
+      currentPathParsed.dir === "" ||
+      pagePathParsed.dir.startsWith(currentPathParsed.dir + sep);
+    if (isIndirectInCurrentDirectory) {
+      const nextPathSeparator = pagePathParsed.dir.indexOf(
+        sep,
+        currentPathParsed.dir.length + 1,
+      );
+
+      if (nextPathSeparator === -1) {
+        siblingDirectoryPaths.add(pagePathParsed.dir);
+        continue;
+      }
+
+      siblingDirectoryPaths.add(pagePathParsed.dir.slice(0, nextPathSeparator));
+      continue;
+    }
+
+    const isParentDirectory = pagePathExtensionless === currentPathParsed.dir;
+    if (isParentDirectory) {
+      parentDirectory = entry;
+    }
+  }
+
+  const childDirectories: PageLinkData[] = [];
+  for (const childDirectoryPath of childDirectoryPaths.values()) {
+    const childDirectoryPage = childPages.get(childDirectoryPath);
+    if (childDirectoryPage) {
+      childDirectories.push(childDirectoryPage);
+      childPages.delete(childDirectoryPath);
+      continue;
+    }
+
+    const childDirectoryPathParsed = parse(childDirectoryPath);
+    childDirectories.push({
+      id: childDirectoryPath,
+      data: { title: childDirectoryPathParsed.name },
+    });
+  }
+
+  const siblingDirectories: PageLinkData[] = [];
+  for (const siblingDirectoryPath of siblingDirectoryPaths.values()) {
+    const siblingDirectoryPage = siblingPages.get(siblingDirectoryPath);
+    if (siblingDirectoryPage) {
+      siblingDirectories.push(siblingDirectoryPage);
+      siblingPages.delete(siblingDirectoryPath);
+      continue;
+    }
+
+    const siblingDirectoryPathParsed = parse(siblingDirectoryPath);
+    siblingDirectories.push({
+      id: siblingDirectoryPath,
+      data: { title: siblingDirectoryPathParsed.name },
+    });
+  }
+
+  if (currentPage === undefined) {
+    currentPage = {
+      id: currentPath,
+      data: { title: currentPathParsed.name },
+    };
+  }
+
+  if (parentDirectory === undefined) {
+    if (currentPathParsed.dir) {
+      const parentDirectoryPathParsed = parse(currentPathParsed.dir);
+      parentDirectory = {
+        id: currentPathParsed.dir,
+        data: { title: parentDirectoryPathParsed.name },
+      };
+    } else {
+      parentDirectory = null;
+    }
+  }
+
+  return {
+    siblingPages: Array.from(siblingPages.values()).sort(),
+    childPages: Array.from(childPages.values()).sort(),
+
+    siblingDirectories: siblingDirectories.sort(),
+    childDirectories: childDirectories.sort(),
+
+    currentPage,
+    parentDirectory,
+  };
+}
+
+export function allPageAndDirectoryPaths(
+  wikiEntries: CollectionEntry<"wiki">[],
+): AllPathInformation {
+  const pathInformation: Map<string, CollectionEntry<"wiki"> | null> =
+    new Map();
+
+  for (const entry of wikiEntries) {
+    pathInformation.set(entry.id, entry);
+
+    let parsedEntryPath = parse(entry.id);
+    while (parsedEntryPath.dir) {
+      pathInformation.set(parsedEntryPath.dir, null);
+      parsedEntryPath = parse(parsedEntryPath.dir);
+    }
+  }
+
+  return pathInformation;
 }

src/style/content.css

@@ -1,15 +1,15 @@
 .contents table {
-    border: 1px solid black;
-    border-collapse: collapse;
+  border: 1px solid black;
+  border-collapse: collapse;
 }
 
 .contents td {
-    padding: 1em;
-    border: 1px solid black;
+  padding: 1em;
+  border: 1px solid black;
 }
 
 .contents {
-    overflow: scroll;
-    height: 100vh;
-    padding: 0em 2em;
+  overflow: scroll;
+  height: 100vh;
+  padding: 0em 2em;
 }

src/style/globals.css

@@ -1,7 +1,7 @@
 a:visited {
-    color: blue;
+  color: blue;
 }
 
 .contents {
-    width: 100%;
+  width: 100%;
 }

treefmt.nix

@@ -0,0 +1,28 @@
+# treefmt.nix
+{ pkgs, ... }:
+{
+  # Used to find the project root
+  projectRootFile = "flake.nix";
+
+  # go
+  programs.gofmt.enable = true;
+
+  # js/ts
+  programs.prettier.enable = true;
+
+  # markdown
+  programs.mdformat.enable = true;
+
+  # nix
+  programs.nixfmt-rfc-style.enable = true;
+  programs.statix.enable = true;
+
+  # python
+  programs.black.enable = true;
+
+  # rust
+  programs.rustfmt.enable = true;
+
+  # swift
+  programs.swift-format.enable = true;
+}