Skip to content

Commit

Permalink
fix: meta order
Browse files Browse the repository at this point in the history
  • Loading branch information
Myriad-Dreamin committed Jun 15, 2024
1 parent 54802cd commit 1c34bc3
Showing 1 changed file with 8 additions and 9 deletions.
17 changes: 8 additions & 9 deletions cli/src/project.rs
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,11 @@ impl Project {
include_dir!("$CARGO_MANIFEST_DIR/../contrib/typst/variables"),
);

if matches!(proj.meta_source, MetaSource::Strict) {
assert!(entry_file.is_none());
proj.compile_meta()?;
}

if final_dest_dir.is_empty() {
if let Some(dest_dir) = proj.build_meta.as_ref().map(|b| b.dest_dir.clone()) {
final_dest_dir = dest_dir;
Expand All @@ -139,15 +144,9 @@ impl Project {
proj.tr.fix_dest_dir(Path::new(&final_dest_dir));
proj.dest_dir.clone_from(&proj.tr.dest_dir);

match proj.meta_source {
MetaSource::Strict => {
assert!(entry_file.is_none());
proj.compile_meta()?;
}
MetaSource::Outline => {
assert!(entry_file.is_some());
proj.infer_meta_by_outline(entry_file.unwrap())?;
}
if matches!(proj.meta_source, MetaSource::Outline) {
assert!(entry_file.is_some());
proj.infer_meta_by_outline(entry_file.unwrap())?;
}

Ok(proj)
Expand Down

0 comments on commit 1c34bc3

Please sign in to comment.