diff --git a/.gitignore b/.gitignore index de79c2e..44b5f6a 100644 --- a/.gitignore +++ b/.gitignore @@ -4,6 +4,7 @@ /dist /node_modules /plans +/alloy .direnv .env .devenv diff --git a/Cargo.lock b/Cargo.lock index 352f5b5..d6d2a4a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2143,9 +2143,9 @@ dependencies = [ [[package]] name = "ignore" -version = "0.4.24" +version = "0.4.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81776e6f9464432afcc28d03e52eb101c93b6f0566f52aef2427663e700f0403" +checksum = "d3d782a365a015e0f5c04902246139249abf769125006fbe7649e2ee88169b4a" dependencies = [ "crossbeam-deque", "globset", @@ -2783,7 +2783,7 @@ dependencies = [ [[package]] name = "markdown-weaver" version = "0.13.0" -source = "git+https://github.com/rsform/markdown-weaver#83441068a9494f569218c64026880199b41a6e06" +source = "git+https://github.com/rsform/markdown-weaver#46f3eee6c93118da84a5de3d25fef642735aedd2" dependencies = [ "bitflags 2.10.0", "getopts", @@ -2796,7 +2796,7 @@ dependencies = [ [[package]] name = "markdown-weaver-escape" version = "0.11.0" -source = "git+https://github.com/rsform/markdown-weaver#83441068a9494f569218c64026880199b41a6e06" +source = "git+https://github.com/rsform/markdown-weaver#46f3eee6c93118da84a5de3d25fef642735aedd2" [[package]] name = "markup5ever" @@ -5438,9 +5438,9 @@ checksum = "5c1cb5db39152898a79168971543b1cb5020dff7fe43c8dc468b0885f5e29df5" [[package]] name = "unicode-ident" -version = "1.0.20" +version = "1.0.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "462eeb75aeb73aea900253ce739c8e18a67423fadf006037cd3ff27e82748a06" +checksum = "9312f7c4f6ff9069b165498234ce8be658059c6728633667c526e27dc2cf1df5" [[package]] name = "unicode-linebreak" @@ -5450,18 +5450,18 @@ checksum = "3b09c83c3c29d37506a3e260c08c03743a6bb66a9cd432c6934ab501a190571f" [[package]] name = "unicode-normalization" -version = "0.1.24" +version = "0.1.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5033c97c4262335cded6d6fc3e5c18ab755e1a3dc96376350f3d8e9f009ad956" +checksum = "5fd4f6878c9cb28d874b009da9e8d183b5abc80117c40bbd187a1fde336be6e8" dependencies = [ "tinyvec", ] [[package]] name = "unicode-properties" -version = "0.1.3" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e70f2a8b45122e719eb623c01822704c4e0907e7e426a05927e1a1cfff5b75d0" +checksum = "7df058c713841ad818f1dc5d3fd88063241cc61f49f5fbea4b951e8cf5a8d71d" [[package]] name = "unicode-segmentation" diff --git a/alloy/css/base.css b/alloy/css/base.css index 6d4a267..cd4ccd7 100644 --- a/alloy/css/base.css +++ b/alloy/css/base.css @@ -1,7 +1,5 @@ /* CSS Reset */ -*, -*::before, -*::after { +*, *::before, *::after { box-sizing: border-box; margin: 0; padding: 0; @@ -14,9 +12,9 @@ --color-link: #286983; --color-link-hover: #56949f; - --font-body: IBM Plex, system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", sans-serif; - --font-heading: IBM Plex Sans, system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", sans-serif; - --font-mono: "IBM Plex Mono", "Berkeley Mono", "Cascadia Code", "Roboto Mono", Consolas, monospace; + --font-body: IBM Plex, system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI', sans-serif; + --font-heading: IBM Plex Sans, system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI', sans-serif; + --font-mono: 'IBM Plex Mono', 'Berkeley Mono', 'Cascadia Code', 'Roboto Mono', Consolas, monospace; --spacing-base: 16px; --spacing-line-height: 1.6; @@ -39,36 +37,19 @@ body { } /* Typography */ -h1, -h2, -h3, -h4, -h5, -h6 { +h1, h2, h3, h4, h5, h6 { font-family: var(--font-heading); margin-top: calc(1rem * var(--spacing-scale)); margin-bottom: 0.5rem; line-height: 1.2; } -h1 { - font-size: 2.5rem; -} -h2 { - font-size: 2rem; -} -h3 { - font-size: 1.5rem; -} -h4 { - font-size: 1.25rem; -} -h5 { - font-size: 1.125rem; -} -h6 { - font-size: 1rem; -} +h1 { font-size: 2.5rem; } +h2 { font-size: 2rem; } +h3 { font-size: 1.5rem; } +h4 { font-size: 1.25rem; } +h5 { font-size: 1.125rem; } +h6 { font-size: 1rem; } p { margin-bottom: 1rem; @@ -85,8 +66,7 @@ a:hover { } /* Lists */ -ul, -ol { +ul, ol { margin-left: 2rem; margin-bottom: 1rem; } @@ -98,7 +78,7 @@ li { /* Code */ code { font-family: var(--font-mono); - background-color: rgba(0, 0, 0, 0.03); + background-color: rgba(0, 0, 0, 0.05); padding: 0.125rem 0.25rem; border-radius: 3px; font-size: 0.9em; @@ -112,7 +92,7 @@ pre { pre code { display: block; padding: 1rem; - background-color: rgba(0, 0, 0, 0.02); + background-color: rgba(0, 0, 0, 0.03); border-radius: 5px; } @@ -142,8 +122,7 @@ table { margin-bottom: 1rem; } -th, -td { +th, td { border: 1px solid rgba(0, 0, 0, 0.1); padding: 0.5rem; text-align: left; diff --git a/alloy/entry/Features/Allocator.html b/alloy/entry/Features/Allocator.html index 86f3491..d904e95 100644 --- a/alloy/entry/Features/Allocator.html +++ b/alloy/entry/Features/Allocator.html @@ -4,8 +4,8 @@ Allocator - - + + diff --git a/alloy/entry/Features/Effects.html b/alloy/entry/Features/Effects.html index e98248c..7c9f46f 100644 --- a/alloy/entry/Features/Effects.html +++ b/alloy/entry/Features/Effects.html @@ -4,8 +4,8 @@ Effects - - + +

Overview

diff --git a/alloy/entry/Features/Traits.html b/alloy/entry/Features/Traits.html index 192a078..d16fb35 100644 --- a/alloy/entry/Features/Traits.html +++ b/alloy/entry/Features/Traits.html @@ -4,8 +4,8 @@ Traits - - + +

Trait System Guide

diff --git a/alloy/entry/Language Overview.html b/alloy/entry/Language Overview.html index 7669994..4857e47 100644 --- a/alloy/entry/Language Overview.html +++ b/alloy/entry/Language Overview.html @@ -4,8 +4,8 @@ Language Overview - - + +

.ac file extension

diff --git a/alloy/entry/README.md.html b/alloy/entry/README.md.html index 472eec4..0cac346 100644 --- a/alloy/entry/README.md.html +++ b/alloy/entry/README.md.html @@ -4,8 +4,8 @@ README.md - - + +

Logo.svg

@@ -42,15 +42,15 @@

Documentation

Status

Contributing

License

Alloy is licensed under the MPL-2.0.

-

License: MPL 2.0

+

License: MPL 2.0

diff --git a/alloy/entry/Syntax Guide.html b/alloy/entry/Syntax Guide.html index ab84b5b..1b1b0d3 100644 --- a/alloy/entry/Syntax Guide.html +++ b/alloy/entry/Syntax Guide.html @@ -4,8 +4,8 @@ Syntax Guide - - + +

Core Principles

diff --git a/alloy/entry/Untitled.html b/alloy/entry/Untitled.html index 40a7c96..b58b309 100644 --- a/alloy/entry/Untitled.html +++ b/alloy/entry/Untitled.html @@ -4,8 +4,8 @@ Untitled - - + + 

diff --git a/alloy/entry/todo!.html b/alloy/entry/todo!.html
index 71e68c7..ccb3daa 100644
--- a/alloy/entry/todo!.html
+++ b/alloy/entry/todo!.html
@@ -4,8 +4,8 @@
   
   
   todo!
-  
-  
+  
+  
 
 
 

diff --git a/crates/weaver-renderer/src/static_site.rs b/crates/weaver-renderer/src/static_site.rs
index e1f3720..df6cba4 100644
--- a/crates/weaver-renderer/src/static_site.rs
+++ b/crates/weaver-renderer/src/static_site.rs
@@ -171,7 +171,8 @@ where
                     .to_path_buf();
 
                 // Check if this is a markdown file
-                let is_markdown = file.extension()
+                let is_markdown = file
+                    .extension()
                     .and_then(|ext| ext.to_str())
                     .map(|ext| ext == "md" || ext == "markdown")
                     .unwrap_or(false);
@@ -198,7 +199,9 @@ where
                         tokio::fs::create_dir_all(parent).await.into_diagnostic()?;
                     }
 
-                    tokio::fs::copy(&file, &output_path).await.into_diagnostic()?;
+                    tokio::fs::copy(&file, &output_path)
+                        .await
+                        .into_diagnostic()?;
                     return Ok(());
                 }
 
@@ -501,216 +504,4 @@ impl<'input> markdown_weaver::BrokenLinkCallback<'input> for VaultBrokenLinkCall
 }
 
 #[cfg(test)]
-mod tests {
-    use crate::NotebookContext;
-
-    use super::*;
-    use std::path::PathBuf;
-    use weaver_common::jacquard::client::{
-        AtpSession, MemorySessionStore,
-        credential_session::{CredentialSession, SessionKey},
-    };
-
-    /// Type alias for the session used in tests
-    type TestSession = CredentialSession<
-        MemorySessionStore,
-        weaver_common::jacquard::identity::JacquardResolver,
-    >;
-
-    /// Helper: Create test context without network capabilities
-    fn test_context() -> StaticSiteContext {
-        let root = PathBuf::from("/tmp/test");
-        let destination = PathBuf::from("/tmp/output");
-        let mut ctx = StaticSiteContext::new(root, destination, None);
-        ctx.client = None; // Explicitly disable network
-        ctx
-    }
-
-    /// Helper: Render markdown to HTML using test context
-    async fn render_markdown(input: &str) -> String {
-        let context = test_context();
-        export_page(input, context).await.unwrap()
-    }
-
-    #[tokio::test]
-    async fn test_smoke() {
-        let output = render_markdown("Hello world").await;
-        assert!(output.contains("Hello world"));
-    }
-
-    #[tokio::test]
-    async fn test_paragraph_rendering() {
-        let input = "This is a paragraph.\n\nThis is another paragraph.";
-        let output = render_markdown(input).await;
-        insta::assert_snapshot!(output);
-    }
-
-    #[tokio::test]
-    async fn test_heading_rendering() {
-        let input = "# Heading 1\n\n## Heading 2\n\n### Heading 3";
-        let output = render_markdown(input).await;
-        insta::assert_snapshot!(output);
-    }
-
-    #[tokio::test]
-    async fn test_list_rendering() {
-        let input = "- Item 1\n- Item 2\n  - Nested\n\n1. Ordered 1\n2. Ordered 2";
-        let output = render_markdown(input).await;
-        insta::assert_snapshot!(output);
-    }
-
-    #[tokio::test]
-    async fn test_code_block_rendering() {
-        let input = "```rust\nfn main() {\n    println!(\"Hello\");\n}\n```";
-        let output = render_markdown(input).await;
-        insta::assert_snapshot!(output);
-    }
-
-    #[tokio::test]
-    async fn test_table_rendering() {
-        let input = "| Left | Center | Right |\n|:-----|:------:|------:|\n| A | B | C |";
-        let output = render_markdown(input).await;
-        insta::assert_snapshot!(output);
-    }
-
-    #[tokio::test]
-    async fn test_blockquote_rendering() {
-        let input = "> This is a quote\n>\n> With multiple lines";
-        let output = render_markdown(input).await;
-        insta::assert_snapshot!(output);
-    }
-
-    #[tokio::test]
-    async fn test_math_rendering() {
-        let input = "Inline $x^2$ and display:\n\n$$\ny = mx + b\n$$";
-        let output = render_markdown(input).await;
-        insta::assert_snapshot!(output);
-    }
-
-    #[tokio::test]
-    async fn test_wikilink_resolution() {
-        let vault_contents = vec![
-            PathBuf::from("notes/First Note.md"),
-            PathBuf::from("notes/Second Note.md"),
-        ];
-
-        let mut context = test_context();
-        context.dir_contents = Some(vault_contents.into());
-
-        let input = "[[First Note]] and [[Second Note]]";
-        let output = export_page(input, context).await.unwrap();
-        println!("{output}");
-        assert!(output.contains("./First%20Note"));
-        assert!(output.contains("./Second%20Note"));
-    }
-
-    #[tokio::test]
-    async fn test_broken_wikilink() {
-        let vault_contents = vec![PathBuf::from("notes/Exists.md")];
-
-        let mut context = test_context();
-        context.dir_contents = Some(vault_contents.into());
-
-        let input = "[[Does Not Exist]]";
-        let output = export_page(input, context).await.unwrap();
-
-        // Broken wikilinks become links (they just don't point anywhere valid)
-        // This is acceptable - static site will show 404 on click
-        assert!(output.contains("") || output.contains("Does%20Not%20Exist"));
-    }
-
-    #[tokio::test]
-    async fn test_wikilink_with_section() {
-        let vault_contents = vec![PathBuf::from("Note.md")];
-
-        let mut context = test_context();
-        context.dir_contents = Some(vault_contents.into());
-
-        let input = "[[Note#Section]]";
-        let output = export_page(input, context).await.unwrap();
-        println!("{output}");
-        assert!(output.contains("Note#Section"));
-    }
-
-    #[tokio::test]
-    async fn test_link_flattening_enabled() {
-        let mut context = test_context();
-        context.options = StaticSiteOptions::FLATTEN_STRUCTURE;
-
-        let input = "[Link](path/to/nested/file.md)";
-        let output = export_page(input, context).await.unwrap();
-        println!("{output}");
-        // Should flatten to single parent directory
-        assert!(output.contains("./entry/file.md"));
-    }
-
-    #[tokio::test]
-    async fn test_link_flattening_disabled() {
-        let mut context = test_context();
-        context.options = StaticSiteOptions::empty();
-
-        let input = "[Link](path/to/nested/file.md)";
-        let output = export_page(input, context).await.unwrap();
-        println!("{output}");
-        // Should preserve original path
-        assert!(output.contains("path/to/nested/file.md"));
-    }
-
-    #[tokio::test]
-    async fn test_frontmatter_parsing() {
-        let input = "---\ntitle: Test Page\nauthor: Test Author\n---\n\nContent here";
-        let context = test_context();
-        let output = export_page(input, context.clone()).await.unwrap();
-
-        // Frontmatter should be parsed but not rendered
-        assert!(!output.contains("title: Test Page"));
-        assert!(output.contains("Content here"));
-
-        // Verify frontmatter was captured
-        let frontmatter = context.frontmatter();
-        let yaml = frontmatter.contents();
-        let yaml_guard = yaml.read().unwrap();
-        assert!(yaml_guard.len() > 0);
-    }
-
-    #[tokio::test]
-    async fn test_empty_frontmatter() {
-        let input = "---\n---\n\nContent";
-        let output = render_markdown(input).await;
-
-        assert!(output.contains("Content"));
-        assert!(!output.contains("---"));
-    }
-
-    #[tokio::test]
-    async fn test_empty_input() {
-        let output = render_markdown("").await;
-        assert_eq!(output, "");
-    }
-
-    #[tokio::test]
-    async fn test_html_and_special_characters() {
-        // Test that markdown correctly handles HTML and special chars per CommonMark spec
-        let input = "Text with  & some text. Valid tags: emphasis and bold";
-        let output = render_markdown(input).await;
-
-        // & must be escaped for valid HTML
-        assert!(output.contains("&"));
-
-        // Inline HTML tags pass through (CommonMark behavior)
-        assert!(output.contains(""));
-        assert!(output.contains("emphasis"));
-        assert!(output.contains("bold"));
-    }
-
-    #[tokio::test]
-    async fn test_unicode_content() {
-        let input = "Unicode: 你好 🎉 café";
-        let output = render_markdown(input).await;
-
-        assert!(output.contains("你好"));
-        assert!(output.contains("🎉"));
-        assert!(output.contains("café"));
-    }
-}
+mod tests;
diff --git a/crates/weaver-renderer/src/static_site/context.rs b/crates/weaver-renderer/src/static_site/context.rs
index 776ebc4..88904fc 100644
--- a/crates/weaver-renderer/src/static_site/context.rs
+++ b/crates/weaver-renderer/src/static_site/context.rs
@@ -392,15 +392,20 @@ impl NotebookContext for StaticSiteContext {
                     if self.options.contains(StaticSiteOptions::FLATTEN_STRUCTURE) {
                         let (parent, filename) = crate::utils::flatten_dir_to_just_one_parent(&dest_url);
-                        let dest_url = if crate::utils::is_relative_link(&dest_url)
-                            && self.options.contains(StaticSiteOptions::CREATE_CHAPTERS_BY_DIRECTORY) {
-                            if !parent.is_empty() {
-                                CowStr::Boxed(format!("./{}/{}", parent, filename).into_boxed_str())
+                        let dest_url = if crate::utils::is_local_path(&dest_url) {
+                            let filename = PathBuf::from(filename).with_extension("html");
+                            if crate::utils::is_relative_link(&dest_url)
+                                && self.options.contains(StaticSiteOptions::CREATE_CHAPTERS_BY_DIRECTORY) {
+                                if !parent.is_empty() {
+                                    CowStr::Boxed(format!("./{}/{}", parent, filename.display()).into_boxed_str())
+                                } else {
+                                    CowStr::Boxed(format!("./{}", filename.display()).into_boxed_str())
+                                }
                             } else {
-                                CowStr::Boxed(format!("./{}", filename).into_boxed_str())
+                                CowStr::Boxed(format!("./entry/{}", filename.display()).into_boxed_str())
                             }
                         } else {
-                            CowStr::Boxed(format!("./entry/{}", filename).into_boxed_str())
+                            dest_url.clone()
                         };
                         Tag::Link {
                             link_type: *link_type,
@@ -409,8 +414,17 @@ impl NotebookContext for StaticSiteContext link,
diff --git a/crates/weaver-renderer/src/static_site/document.rs b/crates/weaver-renderer/src/static_site/document.rs
index 697fe61..d91fdc9 100644
--- a/crates/weaver-renderer/src/static_site/document.rs
+++ b/crates/weaver-renderer/src/static_site/document.rs
@@ -41,13 +41,13 @@ pub async fn write_document_head(
     // Calculate relative path to root based on output file depth
     let relative_to_root = if let Ok(rel) = output_path.strip_prefix(&context.destination) {
         let depth = rel.components().count() - 1; // -1 because the file itself doesn't count
-        if depth == 0 {
-            ".".to_string()
+        if depth <= 0 {
+            "./".to_string()
         } else {
             "../".repeat(depth)
         }
     } else {
-        ".".to_string()
+        "./".to_string()
     };
 
     writer
@@ -77,11 +77,23 @@ pub async fn write_document_head(
     match css_mode {
         CssMode::Linked => {
             writer
-                .write_all(format!("  \n", relative_to_root).as_bytes())
+                .write_all(
+                    format!(
+                        "  \n",
+                        relative_to_root
+                    )
+                    .as_bytes(),
+                )
                 .await
                 .into_diagnostic()?;
             writer
-                .write_all(format!("  \n", relative_to_root).as_bytes())
+                .write_all(
+                    format!(
+                        "  \n",
+                        relative_to_root
+                    )
+                    .as_bytes(),
+                )
                 .await
                 .into_diagnostic()?;
         }
diff --git a/crates/weaver-renderer/src/snapshots/weaver_renderer__static_site__tests__blockquote_rendering.snap b/crates/weaver-renderer/src/static_site/snapshots/weaver_renderer__static_site__tests__blockquote_rendering.snap
similarity index 65%
rename from crates/weaver-renderer/src/snapshots/weaver_renderer__static_site__tests__blockquote_rendering.snap
rename to crates/weaver-renderer/src/static_site/snapshots/weaver_renderer__static_site__tests__blockquote_rendering.snap
index 60a9271..58ce43b 100644
--- a/crates/weaver-renderer/src/snapshots/weaver_renderer__static_site__tests__blockquote_rendering.snap
+++ b/crates/weaver-renderer/src/static_site/snapshots/weaver_renderer__static_site__tests__blockquote_rendering.snap
@@ -1,5 +1,5 @@
 ---
-source: crates/weaver-renderer/src/static_site.rs
+source: crates/weaver-renderer/src/static_site/tests.rs
 expression: output
 ---
 

diff --git a/crates/weaver-renderer/src/snapshots/weaver_renderer__static_site__tests__code_block_rendering.snap b/crates/weaver-renderer/src/static_site/snapshots/weaver_renderer__static_site__tests__code_block_rendering.snap
similarity index 97%
rename from crates/weaver-renderer/src/snapshots/weaver_renderer__static_site__tests__code_block_rendering.snap
rename to crates/weaver-renderer/src/static_site/snapshots/weaver_renderer__static_site__tests__code_block_rendering.snap
index ceda8fc..fb6f83f 100644
--- a/crates/weaver-renderer/src/snapshots/weaver_renderer__static_site__tests__code_block_rendering.snap
+++ b/crates/weaver-renderer/src/static_site/snapshots/weaver_renderer__static_site__tests__code_block_rendering.snap
@@ -1,5 +1,5 @@
 ---
-source: crates/weaver-renderer/src/static_site.rs
+source: crates/weaver-renderer/src/static_site/tests.rs
 expression: output
 ---
 
fn main() {
diff --git a/crates/weaver-renderer/src/snapshots/weaver_renderer__static_site__tests__heading_rendering.snap b/crates/weaver-renderer/src/static_site/snapshots/weaver_renderer__static_site__tests__heading_rendering.snap
similarity index 60%
rename from crates/weaver-renderer/src/snapshots/weaver_renderer__static_site__tests__heading_rendering.snap
rename to crates/weaver-renderer/src/static_site/snapshots/weaver_renderer__static_site__tests__heading_rendering.snap
index 854e307..8fe1611 100644
--- a/crates/weaver-renderer/src/snapshots/weaver_renderer__static_site__tests__heading_rendering.snap
+++ b/crates/weaver-renderer/src/static_site/snapshots/weaver_renderer__static_site__tests__heading_rendering.snap
@@ -1,5 +1,5 @@
 ---
-source: crates/weaver-renderer/src/static_site.rs
+source: crates/weaver-renderer/src/static_site/tests.rs
 expression: output
 ---
 
Heading 1

diff --git a/crates/weaver-renderer/src/snapshots/weaver_renderer__static_site__tests__list_rendering.snap b/crates/weaver-renderer/src/static_site/snapshots/weaver_renderer__static_site__tests__list_rendering.snap
similarity index 72%
rename from crates/weaver-renderer/src/snapshots/weaver_renderer__static_site__tests__list_rendering.snap
rename to crates/weaver-renderer/src/static_site/snapshots/weaver_renderer__static_site__tests__list_rendering.snap
index b90b986..16a83b8 100644
--- a/crates/weaver-renderer/src/snapshots/weaver_renderer__static_site__tests__list_rendering.snap
+++ b/crates/weaver-renderer/src/static_site/snapshots/weaver_renderer__static_site__tests__list_rendering.snap
@@ -1,5 +1,5 @@
 ---
-source: crates/weaver-renderer/src/static_site.rs
+source: crates/weaver-renderer/src/static_site/tests.rs
 expression: output
 ---