forked from bai/curriculum-project-hub
feat(cph): implement nested outline manifest and batch/combined export
ADR-0029 — nested outline manifest, supersedes ADR-0008's flat [[parts]]:
- cph-model: recursive loader over manifest.toml containers / element.toml
leaves; Lesson.parts (pure elements, DFS order) + Lesson.outline (elements
interleaved with section headings at their DFS-open position); rejects
ambiguous/incomplete folders and root-vs-container table misplacement
- cph-diag: new DiagCode::ManifestMalformed for carrier-document structure
errors (discharges an existing TODO)
- cph-typst: augmented manifest now serializes the outline (element/section
entries) instead of a flat parts array
- render/lib.typ: render-lesson renders section headings at their depth
- examples/TH-141 migrated to 5 nested section containers + 3 root segments,
byte-identical element order; smoke-verified via cph check/build + pdftotext
ADR-0030 — batch & combined export, extends ADR-0009/0011:
- cph build with no --target batches every declared target (repeatable
--target for an explicit subset); any target failure => non-zero exit,
per-target ledger, independent per-target execution
- cph-model: bundle.toml loader (directory + [info]/[targets.*]/ordered
lessons with per-lesson target overrides)
- cph-typst: augmented bundle manifest (path-prefixed member outlines),
Engine::{compile_check_bundle,build_bundle_pdf}
- render/lib.typ: render-bundle assembles member lessons under per-lesson
headings, depth-shifts their own section headings, resets example/lemma
counters at each lesson boundary by default
- cph-cli: `cph bundle <path> --target <name>` subcommand, same batching
contract as `cph build`
- new bundle fixtures/tests (cph-model unit + cph-typst through-template PDF
compile), smoke-verified via a real 2-lesson merged PDF
Verification: cargo fmt/clippy/test clean across the workspace (68 tests);
real cph check/build/bundle runs against TH-141 and a bundle fixture, PDF
content inspected via pdftotext.
This commit is contained in:
@@ -0,0 +1,83 @@
|
||||
//! Integration tests for `cph_model::load_bundle` (ADR-0030): an ordered
|
||||
//! arrangement of self-contained lessons, loaded from `bundle.toml`.
|
||||
|
||||
use std::path::PathBuf;
|
||||
|
||||
use cph_diag::DiagCode;
|
||||
use cph_model::load_bundle;
|
||||
|
||||
fn fixture(name: &str) -> PathBuf {
|
||||
PathBuf::from(env!("CARGO_MANIFEST_DIR"))
|
||||
.join("tests/fixtures")
|
||||
.join(name)
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn valid_bundle_loads_lessons_in_order_with_overrides() {
|
||||
let (bundle, diags) = load_bundle(&fixture("bundle-valid"));
|
||||
let bundle = bundle.expect("valid bundle fixture must produce a Bundle");
|
||||
assert!(
|
||||
diags.is_empty(),
|
||||
"valid bundle fixture must have no diagnostics, got: {diags:?}"
|
||||
);
|
||||
|
||||
assert_eq!(bundle.info.title, "测试合集");
|
||||
assert_eq!(
|
||||
bundle.info.authors,
|
||||
vec!["张老师".to_string(), "李老师".to_string()]
|
||||
);
|
||||
|
||||
assert_eq!(bundle.lessons.len(), 2);
|
||||
|
||||
// lesson-a: no explicit `target` in bundle.toml -> falls back to the
|
||||
// lesson's own first declared target ("student").
|
||||
assert_eq!(bundle.lessons[0].path, PathBuf::from("lesson-a"));
|
||||
assert_eq!(bundle.lessons[0].target, "student");
|
||||
assert_eq!(bundle.lessons[0].lesson.info.title, "课时A");
|
||||
|
||||
// lesson-b: explicit `target = "teacher"` in bundle.toml, overriding the
|
||||
// lesson's own single declared target (also "teacher" here, but the point
|
||||
// is the bundle entry's `target` wins regardless).
|
||||
assert_eq!(bundle.lessons[1].path, PathBuf::from("lesson-b"));
|
||||
assert_eq!(bundle.lessons[1].target, "teacher");
|
||||
assert_eq!(bundle.lessons[1].lesson.info.title, "课时B");
|
||||
|
||||
// The bundle's own targets are collected exactly like a lesson's.
|
||||
assert_eq!(bundle.target_names(), vec!["merged"]);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn missing_lesson_folder_yields_part_path_missing_and_is_skipped() {
|
||||
let (bundle, diags) = load_bundle(&fixture("bundle-missing-lesson"));
|
||||
let bundle = bundle.expect("must still produce a best-effort Bundle");
|
||||
assert!(
|
||||
bundle.lessons.is_empty(),
|
||||
"the missing lesson is skipped, not placeholder'd"
|
||||
);
|
||||
|
||||
let missing: Vec<_> = diags
|
||||
.iter()
|
||||
.filter(|d| d.code == DiagCode::PartPathMissing)
|
||||
.collect();
|
||||
assert_eq!(
|
||||
missing.len(),
|
||||
1,
|
||||
"exactly one PartPathMissing expected, got: {diags:?}"
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn malformed_bundle_toml_is_a_hard_failure() {
|
||||
let (bundle, diags) = load_bundle(&fixture("bundle-malformed"));
|
||||
assert!(bundle.is_none(), "malformed bundle.toml is a hard failure");
|
||||
assert_eq!(diags.len(), 1);
|
||||
assert_eq!(diags[0].code, DiagCode::ManifestMalformed);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn missing_bundle_toml_is_a_hard_failure() {
|
||||
let (bundle, diags) = load_bundle(&fixture("does-not-exist-at-all"));
|
||||
assert!(bundle.is_none());
|
||||
assert_eq!(diags.len(), 1);
|
||||
assert_eq!(diags[0].code, DiagCode::ManifestMalformed);
|
||||
}
|
||||
Reference in New Issue
Block a user