docs(adr): cph 的 nested-manifest / batch-export 改号 0036/0037

上游 0029/0030 与本地 filelib 侧同号 ADR 相撞,cph 两份改到本地空闲号段,
代码锚点引用一并跟随。
This commit is contained in:
2026-08-06 00:51:33 +08:00
parent e878b46701
commit ecc92c9a87
27 changed files with 100 additions and 100 deletions
+3 -3
View File
@@ -181,7 +181,7 @@ impl Engine {
))
}
/// Compile-check `bundle` for `target` (ADR-0030) — same contract as
/// Compile-check `bundle` for `target` (ADR-0037) — same contract as
/// [`Engine::compile_check`], but over a [`Bundle`]'s own declared targets
/// and the augmented **bundle** manifest (each member lesson's outline,
/// path-prefixed to resolve against the bundle root).
@@ -200,7 +200,7 @@ impl Engine {
out
}
/// Build a PDF for `bundle` / `target` (ADR-0030) — same contract as
/// Build a PDF for `bundle` / `target` (ADR-0037) — same contract as
/// [`Engine::build_pdf`], over a [`Bundle`]'s own declared targets.
pub fn build_bundle_pdf(
&self,
@@ -244,7 +244,7 @@ impl Default for Engine {
/// Validate a `(targets, target)` request and resolve the template path to
/// compile. Shared by [`Engine::world_for`] (a lesson's `targets`) and
/// [`Engine::world_for_bundle`] (a bundle's own `targets` — ADR-0030 gives a
/// [`Engine::world_for_bundle`] (a bundle's own `targets` — ADR-0037 gives a
/// bundle target the exact same build/artifact/step shape). Returns
/// `Ok(template_path)` (relative to the lesson/bundle root) when the request is
/// buildable, or `Err(blocking_diagnostics)` when it is not:
+8 -8
View File
@@ -1,4 +1,4 @@
//! Augmented-manifest construction (ADR-0011, outline shape per ADR-0029).
//! Augmented-manifest construction (ADR-0011, outline shape per ADR-0036).
//!
//! The template (`exports/<target>.typ`) reads the manifest via
//! `toml(sys.inputs.manifest)`, then for each **element** outline entry
@@ -10,13 +10,13 @@
//!
//! The ENGINE has filesystem access, so it closes that gap: it builds an
//! **augmented manifest** = the lesson's `[info]` + the ordered `[[outline]]`
//! (ADR-0029's depth-first rendering order — elements interleaved with section
//! (ADR-0036's depth-first rendering order — elements interleaved with section
//! headings at their DFS-open position). Each `[[outline]]` entry carries a
//! `type` discriminator (`"element"` | `"section"`):
//!
//! - `type = "element"`: `kind`, `path`, and a per-part **`fields` array**
//! listing the content fields whose `<field>.typ` actually exists under the
//! lesson root (same contract as before ADR-0029).
//! lesson root (same contract as before ADR-0036).
//! - `type = "section"`: `kind`, `title`, `depth`, `path` — a section heading;
//! the template renders it without touching any content file.
//!
@@ -41,7 +41,7 @@ use cph_model::{Bundle, BundleLesson, Lesson, OutlineEntry};
///
/// The result is a self-contained TOML document the template's
/// `toml(sys.inputs.manifest)` reads. It carries `[info]` (title + optional
/// author) and the ordered `[[outline]]` (ADR-0029's depth-first rendering
/// author) and the ordered `[[outline]]` (ADR-0036's depth-first rendering
/// order), each entry typed `"element"` or `"section"` per the module docs. It
/// does **not** reproduce `[project]` or `[targets.*]` — the template only
/// consumes `info` and `outline`.
@@ -50,7 +50,7 @@ pub fn build_augmented_manifest(lesson: &Lesson) -> String {
doc.insert("info".to_string(), toml::Value::Table(info_table(lesson)));
// [[outline]] — ADR-0029's depth-first rendering order: elements
// [[outline]] — ADR-0036's depth-first rendering order: elements
// interleaved with section headings at their DFS-open position.
let outline: Vec<toml::Value> = lesson
.outline
@@ -62,7 +62,7 @@ pub fn build_augmented_manifest(lesson: &Lesson) -> String {
toml::to_string(&doc).expect("augmented manifest serializes")
}
/// Build the augmented **bundle** manifest TOML source for `bundle` (ADR-0030).
/// Build the augmented **bundle** manifest TOML source for `bundle` (ADR-0037).
///
/// The bundle template (`exports/<target>.typ` under the `bundle.toml` root)
/// reads it via `toml(sys.inputs.manifest)`. It carries `[info]` (the bundle's
@@ -71,7 +71,7 @@ pub fn build_augmented_manifest(lesson: &Lesson) -> String {
/// would assemble, except every outline entry's `path` is **prefixed with that
/// lesson's own bundle-root-relative directory** (`BundleLesson::path`), since
/// the bundle template's computed include paths resolve against the *bundle*
/// root, not each lesson's own root (ADR-0030: combination reads
/// root, not each lesson's own root (ADR-0037: combination reads
/// already-authored lessons at export time; each lesson's `path` bookkeeping
/// stays correct because the prefix is applied only here, in the manifest the
/// template consumes — never inside a lesson's own authored content).
@@ -147,7 +147,7 @@ fn info_table(lesson: &Lesson) -> toml::Table {
}
/// Build one `[[outline]]` entry's table for either variant of
/// [`OutlineEntry`]. `bundle_prefix`, when set (ADR-0030's bundle case), is
/// [`OutlineEntry`]. `bundle_prefix`, when set (ADR-0037's bundle case), is
/// joined onto the emitted `path` so the bundle template's computed include
/// resolves against the bundle root rather than the lesson's own root.
fn outline_entry_table(