src/blog_post/convert.rs

@@ -5,14 +5,10 @@ use std::path::PathBuf;
 use crate::config::Config;
 use crate::context::GlobalSettings;
 use crate::context::RenderBlogPostPage;
-use crate::context::RenderDocumentElement;
-use crate::context::RenderHeading;
-use crate::context::RenderSection;
 use crate::error::CustomError;
 
 use super::BlogPost;
 use super::BlogPostPage;
-use super::IDocumentElement;
 
 pub(crate) fn convert_blog_post_page_to_render_context<D: AsRef<Path>, F: AsRef<Path>>(
     config: &Config,
@@ -43,38 +39,11 @@ pub(crate) fn convert_blog_post_page_to_render_context<D: AsRef<Path>, F: AsRef<
         output_file.strip_prefix(output_directory)?,
     )?;
 
-    let children = {
-        let mut children = Vec::new();
-
-        for child in page.children.iter() {
-            match child {
-                IDocumentElement::Heading(heading) => {
-                    children.push(RenderDocumentElement::Heading(RenderHeading::new(
-                        config,
-                        output_directory,
-                        output_file,
-                        heading,
-                    )?));
-                }
-                IDocumentElement::Section(section) => {
-                    children.push(RenderDocumentElement::Section(RenderSection::new(
-                        config,
-                        output_directory,
-                        output_file,
-                        section,
-                    )?));
-                }
-            }
-        }
-
-        children
-    };
-
     let ret = RenderBlogPostPage::new(
         global_settings,
         page.title.clone(),
         Some(link_to_blog_post),
-        children,
+        Vec::new(),
     );
     Ok(ret)
 }

src/blog_post/definition.rs

@@ -7,13 +7,13 @@ use walkdir::WalkDir;
 use crate::error::CustomError;
 
 use super::BlogPostPage;
-use super::IDocumentElement;
+use super::DocumentElement;
 
 #[derive(Debug)]
 pub(crate) struct BlogPost {
     pub(crate) id: String,
     pub(crate) pages: Vec<BlogPostPage>,
-    pub(crate) children: Vec<IDocumentElement>,
+    pub(crate) children: Vec<DocumentElement>,
 }
 
 impl BlogPost {

src/blog_post/document_element.rs

@@ -0,0 +1,8 @@
+use super::Heading;
+use super::Section;
+
+#[derive(Debug)]
+pub(crate) enum DocumentElement {
+    Heading(Heading),
+    Section(Section),
+}

src/blog_post/element.rs

@@ -0,0 +1,2 @@
+#[derive(Debug)]
+pub(crate) enum Element {}

src/blog_post/heading.rs

@@ -0,0 +1,14 @@
+use crate::error::CustomError;
+
+use super::Object;
+
+#[derive(Debug)]
+pub(crate) struct Heading {
+    title: Vec<Object>,
+}
+
+impl Heading {
+    pub(crate) fn new(heading: &organic::types::Heading<'_>) -> Result<Heading, CustomError> {
+        Ok(Heading { title: Vec::new() })
+    }
+}

src/blog_post/mod.rs

@@ -5,15 +5,12 @@ mod element;
 mod heading;
 mod object;
 mod page;
-mod plain_text;
 mod section;
-mod util;
 pub(crate) use convert::convert_blog_post_page_to_render_context;
 pub(crate) use definition::BlogPost;
-pub(crate) use document_element::IDocumentElement;
-pub(crate) use element::IElement;
-pub(crate) use heading::IHeading;
-pub(crate) use object::IObject;
+pub(crate) use document_element::DocumentElement;
+pub(crate) use element::Element;
+pub(crate) use heading::Heading;
+pub(crate) use object::Object;
 pub(crate) use page::BlogPostPage;
-pub(crate) use plain_text::IPlainText;
-pub(crate) use section::ISection;
+pub(crate) use section::Section;

src/blog_post/object.rs

@@ -0,0 +1,2 @@
+#[derive(Debug)]
+pub(crate) enum Object {}

src/blog_post/page.rs

@@ -2,9 +2,9 @@ use std::path::PathBuf;
 
 use crate::error::CustomError;
 
-use super::IDocumentElement;
-use super::IHeading;
-use super::ISection;
+use super::DocumentElement;
+use super::Heading;
+use super::Section;
 
 #[derive(Debug)]
 pub(crate) struct BlogPostPage {
@@ -13,7 +13,7 @@ pub(crate) struct BlogPostPage {
 
     pub(crate) title: Option<String>,
 
-    pub(crate) children: Vec<IDocumentElement>,
+    pub(crate) children: Vec<DocumentElement>,
 }
 
 impl BlogPostPage {
@@ -24,10 +24,10 @@ impl BlogPostPage {
         let path = path.into();
         let mut children = Vec::new();
         if let Some(section) = document.zeroth_section.as_ref() {
-            children.push(IDocumentElement::Section(ISection::new(section)?));
+            children.push(DocumentElement::Section(Section::new(section)?));
         }
         for heading in document.children.iter() {
-            children.push(IDocumentElement::Heading(IHeading::new(heading)?));
+            children.push(DocumentElement::Heading(Heading::new(heading)?));
         }
 
         Ok(BlogPostPage {

src/blog_post/section.rs

@@ -1,10 +1,10 @@
 use crate::error::CustomError;
 
 #[derive(Debug)]
-pub(crate) struct ISection {}
+pub(crate) struct Section {}
 
-impl ISection {
-    pub(crate) fn new(section: &organic::types::Section<'_>) -> Result<ISection, CustomError> {
-        Ok(ISection {})
+impl Section {
+    pub(crate) fn new(section: &organic::types::Section<'_>) -> Result<Section, CustomError> {
+        Ok(Section {})
     }
 }

src/command/build/render.rs

@@ -4,10 +4,10 @@ use std::path::PathBuf;
 use include_dir::include_dir;
 use include_dir::Dir;
 
+use crate::blog_post::convert_blog_post_page_to_render_context;
+use crate::blog_post::BlogPost;
 use crate::config::Config;
 use crate::error::CustomError;
-use crate::intermediate::convert_blog_post_page_to_render_context;
-use crate::intermediate::BlogPost;
 use crate::render::DusterRenderer;
 use crate::render::RendererIntegration;
 

src/command/build/runner.rs

@@ -1,10 +1,10 @@
 use std::path::PathBuf;
 
+use crate::blog_post::BlogPost;
 use crate::cli::parameters::BuildArgs;
 use crate::command::build::render::SiteRenderer;
 use crate::config::Config;
 use crate::error::CustomError;
-use crate::intermediate::BlogPost;
 
 pub(crate) async fn build_site(args: BuildArgs) -> Result<(), CustomError> {
     let config = Config::load_from_file(args.config).await?;

src/context/heading.rs

@@ -1,36 +1,10 @@
-use std::path::Path;
-
 use serde::Serialize;
 
-use crate::config::Config;
-use crate::error::CustomError;
-use crate::intermediate::IHeading;
-
 use super::RenderObject;
 
 #[derive(Debug, Serialize)]
 #[serde(tag = "type")]
 #[serde(rename = "heading")]
 pub(crate) struct RenderHeading {
-    level: organic::types::HeadlineLevel,
     title: Vec<RenderObject>,
 }
-
-impl RenderHeading {
-    pub(crate) fn new<D: AsRef<Path>, F: AsRef<Path>>(
-        config: &Config,
-        output_directory: D,
-        output_file: F,
-        heading: &IHeading,
-    ) -> Result<RenderHeading, CustomError> {
-        let title = heading
-            .title
-            .iter()
-            .map(|obj| RenderObject::new(config, &output_directory, &output_file, obj))
-            .collect::<Result<Vec<_>, _>>()?;
-        Ok(RenderHeading {
-            level: heading.level,
-            title,
-        })
-    }
-}

src/context/mod.rs

@@ -4,7 +4,6 @@ mod element;
 mod global_settings;
 mod heading;
 mod object;
-mod plain_text;
 mod section;
 
 pub(crate) use blog_post_page::RenderBlogPostPage;

src/context/object.rs

@@ -1,33 +1,5 @@
-use std::path::Path;
-
 use serde::Serialize;
 
-use crate::config::Config;
-use crate::error::CustomError;
-use crate::intermediate::IObject;
-
-use super::plain_text::RenderPlainText;
-
 #[derive(Debug, Serialize)]
 #[serde(untagged)]
-pub(crate) enum RenderObject {
-    PlainText(RenderPlainText),
-}
-
-impl RenderObject {
-    pub(crate) fn new<D: AsRef<Path>, F: AsRef<Path>>(
-        config: &Config,
-        output_directory: D,
-        output_file: F,
-        object: &IObject,
-    ) -> Result<RenderObject, CustomError> {
-        match object {
-            IObject::PlainText(inner) => Ok(RenderObject::PlainText(RenderPlainText::new(
-                config,
-                output_directory,
-                output_file,
-                inner,
-            )?)),
-        }
-    }
-}
+pub(crate) enum RenderObject {}

src/context/plain_text.rs

@@ -1,23 +0,0 @@
-use std::path::Path;
-
-use serde::Serialize;
-
-use crate::config::Config;
-use crate::error::CustomError;
-use crate::intermediate::IPlainText;
-
-#[derive(Debug, Serialize)]
-#[serde(tag = "type")]
-#[serde(rename = "heading")]
-pub(crate) struct RenderPlainText {}
-
-impl RenderPlainText {
-    pub(crate) fn new<D: AsRef<Path>, F: AsRef<Path>>(
-        config: &Config,
-        output_directory: D,
-        output_file: F,
-        heading: &IPlainText,
-    ) -> Result<RenderPlainText, CustomError> {
-        Ok(RenderPlainText {})
-    }
-}

src/context/section.rs

@@ -2,9 +2,9 @@ use std::path::Path;
 
 use serde::Serialize;
 
+use crate::blog_post::Section;
 use crate::config::Config;
 use crate::error::CustomError;
-use crate::intermediate::ISection;
 
 #[derive(Debug, Serialize)]
 #[serde(tag = "type")]
@@ -16,7 +16,7 @@ impl RenderSection {
         config: &Config,
         output_directory: D,
         output_file: F,
-        section: &ISection,
+        section: &Section,
     ) -> Result<RenderSection, CustomError> {
         Ok(RenderSection {})
     }

src/intermediate/document_element.rs

@@ -1,8 +0,0 @@
-use super::IHeading;
-use super::ISection;
-
-#[derive(Debug)]
-pub(crate) enum IDocumentElement {
-    Heading(IHeading),
-    Section(ISection),
-}

src/intermediate/element.rs

@@ -1,2 +0,0 @@
-#[derive(Debug)]
-pub(crate) enum IElement {}

src/intermediate/heading.rs

@@ -1,23 +0,0 @@
-use crate::error::CustomError;
-
-use super::IObject;
-
-#[derive(Debug)]
-pub(crate) struct IHeading {
-    pub(crate) level: organic::types::HeadlineLevel,
-    pub(crate) title: Vec<IObject>,
-}
-
-impl IHeading {
-    pub(crate) fn new(heading: &organic::types::Heading<'_>) -> Result<IHeading, CustomError> {
-        let title = heading
-            .title
-            .iter()
-            .map(IObject::new)
-            .collect::<Result<Vec<_>, _>>()?;
-        Ok(IHeading {
-            title,
-            level: heading.level,
-        })
-    }
-}

src/intermediate/object.rs

@@ -1,44 +0,0 @@
-use crate::error::CustomError;
-
-use super::plain_text::IPlainText;
-
-#[derive(Debug)]
-pub(crate) enum IObject {
-    PlainText(IPlainText),
-}
-
-impl IObject {
-    pub(crate) fn new(obj: &organic::types::Object<'_>) -> Result<IObject, CustomError> {
-        match obj {
-            organic::types::Object::Bold(_) => todo!(),
-            organic::types::Object::Italic(_) => todo!(),
-            organic::types::Object::Underline(_) => todo!(),
-            organic::types::Object::StrikeThrough(_) => todo!(),
-            organic::types::Object::Code(_) => todo!(),
-            organic::types::Object::Verbatim(_) => todo!(),
-            organic::types::Object::PlainText(plain_text) => {
-                Ok(IObject::PlainText(IPlainText::new(plain_text)?))
-            }
-            organic::types::Object::RegularLink(_) => todo!(),
-            organic::types::Object::RadioLink(_) => todo!(),
-            organic::types::Object::RadioTarget(_) => todo!(),
-            organic::types::Object::PlainLink(_) => todo!(),
-            organic::types::Object::AngleLink(_) => todo!(),
-            organic::types::Object::OrgMacro(_) => todo!(),
-            organic::types::Object::Entity(_) => todo!(),
-            organic::types::Object::LatexFragment(_) => todo!(),
-            organic::types::Object::ExportSnippet(_) => todo!(),
-            organic::types::Object::FootnoteReference(_) => todo!(),
-            organic::types::Object::Citation(_) => todo!(),
-            organic::types::Object::CitationReference(_) => todo!(),
-            organic::types::Object::InlineBabelCall(_) => todo!(),
-            organic::types::Object::InlineSourceBlock(_) => todo!(),
-            organic::types::Object::LineBreak(_) => todo!(),
-            organic::types::Object::Target(_) => todo!(),
-            organic::types::Object::StatisticsCookie(_) => todo!(),
-            organic::types::Object::Subscript(_) => todo!(),
-            organic::types::Object::Superscript(_) => todo!(),
-            organic::types::Object::Timestamp(_) => todo!(),
-        }
-    }
-}

src/intermediate/plain_text.rs

@@ -1,17 +0,0 @@
-use crate::error::CustomError;
-use crate::intermediate::util::coalesce_whitespace;
-
-#[derive(Debug)]
-pub(crate) struct IPlainText {
-    source: String,
-}
-
-impl IPlainText {
-    pub(crate) fn new(
-        plain_text: &organic::types::PlainText<'_>,
-    ) -> Result<IPlainText, CustomError> {
-        Ok(IPlainText {
-            source: coalesce_whitespace(plain_text.source).into_owned(),
-        })
-    }
-}

src/intermediate/util.rs

@@ -1,48 +0,0 @@
-use std::borrow::Cow;
-
-/// Removes all whitespace from a string.
-///
-/// Example: "foo bar" => "foobar" and "foo \n bar" => "foobar".
-#[allow(dead_code)]
-pub(crate) fn coalesce_whitespace(input: &str) -> Cow<'_, str> {
-    let mut state = CoalesceWhitespace::Normal;
-    for (offset, c) in input.char_indices() {
-        match (&mut state, c) {
-            (CoalesceWhitespace::Normal, ' ' | '\t' | '\r' | '\n') => {
-                let mut ret = String::with_capacity(input.len());
-                ret.push_str(&input[..offset]);
-                ret.push(' ');
-                state = CoalesceWhitespace::HasWhitespace {
-                    in_whitespace: true,
-                    ret,
-                };
-            }
-            (CoalesceWhitespace::Normal, _) => {}
-            (
-                CoalesceWhitespace::HasWhitespace { in_whitespace, ret },
-                ' ' | '\t' | '\r' | '\n',
-            ) => {
-                if !*in_whitespace {
-                    *in_whitespace = true;
-                    ret.push(' ');
-                }
-            }
-            (CoalesceWhitespace::HasWhitespace { in_whitespace, ret }, _) => {
-                *in_whitespace = false;
-                ret.push(c);
-            }
-        }
-    }
-    match state {
-        CoalesceWhitespace::Normal => Cow::Borrowed(input),
-        CoalesceWhitespace::HasWhitespace {
-            in_whitespace: _,
-            ret,
-        } => Cow::Owned(ret),
-    }
-}
-
-enum CoalesceWhitespace {
-    Normal,
-    HasWhitespace { in_whitespace: bool, ret: String },
-}

src/main.rs

@@ -7,13 +7,13 @@ use self::cli::parameters::Commands;
 use self::command::build::build_site;
 use self::command::init::init_writer_folder;
 use self::error::CustomError;
+mod blog_post;
 mod cli;
 mod command;
 mod config;
-mod context;
 mod error;
-mod intermediate;
 mod render;
+mod context;
 
 fn main() -> Result<ExitCode, CustomError> {
     let rt = tokio::runtime::Runtime::new()?;