chore: selfci and jotup

Author: dpc

.config/selfci/ci.sh

@@ -0,0 +1,83 @@
+#!/usr/bin/env bash
+set -eou pipefail
+
+
+function job_lint() {
+  set -x
+
+  # Get zero-terminated list of non-symlink files (reusable)
+  git_ls_files="$(git ls-files -z | while IFS= read -r -d '' file; do
+    [ ! -L "$file" ] && printf '%s\0' "$file"
+  done)"
+
+  selfci step start "check leftover dbg!"
+  while IFS= read -r -d '' path; do
+    if grep -q 'dbg!(' "$path"; then
+      >&2 echo "$path contains dbg! macro"
+      selfci step fail
+    fi
+  done <<< "$git_ls_files"
+
+  selfci step start "nixfmt"
+  nix_files=()
+  while IFS= read -r -d '' path; do
+    [[ "$path" == *.nix ]] && nix_files+=("$path")
+  done <<< "$git_ls_files"
+  if [ ${#nix_files[@]} -gt 0 ]; then
+    if ! nixfmt -c "${nix_files[@]}"; then
+      selfci step fail
+    fi
+  fi
+
+  selfci step start "cargo fmt"
+  if ! cargo fmt --all --check ; then
+    selfci step fail
+  fi
+}
+
+# check the things involving cargo
+# We're using Nix + crane + flakebox,
+# this gives us caching between different
+# builds and decent isolation.
+function job_cargo() {
+    selfci step start "cargo.lock up to date"
+    if ! cargo update --workspace --locked -q; then
+      selfci step fail
+    fi
+
+    # there's not point continuing if we can't build
+    selfci step start "build"
+    nix build -L .#ci.workspace
+
+    selfci step start "clippy"
+    if ! nix build -L .#ci.clippy ; then
+      selfci step fail
+    fi
+
+    selfci step start "nextest"
+    if ! nix build -L .#ci.tests ; then
+      selfci step fail
+    fi
+}
+
+case "$SELFCI_JOB_NAME" in
+  main)
+    selfci job start "lint"
+    selfci job start "cargo"
+    ;;
+
+  cargo)
+    job_cargo
+    ;;
+
+  lint)
+    # use develop shell to ensure all the tools are provided at pinned versions
+    export -f job_lint
+    nix develop -c bash -c "job_lint"
+    ;;
+
+
+  *)
+    echo "Unknown job: $SELFCI_JOB_NAME"
+    exit 1
+esac

.config/selfci/ci.yaml

@@ -0,0 +1,7 @@
+job:
+  clone-mode: partial
+  command: ./.config/selfci/ci.sh
+
+mq:
+  base-branch: master
+  merge-style: rebase

Cargo.lock

@@ -66,7 +66,7 @@ iroh = { version = "0.95.1", default-features = false }
 iroh-base = { version = "0.95.1", default-features = false }
 iroh-io = "0.6.0"
 itertools = "0.13.0"
-jotdown = { version = "0.9.0", features = ["async"] }
+jotup = { version = "0.10.0", features = ["async"] }
 pkarr = "3.10.0"
 proptest = "1.6.0"
 maud = "*"
@@ -151,6 +151,3 @@ debug = false
 
 [patch.crates-io]
 redb-bincode = { git = "https://github.com/rustshop/redb-bincode", rev = "b33cedb787d452dc3735a153aca55086fea7c306" }
-jotdown = { git = "https://github.com/dpc/jotdown", rev = "6a4528812cd9a4621b56dab02b724f5d5a5371a1", features = [
-  "async",
-] }

Cargo.toml

@@ -20,7 +20,7 @@ bytes = { workspace = true }
 brotli = { workspace = true }
 futures = { workspace = true }
 futures-util = { workspace = true }
-jotdown = { workspace = true }
+jotup = { workspace = true }
 maud = { workspace = true }
 listenfd = { workspace = true }
 snafu = { workspace = true }

crates/rostra-web-ui/Cargo.toml

@@ -1,6 +1,6 @@
 mod error;
-mod layout;
 pub mod html_utils;
+mod layout;
 mod routes;
 // TODO: move to own crate
 mod serde_util;

crates/rostra-web-ui/src/lib.rs

@@ -1,8 +1,8 @@
 use std::borrow::Cow;
 use std::str::FromStr as _;
 
-use jotdown::r#async::{AsyncRender, AsyncRenderOutputExt};
-use jotdown::html::filters::AsyncSanitizeExt;
+use jotup::r#async::{AsyncRender, AsyncRenderOutputExt};
+use jotup::html::filters::AsyncSanitizeExt;
 use maud::{Markup, PreEscaped};
 use rostra_client::ClientRef;
 use rostra_core::ShortEventId;
@@ -55,7 +55,7 @@ impl UiState {
     ) -> Markup {
         // Compose the filters using extension traits: Renderer -> ProfileLinks ->
         // Images -> PrismCodeBlocks -> Sanitize
-        let renderer = jotdown::html::tokio::Renderer::default()
+        let renderer = jotup::html::tokio::Renderer::default()
             .rostra_profile_links(client.clone())
             .rostra_images(author_id)
             .prism_code_blocks()
@@ -73,7 +73,7 @@ impl UiState {
     /// transformations)
     pub(crate) async fn render_bio(&self, client: ClientRef<'_>, content: &str) -> Markup {
         // Only sanitize for bio - no profile links or image transforms
-        let renderer = jotdown::html::tokio::Renderer::default()
+        let renderer = jotup::html::tokio::Renderer::default()
             .rostra_profile_links(client)
             .sanitize();
 

crates/rostra-web-ui/src/routes/content.rs

@@ -1,7 +1,7 @@
 use std::borrow::Cow;
 
-use jotdown::r#async::{AsyncRender, AsyncRenderOutput};
-use jotdown::{AttributeKind, AttributeValue, Attributes, Container, Event};
+use jotup::r#async::{AsyncRender, AsyncRenderOutput};
+use jotup::{AttributeKind, AttributeValue, Attributes, Container, Event};
 use rostra_client::ClientRef;
 use rostra_core::id::RostraId;
 
@@ -42,7 +42,7 @@ where
 
     async fn emit(&mut self, event: Event<'s>) -> Result<(), Self::Error> {
         match event {
-            Event::Start(Container::Link(s, jotdown::LinkType::AutoLink), attr) => {
+            Event::Start(Container::Link(s, jotup::LinkType::AutoLink), attr) => {
                 if let Some(rostra_id) = UiState::extra_rostra_id_link(&s) {
                     let display_name = self
                         .client
@@ -56,7 +56,7 @@ where
                         .emit(Event::Start(
                             Container::Link(
                                 format!("/ui/profile/{rostra_id}").into(),
-                                jotdown::LinkType::Span(jotdown::SpanLinkType::Inline),
+                                jotup::LinkType::Span(jotup::SpanLinkType::Inline),
                             ),
                             attr,
                         ))
@@ -65,7 +65,7 @@ where
                     self.container_stack.push(ContainerKind::Other);
                     self.inner
                         .emit(Event::Start(
-                            Container::Link(s, jotdown::LinkType::AutoLink),
+                            Container::Link(s, jotup::LinkType::AutoLink),
                             attr,
                         ))
                         .await
@@ -132,7 +132,7 @@ enum ImageTransform<'s> {
     /// External embeddable media (YouTube, etc.) - stores the HTML and alt text
     EmbeddableMedia(String, String),
     /// Regular external image - stores the URL, link type, and alt text
-    ExternalImage(Cow<'s, str>, jotdown::SpanLinkType, String),
+    ExternalImage(Cow<'s, str>, jotup::SpanLinkType, String),
 }
 
 /// Filter that transforms images:
@@ -174,7 +174,7 @@ where
                         .emit(Event::Start(
                             Container::Image(
                                 format!("/ui/media/{}/{}", self.author_id, event_id).into(),
-                                jotdown::SpanLinkType::Inline,
+                                jotup::SpanLinkType::Inline,
                             ),
                             attr,
                         ))
@@ -198,7 +198,7 @@ where
                             Container::Div {
                                 class: "lazyload-wrapper".into(),
                             },
-                            jotdown::Attributes::try_from(
+                            jotup::Attributes::try_from(
                                 "{ onclick=\"this.classList.add('-expanded')\" }",
                             )
                             .expect("Can't fail"),

crates/rostra-web-ui/src/routes/content/filters.rs

@@ -57,11 +57,7 @@ pub async fn post_unfollow(
 
     // Return updated followee list
     let followees = client_ref.db().get_followees(user_id).await;
-    Ok(Maud(
-        state
-            .render_followee_list(&session, followees)
-            .await?,
-    ))
+    Ok(Maud(state.render_followee_list(&session, followees).await?))
 }
 
 impl UiState {

crates/rostra-web-ui/src/routes/settings.rs

@@ -90,6 +90,22 @@
                 );
               in
               rec {
+                workspaceDeps = craneLib.buildWorkspaceDepsOnly { };
+
+                workspace = craneLib.buildWorkspace {
+                  cargoArtifacts = workspaceDeps;
+                };
+
+                tests = craneLib.cargoNextest {
+                  cargoArtifacts = workspace;
+                };
+
+                clippy = craneLib.cargoClippy {
+                  # must be deps, otherwise it will not rebuild
+                  # anything and thus not detect anything
+                  cargoArtifacts = workspaceDeps;
+                };
+
                 rostraDeps = craneLib.buildDepsOnly { };
                 rostra = craneLib.buildPackage {
                   meta.mainProgram = "rostra";