1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
//! Thin wrapper around the typst compiler. The TUI's Ctrl+B B / Ctrl+B O
//! procedures run this after Book assembly to turn the synthesised
//! `<artefacts>/<book-slug>/<book-slug>.typ` into a PDF.
//!
//! Two engines live behind one shape:
//!
//! * **External** (default): spawn the host's `typst` binary as a
//! child process. Original behaviour from 1.2.3 — preserved here
//! as the default path.
//! * **In-process** (1.2.5+, opt-in via `typst_compile.engine =
//! "inprocess"` in HJSON): run `typst::compile::<PagedDocument>()`
//! on a worker thread and emit the PDF via `typst-pdf`. See
//! `crate::typst_inprocess`.
//!
//! The TUI never cares which engine ran — it spawns, polls, and
//! finishes through the `CompileHandle` abstraction below. Routing
//! is decided once in `spawn_with_config` based on the user's HJSON
//! setting (and a runtime gate that today always picks `external`
//! when the in-process path isn't selected).
use std::io::Read;
use std::path::{Path, PathBuf};
use std::process::{Child, Command, Stdio};
use std::thread::JoinHandle;
use crate::config::Config;
use crate::error::{Error, Result};
use crate::typst_inprocess::{spawn_thread, InprocessHandle};
/// Locate the host's `typst` binary on `PATH`. Returns `None` when
/// the binary is missing — the external engine spawn will then
/// produce a clean error pointing at the install docs (or at the
/// in-process engine knob). Shared with `cli/export.rs` so both
/// paths report the same path.
pub fn typst_external_path() -> Option<PathBuf> {
let path = std::env::var_os("PATH")?;
for dir in std::env::split_paths(&path) {
let candidate = dir.join("typst");
if candidate.is_file() {
return Some(candidate);
}
let with_ext = dir.join("typst.exe");
if with_ext.is_file() {
return Some(with_ext);
}
}
None
}
/// One-line summary of which engine is active, suitable for the
/// compile splash, the credits pane, or a status-bar message.
/// Always includes a concrete path (or `"not found on PATH"`) for
/// the external engine so the user can see exactly what would run.
pub fn engine_summary(cfg: &Config) -> String {
if cfg.typst_compile.use_inprocess_engine() {
let bundle = cfg.typst_compile.bundle_fonts;
let system = cfg.typst_compile.use_system_fonts;
let pkgs = cfg.typst_compile.packages_enabled;
let font_label = match (bundle, system) {
(true, true) => "bundled + system",
(true, false) => "bundled",
(false, true) => "system",
(false, false) => "NO FONTS",
};
format!(
"internal · fonts: {font_label} · @preview: {}",
if pkgs { "on" } else { "off" }
)
} else {
match typst_external_path() {
Some(p) => format!("external · {}", p.display()),
None => "external · `typst` NOT FOUND on PATH".to_owned(),
}
}
}
/// What the compiler produced, regardless of engine.
#[derive(Debug)]
pub struct CompileOutcome {
pub success: bool,
pub stderr: String,
pub stdout: String,
/// Where the PDF lands — same path as the input `.typ` with the
/// extension swapped. Captured even on failure so callers can
/// `take` a known location if a prior run produced a stale PDF
/// (we explicitly wipe before compile so this only matters on
/// the success path).
pub pdf_path: PathBuf,
}
/// One-of-two compile handles: a `std::process::Child` for the
/// external engine, or an in-process worker-thread handle. Drives
/// the spinner loop in the TUI through the same `try_wait` /
/// `finish` shape.
pub enum CompileHandle {
External {
child: Child,
pdf_path: PathBuf,
// H3 — stdout/stderr are drained on dedicated threads from the
// moment of spawn. Without this, a compile that emits more than
// the OS pipe buffer (~64KB of diagnostics on a big book) blocks
// typst on `write()`, the child never exits, and `try_wait`
// returns `None` forever → the build hangs with no timeout.
// `finish` joins these to recover the captured output.
stdout_reader: Option<JoinHandle<Vec<u8>>>,
stderr_reader: Option<JoinHandle<Vec<u8>>>,
},
Inprocess(InprocessHandle),
}
/// Spawn a thread that reads a child pipe to EOF into a buffer, so the
/// child can never block on a full pipe.
fn drain_pipe<R: Read + Send + 'static>(mut pipe: R) -> JoinHandle<Vec<u8>> {
std::thread::spawn(move || {
let mut buf = Vec::new();
let _ = pipe.read_to_end(&mut buf);
buf
})
}
impl CompileHandle {
/// Non-blocking poll. `Ok(Some(()))` means "done — call
/// `finish`"; `Ok(None)` means "still running".
pub fn try_wait(&mut self) -> std::io::Result<Option<()>> {
match self {
Self::External { child, .. } => child.try_wait().map(|opt| opt.map(|_| ())),
Self::Inprocess(h) => h.try_wait_mut(),
}
}
/// User-requested cancellation. The TUI's spinner loop fires
/// this when the user presses Esc while a compile is in
/// flight.
///
/// * **External**: send SIGTERM (via `Child::kill`) and reap.
/// * **In-process**: drop the receiver so `into_outcome`
/// short-circuits to a "cancelled" outcome. The worker
/// thread keeps running until typst finishes naturally —
/// typst is deterministic and bounded, so the worst case
/// is a few seconds of CPU after the user gave up.
///
/// Either way the caller should consume the handle with
/// `finish` after `kill` to recover a definite outcome.
pub fn kill(&mut self) {
match self {
Self::External { child, .. } => {
let _ = child.kill();
}
Self::Inprocess(h) => {
h.cancel();
}
}
}
}
/// Engine-aware spawn. Reads `cfg.typst_compile.use_inprocess_engine()`
/// to pick between the external child-process path (default) and the
/// new in-process worker-thread path. The HJSON setting that flips
/// engines is `typst_compile.engine = "inprocess"`; that gate also
/// emits a startup warning when the engine is unavailable in this
/// build (today: never — see `use_inprocess_engine`).
pub fn spawn_with_config(cfg: &Config, typ_path: &Path) -> Result<CompileHandle> {
if cfg.typst_compile.use_inprocess_engine() {
// The project root is the directory that contains the
// assembled `<book>.typ`'s parent grandparent — actually
// the simplest convention is "use the .typ's parent as
// the World root". Book assembly puts every file the
// typst compile needs under `<artefacts>/<book>/`, so
// anchoring there keeps relative imports resolvable.
let root = typ_path
.parent()
.map(|p| p.to_path_buf())
.unwrap_or_else(|| PathBuf::from("."));
let settings =
crate::typst_world::WorldSettings::from_cfg(&cfg.typst_compile);
let handle = spawn_thread(&root, typ_path, settings)?;
return Ok(CompileHandle::Inprocess(handle));
}
spawn_external(typ_path)
}
fn spawn_external(typ_path: &Path) -> Result<CompileHandle> {
let pdf_path = typ_path.with_extension("pdf");
let mut child = Command::new("typst")
.arg("compile")
.arg(typ_path)
.stdout(Stdio::piped())
.stderr(Stdio::piped())
.spawn()
.map_err(|e| {
if e.kind() == std::io::ErrorKind::NotFound {
Error::Store(
"`typst` not found in PATH — install Typst from typst.app/docs/install/ \
or set `typst_compile.engine = \"inprocess\"` in inkhaven.hjson"
.into(),
)
} else {
Error::Store(format!("spawn `typst compile`: {e}"))
}
})?;
// Drain both pipes from spawn so the child can't deadlock on a full
// buffer (H3). `finish` joins these for the captured output.
let stdout_reader = child.stdout.take().map(drain_pipe);
let stderr_reader = child.stderr.take().map(drain_pipe);
Ok(CompileHandle::External {
child,
pdf_path,
stdout_reader,
stderr_reader,
})
}
#[cfg(test)]
mod tests {
use super::*;
use crate::config::Config;
fn cfg_with(engine: &str) -> Config {
let mut cfg = Config::default();
cfg.typst_compile.engine = engine.to_owned();
cfg
}
#[test]
fn engine_summary_internal_default_flags() {
let cfg = cfg_with("inprocess");
let s = engine_summary(&cfg);
assert!(s.starts_with("internal"), "got: {s}");
assert!(s.contains("bundled + system"), "got: {s}");
assert!(s.contains("@preview: on"), "got: {s}");
}
#[test]
fn engine_summary_internal_hermetic() {
let mut cfg = cfg_with("inprocess");
cfg.typst_compile.use_system_fonts = false;
cfg.typst_compile.packages_enabled = false;
let s = engine_summary(&cfg);
assert!(s.contains("fonts: bundled"), "got: {s}");
assert!(s.contains("@preview: off"), "got: {s}");
}
#[test]
fn engine_summary_external_reports_path_or_missing() {
let cfg = cfg_with("external");
let s = engine_summary(&cfg);
assert!(s.starts_with("external"), "got: {s}");
// Either a path or the missing-PATH message — both are
// explicit; we just want one of the two shapes.
assert!(
s.contains("/") || s.contains("NOT FOUND"),
"expected a concrete path or NOT FOUND marker, got: {s}",
);
}
}
/// Consume the handle, recover the final outcome, and return it.
/// Pairs with `spawn` / `spawn_with_config`.
pub fn finish(handle: CompileHandle) -> Result<CompileOutcome> {
match handle {
CompileHandle::External {
mut child,
pdf_path,
stdout_reader,
stderr_reader,
} => {
// The pipes are drained on threads (H3); wait for exit, then
// join the readers to recover the captured output.
let status = child
.wait()
.map_err(|e| Error::Store(format!("wait on `typst compile`: {e}")))?;
let stdout = stdout_reader.and_then(|h| h.join().ok()).unwrap_or_default();
let stderr = stderr_reader.and_then(|h| h.join().ok()).unwrap_or_default();
Ok(CompileOutcome {
success: status.success(),
stderr: String::from_utf8_lossy(&stderr).into_owned(),
stdout: String::from_utf8_lossy(&stdout).into_owned(),
pdf_path,
})
}
CompileHandle::Inprocess(h) => Ok(h.into_outcome()),
}
}