diff --git a/.gitignore b/.gitignore index e60d658..2a3b2f5 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,5 @@ target # Contains mutation testing data **/mutants.out*/ +# Manual testing dir +articles/* diff --git a/src/lib.rs b/src/lib.rs index 0e3ee68..459d1ed 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -1,3 +1,172 @@ -pub fn test() { - println!("Hello from live lib"); +use std::fs; +use std::path::PathBuf; + +use typst::ecow::EcoString; +use typst_as_lib::{typst_kit_options::TypstKitFontOptions, TypstEngine}; +use typst_html::{HtmlAttr, HtmlDocument, HtmlElement, HtmlNode}; + + +pub fn compile_article( + article_dir: PathBuf, + prepend: Option, +) -> Result<(), Box> { + + let template_file = article_dir.join("article.typ"); + let output = article_dir.join("article.html"); + let outline_file = article_dir.join("outline.html"); + + let prepend_content = if let Some(prepend_file) = prepend { + fs::read_to_string(&prepend_file).map_err(|e| { + format!( + "could not read prepend file {}: {e}", + prepend_file.display() + ) + })? + } else { + fs::read_to_string(article_dir.join("prepend.typ")).unwrap_or_default() + }; + + let mut template: EcoString = EcoString::new(); + template.push_str(&prepend_content); + template.push_str( + &fs::read_to_string(&template_file).map_err(|e| { + format!( + "could not read template {}: {e}", + template_file.display() + ) + })?, + ); + + let engine = TypstEngine::builder() + .main_file(template.to_string()) + .search_fonts_with( + TypstKitFontOptions::default() + .include_system_fonts(false) + .include_embedded_fonts(true), + ) + .with_file_system_resolver(article_dir) + .build(); + + let mut doc: HtmlDocument = engine + .compile() + .output + .map_err(|e| format!("typst compile failed: {e}"))?; + + let mut outline = EcoString::new(); + let mut curr_level = 1; + parse_outline(&mut doc.root, &mut outline, &mut curr_level); + for i in (1..curr_level).rev() { + outline.push_str(" ".repeat(i as usize - 1).as_str()); + outline.push_str("\n"); + } + fs::write(&outline_file, outline.as_bytes()).map_err(|e| { + format!( + "could not write outline {}: {e}", + outline_file.display() + ) + })?; + + let mut body: Option = None; + for child in &doc.root.children { + match child { + HtmlNode::Element(e) if e.tag.to_string().as_str() == "" => { + body = Some(e.clone()); + } + _ => {} + } + } + let body = body.ok_or("compiled HTML has no element")?; + doc.root = body; + + let mut html: String = typst_html::html(&doc).map_err(|e| format!("html generation failed: {e:?}"))?; + let lines = html + .lines() + .map(|line| { + if line.len() >= 2 { + &line[2..] + } else { + "" + } + }) + .collect::>(); + + if lines.len() > 2 { + html = lines[2..lines.len() - 1].to_vec().join("\n"); + } else { + html = String::new(); + } + + fs::write(&output, html).map_err(|e| { + format!( + "could not write output {}: {e}", + output.display() + ) + })?; + + Ok(()) +} + +fn parse_outline(elem: &mut HtmlElement, outline: &mut EcoString, curr_level: &mut u32) { + if matches!( + elem.tag.to_string().as_str(), + "

" | "

" | "

" | "

" | "
" + ) { + let mut header_text = EcoString::new(); + + for child in &elem.children { + match child { + HtmlNode::Text(string, _) => { + header_text.push_str(string); + } + _ => {} + } + } + + let slug = header_text + .as_str() + .to_lowercase() + .chars() + .filter_map(|c| match c { + c if c.is_ascii_alphanumeric() => Some(c), + ' ' => Some('-'), + '\'' => None, + _ => None, + }) + .collect::() + .trim_matches('-') + .replace("--", "-"); + + let level: u32 = elem.tag.to_string().chars().nth(2).unwrap() as u32 - '0' as u32; + + while level > *curr_level { + *curr_level += 1; + outline.push_str(" ".repeat(*curr_level as usize - 2).as_str()); + outline.push_str("
    \n"); + } + while level < *curr_level { + outline.push_str(" ".repeat(*curr_level as usize - 2).as_str()); + outline.push_str("
\n"); + *curr_level -= 1; + } + *curr_level = level; + + outline.push_str(" ".repeat(*curr_level as usize - 1).as_str()); + outline.push_str( + format!( + "
  • {}
    • \n", + slug, header_text + ) + .as_str(), + ); + + elem.attrs.push(HtmlAttr::intern("id").unwrap(), slug); + return; + } + + for child in elem.children.make_mut().iter_mut() { + match child { + HtmlNode::Element(e) => parse_outline(e, outline, curr_level), + _ => {} + } + } } diff --git a/src/main.rs b/src/main.rs index 722bef4..db73559 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,10 +1,8 @@ -use typst_as_lib::{typst_kit_options::TypstKitFontOptions, TypstEngine}; -use typst::{ecow::EcoString}; -use typst_html::{HtmlAttr, HtmlDocument, HtmlElement, HtmlNode}; -use std::fs; use std::env; use std::path::PathBuf; + use clap::Parser; +use typssg::compile_article; #[derive(Parser)] struct Args { @@ -23,139 +21,8 @@ fn main() { let args = Args::parse(); - let article_dir = args.dir; - - let template_file = article_dir.join("article.typ"); - let output = article_dir.join("article.html"); - let outline_file = article_dir.join("outline.html"); - - let prepend_content = if let Some(prepend_file) = args.prepend { - fs::read_to_string(&prepend_file).unwrap_or_else(|_| { - panic!("Could not find prepend file {}.", prepend_file.to_str().unwrap()); - }) - } else { - fs::read_to_string(article_dir.join("prepend.typ")).unwrap_or_default() - }; - - let mut template: EcoString = EcoString::new(); - template.push_str(&prepend_content); - template.push_str(fs::read_to_string(&template_file).unwrap_or_else(|_| { - panic!("Could not find file {}.", &template_file.to_str().unwrap()); - }).as_str()); - - let template = TypstEngine::builder() - .main_file(template.to_string()) - .search_fonts_with( - TypstKitFontOptions::default() - .include_system_fonts(false) - .include_embedded_fonts(true), - ) - .with_file_system_resolver(article_dir) - .build(); - - let mut doc: HtmlDocument = template - .compile() - .output - .expect("typst::compile() returned an error!"); - - let mut outline = EcoString::new(); - - let mut curr_level = 1; - parse(&mut doc.root, &mut outline, &mut curr_level); - for i in (1..curr_level).rev() { - outline.push_str(" ".repeat(i as usize - 1).as_str()); - outline.push_str("\n"); - } - fs::write(outline_file, outline.as_bytes()).unwrap(); - - let mut body: Option = None; - for child in &doc.root.children { - match child { - HtmlNode::Element(e) if e.tag.to_string().as_str() == "" => { - body = Some(e.clone()); - } - _ => {} - } - } - doc.root = body.unwrap(); - - let mut html: String = typst_html::html(&doc) - .expect("Could not generate html."); - let lines = html - .lines() - .map(|line| { - if line.len() >= 2 { - &line[2..] - } else { - "" // if line has fewer than 2 chars, drop it - } - }) - .collect::>(); - - if lines.len() > 2 { - // Get just the inside of the tag - html = lines[2..lines.len()-1].to_vec().join("\n"); - } else { - // File is empty - html = "".to_string(); - } - - fs::write(output, html).expect("Could not write html."); -} - -fn parse(elem: &mut HtmlElement, outline: &mut EcoString, curr_level: &mut u32) { - if matches!(elem.tag.to_string().as_str(), "

    "|"

    "|"

    "|"

    "|"
    ") { - let mut header_text = EcoString::new(); - - // Collate all the children text objects - for child in &elem.children { - match child { - HtmlNode::Text(string, _) => { - header_text.push_str(string); - } - _ => {} - } - } - - let slug = header_text.as_str() - .to_lowercase() - .chars() - .filter_map(|c| match c { - c if c.is_ascii_alphanumeric() => Some(c), - ' ' => Some('-'), - '\'' => None, - _ => None, - }) - .collect::() - .trim_matches('-') - .replace("--", "-"); - - let level: u32 = elem.tag.to_string().chars().nth(2).unwrap() as u32 - '0' as u32; - - while level > *curr_level { - *curr_level += 1; - outline.push_str(" ".repeat(*curr_level as usize - 2).as_str()); - outline.push_str("
      \n"); - } - while level < *curr_level { - outline.push_str(" ".repeat(*curr_level as usize - 2).as_str()); - outline.push_str("
    \n"); - *curr_level -= 1; - } - *curr_level = level; - - outline.push_str(" ".repeat(*curr_level as usize - 1).as_str()); - outline.push_str(format!("
  • {}
    • \n", slug, header_text).as_str()); - - elem.attrs.push(HtmlAttr::intern("id").unwrap(), slug); - return; - } - - for child in elem.children.make_mut().iter_mut() { - match child { - HtmlNode::Element(e) => {parse(e, outline, curr_level)} - _ => {} - } + if let Err(e) = compile_article(args.dir, args.prepend) { + eprintln!("{e}"); + std::process::exit(1); } } -