finchie/new_manual - Change ZYNEMGAZXWHIWGNPB2RTYG3JWTH5Y5XY4JWJ3TTPANIOORTCLISAC

Use generated Typst code from Rust

It works!! With lots of caveats, so next up will be to fix modules and allow more than one file.

Created by finchie on October 26, 2023

ZYNEMGAZXWHIWGNPB2RTYG3JWTH5Y5XY4JWJ3TTPANIOORTCLISAC

Dependencies

In channels

main

Change contents

Insertion in src/main.rs at line 7 [4.49]
[3.141]
[4.189]
```
include!(concat!(env!("OUT_DIR"), "/docs.rs"));
```

Deletion in src/main.rs at line 81 [4.49]

B:BD[5.1766] → [6.0:129]

}
fn content(state: &AppState) -> impl View<AppState> + ViewMarker {
    el::div(include_str!("../dist/.stage/docs/test.html"))

Replacement in src/main.rs at line 93 [4.49]

B:BD[7.114] → [6.130:190]

            el::div(content(&state)).attr("id", "content"),

[7.114]

[7.161]

            el::div(test()).attr("id", "content"),

Deletion in crates/typst_rust_gen/src/lib.rs at line 114 [8.1210]

B:BD[2.1366] → [2.1366:1693]

                                syn::UseTree::Name(syn::UseName {
                                    ident: syn::Ident::new(
                                        "ViewMarker",
                                        proc_macro2::Span::call_site(),
                                    ),
                                }),

Replacement in crates/typst_rust_gen/src/lib.rs at line 131 [8.1210]

B:BD[2.2379] → [2.2379:2435]

                    generics: syn::Generics::default(),

[2.2379]

[2.2435]

                    generics: syn::Generics { lt_token: None, params: Punctuated::from_iter(vec![syn::GenericParam::Type(syn::TypeParam { attrs: Vec::new(), ident: syn::Ident::new("T", proc_macro2::Span::call_site()), colon_token: None, bounds: Punctuated::new(), eq_token: None, default: None })].into_iter()), gt_token: None, where_clause: None },

Replacement in crates/typst_rust_gen/src/lib.rs at line 135 [8.1210]

B:BD[2.2581] → [2.2581:2635]

                    output: syn::ReturnType::Default,

[2.2581]

[2.2635]

                    output: syn::ReturnType::Type(
                        syn::token::RArrow::default(),
                        Box::new(syn::Type::ImplTrait(syn::TypeImplTrait {
                            impl_token: syn::token::Impl::default(),
                            bounds: Punctuated::from_iter(
                                vec![syn::TypeParamBound::Trait(syn::TraitBound {
                                    paren_token: None,
                                    modifier: syn::TraitBoundModifier::None,
                                    lifetimes: None,
                                    path: syn::Path {
                                        leading_colon: None,
                                        segments: Punctuated::from_iter(
                                            vec![syn::PathSegment {
                                                ident: syn::Ident::new(
                                                    "ViewSequence",
                                                    proc_macro2::Span::call_site(),
                                                ),
                                                arguments: syn::PathArguments::AngleBracketed(
                                                    syn::AngleBracketedGenericArguments {
                                                        colon2_token: None,
                                                        lt_token: syn::token::Lt::default(),
                                                        args: Punctuated::from_iter(
                                                            vec![syn::GenericArgument::Type(
                                                                syn::Type::Path(syn::TypePath {
                                                                    qself: None,
                                                                    path: syn::Path {
                                                                        leading_colon: None,
                                                                        segments: Punctuated::from_iter(vec![syn::PathSegment { ident: syn::Ident::new("T", proc_macro2::Span::call_site()), arguments: syn::PathArguments::None }].into_iter()),
                                                                    },
                                                                }),
                                                            )]
                                                            .into_iter(),
                                                        ),
                                                        gt_token: syn::token::Gt::default(),
                                                    },
                                                ),
                                            }]
                                            .into_iter(),
                                        ),
                                    },
                                })]
                                .into_iter(),
                            ),
                        })),
                    ),

Replacement in build.rs at line 1 [6.302]

B:BD[6.302] → [6.303:359]

use std::{ffi::OsStr, path::PathBuf, process::Command};

[6.302]

[6.359]

use std::{ffi::OsStr, path::PathBuf};

Insertion in build.rs at line 3 [6.302]
[6.360]
[6.360]
```
use typst_rust_gen::transform_pandoc;
```
Deletion in build.rs at line 6 [6.302]
B:BD[6.383] → [6.383:436]
```
const TRUNK_STAGING_DIRECTORY: &str = "dist/.stage";
```

Insertion in build.rs at line 10 [6.302]

[6.526]

    println!("cargo:rerun-if-changed=docs");
    println!("cargo:rerun-if-changed=crates/typst_rust_gen");

Replacement in build.rs at line 24 [6.302]

B:BD[6.988] → [6.988:1051]

    std::fs::create_dir_all(TRUNK_STAGING_DIRECTORY).unwrap();

[6.988]

[6.1051]

    let out_dir = PathBuf::from(std::env::var("OUT_DIR").unwrap());
    std::fs::create_dir_all(&out_dir).unwrap();

Deletion in build.rs at line 29 [6.302]

B:BD[6.1124] → [6.1124:1204]

    let staging_dir = PathBuf::from(TRUNK_STAGING_DIRECTORY).join(DOCS_SOURCE);

Replacement in build.rs at line 33 [6.302]

B:BD[6.1288] → [6.1288:1550]

        // Handle nested directories correctly
        let remainder = if parent != prefix {
            assert!(parent.starts_with(&prefix));
            parent.strip_prefix(&prefix).unwrap().to_path_buf()
        } else {
            PathBuf::new()
        };

[6.1288]

[6.1550]

        // TODO: Handle nested directories correctly
        // let remainder = if parent != prefix {
        //     assert!(parent.starts_with(&prefix));
        //     parent.strip_prefix(&prefix).unwrap().to_path_buf()
        // } else {
        //     PathBuf::new()
        // };

Replacement in build.rs at line 41 [6.302]

B:BD[6.1551] → [6.1551:1819]

        // Create the appropriate directory layout
        let mut output_path = staging_dir
            .join(remainder)
            .join(file.path().file_name().unwrap());
        // Our input is .typ, but output is .html
        output_path.set_extension("html");

[6.1551]

[6.1819]

        // Store everything inside one large autogenerated Rust file
        let output_path = out_dir.join("docs.rs");

Replacement in build.rs at line 45 [6.302]

B:BD[6.1893] → [6.1893:2167]

        Command::new("pandoc")
            .args([
                file.path().to_str().unwrap(),
                "-o",
                output_path.to_str().unwrap(),
            ])
            .status()
            .expect("Error running pandoc. Check if it's installed");

[6.1893]

[6.2167]

        // TODO: this will only work for a single file, in the top-level directory
        let rust_code = transform_pandoc(file.path());
        std::fs::write(&output_path, rust_code).unwrap();