fernando/thp
1
0
Fork 0
Code Issues 2 Pull Requests Packages Projects Releases Wiki Activity

[Web] Use a TOML file to index the markdown files

Browse Source
This commit is contained in:
Araozu 2023-04-12 21:15:00 -05:00
parent 85c36bcb26
commit 5ec34369e9
14 changed files with 282 additions and 175 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
doc-generator/README.md
View File

@ -18,10 +18,34 @@ generator --input /path/to/markdown/folder/ --output /path/to/static/folder/
Contains the Markdown. All files inside are expected to be UTF-8 encoded Contains the Markdown. All files inside are expected to be UTF-8 encoded
markdown, and have the `.md` file extension. markdown, and have the `.md` file extension.
### Indexing
`doc-generator` will not search for `.md` files. Instead, it will search for
`.toml` files, which index all the markdown files. This is used to generate
the file hierarchy and previous/next links in the documentation.
This file must be named `index.toml`, must be the only TOML file in its folder,
and must follow the following schema:
```toml
# Tipically index
entry-point = "file-without-extension"
[folder-1]
section-name = "Display name for the folder"
# Markdown files, without the .md extension
children = [
"file1",
"file2",
]
```
### Markdown extensions
The markdown follows the CommonMark specification, but certain code blocks The markdown follows the CommonMark specification, but certain code blocks
contain custom behaviour: contain custom behaviour:
### `meta` #### `meta`
A code block with language `meta` contains text in TOML format that indicates A code block with language `meta` contains text in TOML format that indicates
metadata for the current page. metadata for the current page.
@ -36,22 +60,6 @@ description: "Description of the page"
- title: Used to create the title of the page with the format `{title} - Misti` - title: Used to create the title of the page with the format `{title} - Misti`
- description: The description of the page, placed in a `<meta>` element in the `<head>` - description: The description of the page, placed in a `<meta>` element in the `<head>`
### `nav`
Used to link to the previous/next page.
````toml
```nav
[previous]
href = "./relative/path/to/previous.html"
title = "Title of previous page"
[next]
href = "./relative/path/to/previous.html"
title = "Title of previous page"
```
````
## `static` folder ## `static` folder

10
doc-generator/markdown/en/docs/latest/basics/function-calls.md
View File

@ -15,13 +15,3 @@ val total = add(60, -30, 90)
``` ```
```nav
[previous]
href = "./simple-datatypes.html"
title = "Datatypes"
[next]
href = "./operators.html"
title = "Operators"
```

11
doc-generator/markdown/en/docs/latest/basics/simple-datatypes.md
View File

@ -33,14 +33,3 @@ True and false
true true
false false
``` ```
```nav
[previous]
href = "./variables-and-constants.html"
title = "Variables and constants"
[next]
href = "./function-calls.html"
title = "Function calls"
```

10
doc-generator/markdown/en/docs/latest/basics/variables-and-constants.md
View File

@ -107,13 +107,3 @@ val roi =
income / investment // This will be the value of `roi` income / investment // This will be the value of `roi`
``` ```
```nav
[previous]
href = "../"
title = "Welcome"
[next]
href = "./simple-datatypes.html"
title = "Datatypes"
```

8
doc-generator/markdown/en/docs/latest/index.md
View File

@ -372,12 +372,4 @@ val list = items.map fun (item, count) {&lt;li key={count}>{item}&lt;/li>}
```nav
[next]
href = "./basics/variables-and-constants.html"
title = "Variables and constants"
```

29
doc-generator/markdown/en/docs/latest/index.toml Normal file
View File

@ -0,0 +1,29 @@
entry-point = "index"
[basics]
section-name = "Basics"
children = [
"variables-and-constants",
"simple-datatypes",
"function-calls",
"operators",
"tuples",
"indentation-rules",
]
[flow-control]
section-name = "Flow control"
children = [
"conditionals",
"arrays",
"loops",
]
[functions]
section-name = "Functions"
children = [
"definition",
"lambdas",
"parameters",
]

1
doc-generator/markdown/en/stdlib/latest/index.md Normal file
View File

@ -0,0 +1 @@
# Stdlib index

1
doc-generator/markdown/en/stdlib/latest/index.toml Normal file
View File

@ -0,0 +1 @@
entry-point = "index"

5
doc-generator/src/generator/code.rs
View File

@ -81,5 +81,8 @@ fn generate_nav_html(data: &String) -> String {
_ => String::from("<div></div>"), _ => String::from("<div></div>"),
}; };
format!("<div class=\"grid grid-cols-2 gap-4 my-16\">{}{}</div>", previous, next) format!(
"<div class=\"grid grid-cols-2 gap-4 my-16\">{}{}</div>",
previous, next
)
} }

2
doc-generator/src/generator/heading.rs
View File

@ -18,7 +18,7 @@ impl Printable for Heading {
let html_fragment_text = utils::to_html_fragment(&self.get_text()); let html_fragment_text = utils::to_html_fragment(&self.get_text());
format!( format!(
"<h{} id=\"{}\" class=\"heading-linked target:underline decoration-js-color decoration-1\"><a href=\"#{}\">{}</a></h{}>", "<h{} id=\"{}\" class=\"heading-linked\"><a href=\"#{}\">{}</a></h{}>",
self.depth, html_fragment_text, html_fragment_text, text, self.depth self.depth, html_fragment_text, html_fragment_text, text, self.depth
) )
} else { } else {

118
doc-generator/src/main.rs
View File

@ -1,11 +1,8 @@
use clap::Parser; use clap::Parser;
use generator::Printable; use std::path::Path;
use sidebar::SidebarGenerator;
use std::fs::File;
use std::io::Write;
use std::{fs, path::Path};
mod generator; mod generator;
mod processor;
mod sidebar; mod sidebar;
mod utils; mod utils;
@ -27,116 +24,9 @@ fn main() {
let output_folder = Path::new(&args.output); let output_folder = Path::new(&args.output);
if input_folder.is_dir() && output_folder.is_dir() { if input_folder.is_dir() && output_folder.is_dir() {
process_folder(&input_folder, input_folder, output_folder); processor::search_config_file(&input_folder, input_folder, output_folder);
// process_folder(&input_folder, input_folder, output_folder);
} else { } else {
eprint!("Input folder is not a valid path to a folder") eprint!("Input folder is not a valid path to a folder")
} }
} }
fn process_folder(path: &Path, input_folder: &Path, output_folder: &Path) {
for entry in path.read_dir().unwrap() {
match entry {
Ok(entry) if entry.path().is_dir() => {
let path = entry.path();
match ensure_folder_exists(&entry.path(), input_folder, output_folder) {
Ok(_) => {
process_folder(&path, input_folder, output_folder);
}
Err(reason) => panic!("{}", reason),
}
}
Ok(entry) if entry.path().is_file() => {
let _ = process_markdown(&entry.path(), input_folder, output_folder);
}
_ => panic!(),
}
}
}
fn ensure_folder_exists(
folder: &Path,
input_folder: &Path,
output_folder: &Path,
) -> Result<(), String> {
// /home/fernando/misti/docs/markdown
let input_folder = input_folder.canonicalize().unwrap();
// /home/fernando/misti/docs/static
let output_folder = output_folder.canonicalize().unwrap();
// /home/fernando/misti/docs/markdown/en/
let full_input_folder = folder.canonicalize().unwrap();
let relative_new_folder = full_input_folder.strip_prefix(input_folder).unwrap();
let mut full_output_folder = output_folder.clone();
full_output_folder.push(relative_new_folder);
// println!("Ensuring that folder exists:\n{:?}", full_output_folder);
// If this is a "top-level" folder, remove all its contents, if it exists
if full_output_folder.is_dir() {
// println!("| Removing...");
let _ = fs::remove_dir_all(&full_output_folder);
}
// Create folder
match fs::create_dir(&full_output_folder) {
Ok(_) => {
// println!("| done\n\n");
Ok(())
}
Err(_) => Err(format!("Error creating folder {:?}", full_output_folder)),
}
}
fn process_markdown(file: &Path, input_folder: &Path, output_folder: &Path) -> Result<(), String> {
// /home/fernando/misti/docs/markdown
let input_folder = input_folder.canonicalize().unwrap();
// /home/fernando/misti/docs/markdown/en/docs/latest/index.md
let input_file = file.canonicalize().unwrap();
// /home/fernando/misti/docs/static
let output_folder = output_folder.canonicalize().unwrap();
// en/docs/latests/index.md
let relative_input_file = input_file.strip_prefix(input_folder).unwrap();
let mut output_file = output_folder.clone();
output_file.push(relative_input_file);
output_file.set_extension("html");
//
// Compilation
//
let file_content_bytes = fs::read(&input_file).unwrap();
let markdown_text = String::from_utf8(file_content_bytes).unwrap();
// let html_text = to_html(markdown_text.as_str());
let md_ast = markdown::to_mdast(&markdown_text, &markdown::ParseOptions::gfm()).unwrap();
let html_text = md_ast.to_html();
let sidebar_html = md_ast.generate_sidebar();
// Read template.html
let mut template_path = output_folder.clone();
template_path.push("template.html");
let template_contents = fs::read(template_path).unwrap();
let template_contents = String::from_utf8(template_contents).unwrap();
let final_output = template_contents
.replace("{{markdown}}", &html_text)
.replace("{{sidebar}}", &sidebar_html);
//
// Write to disk
//
let _ = File::create(&output_file)
.unwrap()
.write_all(final_output.as_bytes())
.unwrap();
Ok(())
}

214
doc-generator/src/processor.rs Normal file
View File

@ -0,0 +1,214 @@
use super::generator::Printable;
use crate::sidebar::SidebarGenerator;
use std::io::Write;
use std::{
fs::{self, File},
path::{Path, PathBuf},
};
use toml::{Table, Value};
enum EntryFound {
TomlFile,
OtherFile,
None,
}
// Traverses the current path searching for a TOML file
pub fn search_config_file(current_path: &Path, input_folder: &Path, output_folder: &Path) {
// Iterate over all the files searching for a TOML file
let result = current_path
.read_dir()
.unwrap()
.fold(&EntryFound::None, |acc, next| {
let p = next.unwrap().path();
let is_file = p.is_file();
let ext = p.extension();
match (acc, is_file, ext) {
(EntryFound::TomlFile, true, Some(x)) if x == "toml" => {
panic!("FOUND A SECOND TOML FILE!!!")
}
(EntryFound::TomlFile, _, _) => acc,
(EntryFound::OtherFile, true, Some(x)) if x == "toml" => &EntryFound::TomlFile,
(EntryFound::None, true, Some(x)) if x == "toml" => &EntryFound::TomlFile,
(EntryFound::None, true, Some(_)) => &EntryFound::OtherFile,
_ => acc,
}
});
match result {
// If a file other than a TOML file is found, panic
EntryFound::OtherFile => panic!(
"Found an orphan file without a TOML parent at {:?}",
current_path
),
// Process the TOML file
EntryFound::TomlFile => process_toml(current_path, input_folder, output_folder),
// No files found, recursively read children folders
EntryFound::None => {
for entry in current_path.read_dir().unwrap() {
// Should always succeed, and countain a folder
let x = entry.unwrap();
let path = x.path();
ensure_folder_exists(&path, input_folder, output_folder).unwrap();
search_config_file(&path, input_folder, output_folder);
}
}
};
}
fn process_toml(current_path: &Path, input_folder: &Path, output_folder: &Path) {
let mut toml_file_path = current_path.canonicalize().unwrap();
toml_file_path.push("index.toml");
// Read TOML file
let toml_bytes = fs::read(toml_file_path.clone())
.expect(format!("index.toml MUST exist ({:?})", toml_file_path).as_str());
let toml_file = String::from_utf8(toml_bytes).expect("index.toml MUST be UTF-8");
// Parse TOML file
let toml_table = toml_file
.parse::<Table>()
.expect("index.toml MUST contain valid TOML");
// Process MD files indicated in TOML file
// Expect a key named entry-point and compile it
let Value::String(entry_point) = toml_table.get("entry-point").expect("TOML: key entry-point MUST exist")
else {panic!("TOML: entry-point MUST be a String")};
let mut file = current_path.canonicalize().unwrap();
file.push(format!("{}.md", entry_point));
compile_md_file(&file, input_folder, output_folder)
.expect("FS: entry-point file MUST point to a valid file");
// Subsequent keys should have schema:
// [key]
// section-name = "Section name"
// children = ["file1", "file2", "file3"]
for (key, value) in toml_table.into_iter() {
if key == "entry-point" {
continue;
}
match value {
Value::Table(t) => {
let Value::String(_section_name) = t.get("section-name").expect(format!("TOML: table {} MUST have a key section-name", key).as_str())
else {panic!("TOML: key section-name of table {} MUST be a String", key)};
let Value::Array(children) = t.get("children").expect(format!("TOML: table {} MUST have a key children", key).as_str())
else {panic!("TOML: in table {} > children MUST be an Array", key)};
// Ensure folder exists
let mut folder_path = current_path.canonicalize().unwrap();
folder_path.push(key.clone());
ensure_folder_exists(&folder_path, input_folder, output_folder).unwrap();
for file_name in children {
let Value::String(file_name) = file_name
else {panic!("TOML: in table {} > children's value MUST be Strings (found {:?})", key, file_name)};
let mut file = current_path.canonicalize().unwrap();
file.push(key.clone());
file.push(format!("{}.md", file_name));
compile_md_file(&file, input_folder, output_folder)
.expect(format!("Error compiling file {}", file.display()).as_str());
}
}
_ => panic!("TOML: key {} MUST be a table", key),
}
}
}
fn compile_md_file(
file: &PathBuf,
input_folder: &Path,
output_folder: &Path,
) -> Result<(), String> {
// /home/fernando/misti/docs/markdown
let input_folder = input_folder.canonicalize().unwrap();
// /home/fernando/misti/docs/markdown/en/docs/latest/index.md
let input_file = file.canonicalize().unwrap();
// /home/fernando/misti/docs/static
let output_folder = output_folder.canonicalize().unwrap();
// en/docs/latests/index.md
let relative_input_file = input_file.strip_prefix(input_folder).unwrap();
let mut output_file = output_folder.clone();
output_file.push(relative_input_file);
output_file.set_extension("html");
//
// Compilation
//
let file_content_bytes = fs::read(&input_file).unwrap();
let markdown_text = String::from_utf8(file_content_bytes).unwrap();
// let html_text = to_html(markdown_text.as_str());
let md_ast = markdown::to_mdast(&markdown_text, &markdown::ParseOptions::gfm()).unwrap();
let html_text = md_ast.to_html();
let sidebar_html = md_ast.generate_sidebar();
// Read template.html
let mut template_path = output_folder.clone();
template_path.push("template.html");
let template_contents = fs::read(template_path).unwrap();
let template_contents = String::from_utf8(template_contents).unwrap();
let final_output = template_contents
.replace("{{markdown}}", &html_text)
.replace("{{sidebar}}", &sidebar_html);
//
// Write to disk
//
let _ = File::create(&output_file)
.expect(format!("MD: Output file should be valid {:?}", &output_file).as_str())
.write_all(final_output.as_bytes())
.unwrap();
Ok(())
}
fn ensure_folder_exists(
folder: &Path,
input_folder: &Path,
output_folder: &Path,
) -> Result<(), String> {
// /home/fernando/misti/docs/markdown
let input_folder = input_folder.canonicalize().unwrap();
// /home/fernando/misti/docs/static
let output_folder = output_folder.canonicalize().unwrap();
// /home/fernando/misti/docs/markdown/en/
let full_input_folder = folder.canonicalize().unwrap();
let relative_new_folder = full_input_folder.strip_prefix(input_folder).unwrap();
let mut full_output_folder = output_folder.clone();
full_output_folder.push(relative_new_folder);
// println!("Ensuring that folder exists:\n{:?}", full_output_folder);
// If this is a "top-level" folder, remove all its contents, if it exists
if full_output_folder.is_dir() {
// println!("| Removing...");
let _ = fs::remove_dir_all(&full_output_folder);
}
// Create folder
match fs::create_dir(&full_output_folder) {
Ok(_) => {
// println!("| done\n\n");
Ok(())
}
Err(_) => Err(format!("Error creating folder {:?}", full_output_folder)),
}
}

2
doc-generator/static/styles/global.css
View File

@ -307,7 +307,7 @@ code, pre {
/* Used by headers generated at src/generator/heading.rs */ /* Used by headers generated at src/generator/heading.rs */
.heading-linked :hover::after{ .heading-linked :hover::after{
color: var(--c1); color: var(--c2-primary);
content: "#"; content: "#";
display: inline-block; display: inline-block;
font-size: 0.7em; font-size: 0.7em;

4
doc-generator/static/template.html
View File

@ -59,11 +59,11 @@
</script> </script>
<script> <script>
const anchors = document.querySelectorAll('h2, h3'); const anchors = document.querySelectorAll('h2, h3');
const links = document.querySelectorAll('nav > ul > li > a'); const links = document.querySelectorAll('nav > ul > li a');
window.addEventListener("DOMContentLoaded", () => { window.addEventListener("DOMContentLoaded", () => {
window.addEventListener('scroll', (event) => { window.addEventListener('scroll', (event) => {
if (anchors !== null && links !== null) { if (anchors && links) {
let scrollTop = window.scrollY; let scrollTop = window.scrollY;
let scrollBottom = scrollTop + window.innerHeight; let scrollBottom = scrollTop + window.innerHeight;