newtype in types, more generator config, parsing -> parser

1 files changed, 8 insertions, 11 deletions

diff --git a/src/generator/pandoc.rs b/src/generator/pandoc.rs
index 1753d34..035acab 100644
--- a/src/generator/pandoc.rs
+++ b/src/generator/pandoc.rs
@@ -1,14 +1,11 @@
 use super::config::Config;
-use crate::types::Entity;
+use crate::types::*;
 
 use pandoc_types::definition::{Attr, Block, Inline, Meta, MetaValue, Pandoc};
 
 use std::collections::BTreeMap;
 
-pub(crate) fn into_pandoc(
-    entity: Entity,
-    config: &Config,
-) -> (Pandoc, BTreeMap<String, Entity>) {
+pub(crate) fn into_pandoc(entity: Entity, config: &Config) -> (Pandoc, BTreeMap<EntityId, Entity>) {
     let mut meta = Meta::null();
 
     let title = vec![Inline::Code(Attr::null(), entity.name.clone())];
@@ -57,7 +54,7 @@ pub(crate) fn into_pandoc(
             content.push(Block::Header(
                 2,
                 Attr::null(),
-                vec![Inline::Str(String::from(section_name))],
+                vec![Inline::Str(section_name.0.clone())],
             ));
 
             content.push(members_list);
@@ -71,7 +68,7 @@ pub(crate) fn into_pandoc(
             content.push(Block::Header(
                 2,
                 Attr::null(),
-                vec![Inline::Str(section_name.clone())],
+                vec![Inline::Str(section_name.0.clone())],
             ));
 
             content.push(members_list);
@@ -79,7 +76,7 @@ pub(crate) fn into_pandoc(
             embedded_documentation.push(Block::Header(
                 2,
                 Attr::null(),
-                vec![Inline::Str(section_name + " Documentation")],
+                vec![Inline::Str(section_name.0 + " Documentation")],
             ));
 
             for (_id, child) in children {
@@ -112,7 +109,7 @@ fn str_block(content: String) -> Block {
     Block::Plain(vec![Inline::Str(content)])
 }
 
-fn entity_link(id: &str, name: String) -> Inline {
+fn entity_link(id: &EntityId, name: String) -> Inline {
     use pandoc_types::definition::Target;
     use percent_encoding::{utf8_percent_encode, AsciiSet, CONTROLS};
 
@@ -135,7 +132,7 @@ fn entity_link(id: &str, name: String) -> Inline {
         vec![Inline::Code(Attr::null(), name)],
         Target(
             once("./")
-                .chain(utf8_percent_encode(id, FRAGMENT))
+                .chain(utf8_percent_encode(&id.0, FRAGMENT))
                 .collect(),
             String::new(),
         ),
@@ -147,7 +144,7 @@ fn raw_markdown(text: String) -> Block {
     Block::RawBlock(Format(String::from("markdown")), text)
 }
 
-fn member_list<'a>(members: impl IntoIterator<Item = (&'a String, &'a Entity)>) -> Option<Block> {
+fn member_list<'a>(members: impl IntoIterator<Item = (&'a EntityId, &'a Entity)>) -> Option<Block> {
     let definitions: Vec<(Vec<Inline>, Vec<Vec<Block>>)> = members
         .into_iter()
         .map(|(id, entity)| {