bynk_driver/discovery.rs
1//! Walking a directory tree for `.bynk` files and reading them — the driver's
2//! side of `CompileOptions.sources` (#1077, R2.3/T0.7 residue).
3//!
4//! The real CLI entry points (`project_options`/`try_project_options` below)
5//! now walk and read every file up front, via this module, and hand the
6//! result to `CompileOptions::sources`.
7//!
8//! #1077 review: this module's own original doc claimed the CLI path was
9//! already fully independent of `bynk-emit`'s disk reads — false as written.
10//! `project_options`/`try_project_options` still read `bynk.toml` itself via
11//! `read_project_paths`/`try_read_project_paths`, which reach
12//! `discovery::read_source`'s overlay-miss fallback (`fs::read_to_string`)
13//! with an always-empty overlay — one real disk read inside `bynk-emit` on
14//! every real CLI invocation, unnoticed because `fs_below_driver` scans
15//! `bynk-emit`'s own text, not who calls into it. Both entry points now read
16//! `bynk.toml` themselves (`manifest_overlay`) and hand it to
17//! `try_read_project_paths_with`'s overlay instead, so that read genuinely
18//! moves above `bynk-emit` **when `bynk.toml` exists**. A conventional
19//! project with no manifest at all still reaches `try_read_project_paths_with`
20//! with an empty overlay, which still tries (and fails to find) `bynk.toml`
21//! via `read_source`'s own `fs::read_to_string` before falling back to
22//! `ProjectPaths::conventional` — a real, if harmless (the read fails and is
23//! discarded), disk touch still inside `bynk-emit` for that case.
24//!
25//! `bynk-emit`'s own on-disk discovery (`project::discover_bynk_files`) and
26//! `read_source`'s overlay-miss fallback are **not** removed, and can't be
27//! yet: `analyse_project_with` (the LSP's own analysis path — deleted at
28//! #1541; the equivalent hardcoding now lives in
29//! `bynk_check::analysis::analyse_project`) hardcodes `discovered: None` and
30//! passes an overlay that deliberately covers only open editor buffers — it
31//! depends on that exact fallback to see every other project file, including its own
32//! `bynk.toml` read (`AnalysisRoots::lower`, `bynk-ide/src/lib.rs`, has the
33//! same gap this module just closed for the CLI, unclosed). `#1079`'s issue
34//! text scopes only `bynk-ide`'s `completion.rs`/`symbols.rs` — it does not
35//! mention `analyse_project_with` or the `diagnose_project(&root,
36//! &HashMap::new())` pattern that is `bynk-ide`'s (and `bynkc`'s test suite's)
37//! dominant way of exercising this whole analysis path (100+ call sites
38//! spanning `bynk-ide`'s own inline test modules, `bynk-lsp/tests`, and
39//! `bynkc/tests`) — every one depends on `read_source`'s fallback today.
40//! Closing `discovery.rs` for good needs all of that migrated first, which is
41//! bigger than either #1077 or #1079's issue text currently describes; #1077
42//! stays open pending that combined, design-reviewed effort. `fs_below_driver`
43//! does not move for `bynk-emit` from this module alone.
44
45use std::collections::HashMap;
46use std::path::{Path, PathBuf};
47
48use bynk_emit::project::Roots;
49
50/// An I/O failure while walking a project tree for `.bynk` files, or reading
51/// one found there.
52///
53/// #1081 review: `read_bynk_tree` used to `panic!` on any such failure, on the
54/// premise that every caller was a test fixture. That stopped being true the
55/// moment `project_options`/`try_project_options` (below) became its
56/// production callers — a `bynk.toml` with an `include` root that does not
57/// exist yet (or any other unreadable directory) is a normal, recoverable
58/// input on the live CLI path, not a broken fixture, and `try_project_options`
59/// already has a `Result` error channel for exactly this kind of thing.
60#[derive(Debug)]
61pub struct DiscoveryError {
62 path: PathBuf,
63 source: std::io::Error,
64}
65
66impl std::fmt::Display for DiscoveryError {
67 fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
68 write!(
69 f,
70 "could not read project files under `{}`: {}",
71 self.path.display(),
72 self.source
73 )
74 }
75}
76
77impl std::error::Error for DiscoveryError {
78 fn source(&self) -> Option<&(dyn std::error::Error + 'static)> {
79 Some(&self.source)
80 }
81}
82
83/// Walk `root` for every `.bynk` file (skipping `excludes` and hidden
84/// directories, mirroring `bynk-emit`'s former `discover_bynk_files` exactly)
85/// and read each one's content. Keys are the same literal (non-canonicalised)
86/// path shape a plain recursive walk produces — `CompileOptions.sources`'s own
87/// contract, and what `read_source`'s overlay lookup tries first.
88pub fn read_bynk_tree(
89 root: &Path,
90 excludes: &[PathBuf],
91) -> Result<HashMap<PathBuf, String>, DiscoveryError> {
92 let mut out = HashMap::new();
93 let is_excluded = |dir: &Path| {
94 excludes.iter().any(|ex| dir == ex || dir.starts_with(ex))
95 || dir
96 .file_name()
97 .and_then(|n| n.to_str())
98 .is_some_and(|n| n.starts_with('.') && n != ".")
99 };
100 let to_err = |path: &Path, source: std::io::Error| DiscoveryError {
101 path: path.to_path_buf(),
102 source,
103 };
104 let mut stack = vec![root.to_path_buf()];
105 while let Some(dir) = stack.pop() {
106 let rd = std::fs::read_dir(&dir).map_err(|e| to_err(&dir, e))?;
107 for entry in rd {
108 let entry = entry.map_err(|e| to_err(&dir, e))?;
109 let p = entry.path();
110 if p.is_dir() {
111 if !is_excluded(&p) {
112 stack.push(p);
113 }
114 } else if p.extension().and_then(|e| e.to_str()) == Some("bynk") {
115 let text = std::fs::read_to_string(&p).map_err(|e| to_err(&p, e))?;
116 out.insert(p, text);
117 }
118 }
119 }
120 Ok(out)
121}
122
123/// [`read_bynk_tree`] with no excludes — the common case for a single-root
124/// project (`CompileOptions::single`, whose own `Roots::excludes()` is always
125/// empty) and for test fixtures, which rarely declare an `exclude` list.
126pub fn read_bynk_tree_single(root: &Path) -> Result<HashMap<PathBuf, String>, DiscoveryError> {
127 read_bynk_tree(root, &[])
128}
129
130/// [`read_bynk_tree`] merged across every one of a split project's `include`
131/// roots, matching `Roots::trees`' shape — the primary root's `paths.exclude`
132/// (plus the tool's own `out`/`node_modules` caches) applies to all of them.
133///
134/// R3.9 (#1113): walks every tree `Roots::trees` resolves to, not a hardcoded
135/// primary/secondary pair. `trees[0]` is mandatory (a missing directory is a
136/// real [`DiscoveryError`], same as any other unreadable directory); every
137/// later tree is optional — a conventional `src`-only project simply has no
138/// `tests/` at all — so only its absence is tolerated. Tried via
139/// `read_bynk_tree` itself (a `fs::read_dir`) and its `NotFound` caught for
140/// an optional tree, rather than a `root.exists()` pre-check, which would
141/// cost a redundant `stat()` per optional tree for the same answer.
142///
143/// Only a `NotFound` reported *for the root itself* is tolerated — matched by
144/// `e.path == *root`, true only for the walk's very first `fs::read_dir`
145/// call. A `NotFound` for anything deeper (a dangling symlink, a
146/// subdirectory removed mid-walk) means the tree exists and had real files;
147/// swallowing that would silently discard everything `read_bynk_tree` had
148/// already collected for it, with no diagnostic — a review-caught defect in
149/// an earlier cut of this fix, which matched on the error's `io::ErrorKind`
150/// alone regardless of which path it named.
151pub fn read_bynk_tree_split(
152 trees: &[PathBuf],
153 excludes: &[PathBuf],
154) -> Result<HashMap<PathBuf, String>, DiscoveryError> {
155 let mut out = HashMap::new();
156 for (i, root) in trees.iter().enumerate() {
157 match read_bynk_tree(root, excludes) {
158 Ok(files) => out.extend(files),
159 Err(e)
160 if i > 0 && &e.path == root && e.source.kind() == std::io::ErrorKind::NotFound => {}
161 Err(e) => return Err(e),
162 }
163 }
164 Ok(out)
165}
166
167/// The complete `CompileOptions.sources` map for a project rooted at `roots`.
168///
169/// #1081 review: this used to re-implement `Roots::resolve`/`Roots::excludes`
170/// verbatim (down to the hardcoded `out`/`node_modules` cache list) because
171/// those were private to `bynk-emit`. Now that they're `pub` (moved to
172/// `bynk-project`, #1113), this calls them directly — one definition of
173/// "which files are in this project", shared by the CLI's own walk and
174/// `compile_project`'s in-memory partitioning, so the two can no longer drift.
175pub fn sources_for_roots(roots: &Roots) -> Result<HashMap<PathBuf, String>, DiscoveryError> {
176 let trees: Vec<PathBuf> = roots.trees().into_iter().map(|(root, _)| root).collect();
177 read_bynk_tree_split(&trees, &roots.excludes())
178}
179
180#[cfg(test)]
181mod tests {
182 use super::*;
183 use bynk_emit::project::{ProjectPaths, try_read_project_paths};
184 use std::fs;
185
186 /// A throwaway on-disk directory tree, removed on drop (including on
187 /// panic) — mirrors `bynk-driver/tests/project_diagnostics.rs`'s own
188 /// `Scratch` helper.
189 struct Scratch(PathBuf);
190 impl Drop for Scratch {
191 fn drop(&mut self) {
192 let _ = fs::remove_dir_all(&self.0);
193 }
194 }
195
196 fn scratch(tag: &str, files: &[(&str, &str)]) -> Scratch {
197 let dir = std::env::temp_dir().join(format!(
198 "bynk_driver_discovery_{tag}_{}_{:?}",
199 std::process::id(),
200 std::thread::current().id()
201 ));
202 let _ = fs::remove_dir_all(&dir);
203 for (rel, body) in files {
204 let p = dir.join(rel);
205 fs::create_dir_all(p.parent().unwrap()).unwrap();
206 fs::write(&p, body).unwrap();
207 }
208 Scratch(dir)
209 }
210
211 #[test]
212 fn walks_nested_files_and_skips_hidden_directories() {
213 let root = scratch(
214 "hidden",
215 &[
216 ("a.bynk", "context a\n"),
217 ("nested/b.bynk", "context b\n"),
218 (".git/c.bynk", "context c\n"),
219 ],
220 );
221 let found = read_bynk_tree(&root.0, &[]).expect("a real tree must not error");
222 assert_eq!(
223 found.len(),
224 2,
225 "found: {:?}",
226 found.keys().collect::<Vec<_>>()
227 );
228 assert!(found.contains_key(&root.0.join("a.bynk")));
229 assert!(found.contains_key(&root.0.join("nested/b.bynk")));
230 }
231
232 #[test]
233 fn excludes_skip_the_named_subtree() {
234 let root = scratch(
235 "excludes",
236 &[("a.bynk", "context a\n"), ("out/b.bynk", "context b\n")],
237 );
238 let found = read_bynk_tree(&root.0, &[root.0.join("out")]).expect("must not error");
239 assert_eq!(found.len(), 1);
240 assert!(found.contains_key(&root.0.join("a.bynk")));
241 }
242
243 #[test]
244 fn an_empty_tree_is_not_an_error() {
245 let root = scratch("empty", &[(".keep", "")]);
246 let found = read_bynk_tree(&root.0, &[]).expect("an empty tree is a valid, empty result");
247 assert!(found.is_empty());
248 }
249
250 #[test]
251 fn a_missing_root_is_a_discovery_error_not_a_panic() {
252 let missing = std::env::temp_dir().join(format!(
253 "bynk_driver_discovery_missing_{}_{:?}",
254 std::process::id(),
255 std::thread::current().id()
256 ));
257 let _ = fs::remove_dir_all(&missing);
258 let err = read_bynk_tree(&missing, &[]).expect_err("a nonexistent root must not panic");
259 assert!(err.to_string().contains(&missing.display().to_string()));
260 }
261
262 #[test]
263 fn split_secondary_root_is_optional_but_primary_is_not() {
264 // `tests/` need not exist for a `src`-only project.
265 let root = scratch("split_no_secondary", &[("src/a.bynk", "context a\n")]);
266 let found = read_bynk_tree_split(&[root.0.join("src"), root.0.join("tests")], &[])
267 .expect("a missing secondary root is tolerated");
268 assert_eq!(found.len(), 1);
269
270 // A missing *primary* root is a real error, matching the review's
271 // "missing include root panics instead of erroring" finding.
272 let missing_primary = root.0.join("does-not-exist");
273 read_bynk_tree_split(&[missing_primary, root.0.join("tests")], &[])
274 .expect_err("a missing primary root must error, not panic");
275 }
276
277 /// Regression (code review of the #1114 fix itself): an earlier cut of
278 /// the optional-tree `NotFound` tolerance matched on `io::ErrorKind`
279 /// alone, regardless of *which path* the error named — so a `NotFound`
280 /// anywhere inside an *existing* optional tree's walk (a dangling
281 /// symlink, a subdirectory removed mid-walk) was silently treated the
282 /// same as the tree itself being absent, discarding every real file
283 /// `read_bynk_tree` had already collected for it with no diagnostic.
284 /// Only a `NotFound` for the root itself should be tolerated.
285 #[cfg(unix)]
286 #[test]
287 fn a_dangling_symlink_deep_in_an_optional_tree_is_a_real_error_not_a_silent_drop() {
288 let root = scratch(
289 "split_dangling_symlink",
290 &[("src/a.bynk", "context a\n"), ("tests/b.bynk", "suite a\n")],
291 );
292 // The tree itself (`tests/`) exists and has a real `.bynk` file
293 // already collected by the time the walk reaches this dangling
294 // entry — `NotFound` here must not look like "no such optional
295 // tree."
296 std::os::unix::fs::symlink(
297 root.0.join("tests/does-not-exist.bynk"),
298 root.0.join("tests/dangling.bynk"),
299 )
300 .expect("symlink creation must succeed on unix");
301 let err = read_bynk_tree_split(&[root.0.join("src"), root.0.join("tests")], &[])
302 .expect_err("a NotFound deep in an existing optional tree's walk must still error");
303 assert!(
304 err.to_string().contains("dangling.bynk"),
305 "the error must name the file that actually failed: {err}"
306 );
307 }
308
309 /// R3.9 (#1113): three or more `include` roots are all merged — not just
310 /// the first two — exercised through `sources_for_roots` the way
311 /// `project_options` calls it — the file set a real `bynk.toml` project
312 /// resolves to.
313 #[test]
314 fn sources_for_roots_merges_three_or_more_include_roots() {
315 let root = scratch(
316 "many_includes",
317 &[
318 (
319 "bynk.toml",
320 "[project]\nname = \"x\"\n\n[paths]\ninclude = [\"src\", \"tests\", \"examples\"]\n",
321 ),
322 ("src/a.bynk", "context a\n"),
323 ("tests/a.bynk", "suite a\n"),
324 ("examples/e.bynk", "context e\n"),
325 ],
326 );
327 let paths: ProjectPaths =
328 try_read_project_paths(&root.0).expect("well-formed fixture manifest");
329 let roots = Roots::Split {
330 project_root: root.0.clone(),
331 paths,
332 };
333 let found = sources_for_roots(&roots).expect("a well-formed project must not error");
334 assert_eq!(
335 found.len(),
336 3,
337 "found: {:?}",
338 found.keys().collect::<Vec<_>>()
339 );
340 assert!(found.contains_key(&root.0.join("src/a.bynk")));
341 assert!(found.contains_key(&root.0.join("tests/a.bynk")));
342 assert!(found.contains_key(&root.0.join("examples/e.bynk")));
343 }
344
345 /// The `include.len()` == 0/1/2 branches, exercised through
346 /// `sources_for_roots` the way `project_options` calls it — the file set
347 /// a real `bynk.toml` project resolves to.
348 #[test]
349 fn sources_for_roots_matches_a_conventional_split_project() {
350 let root = scratch(
351 "conventional",
352 &[
353 ("bynk.toml", "[project]\nname = \"x\"\n"),
354 ("src/a.bynk", "context a\n"),
355 ("tests/a.bynk", "suite a\n"),
356 ],
357 );
358 let paths: ProjectPaths =
359 try_read_project_paths(&root.0).expect("well-formed fixture manifest");
360 let roots = Roots::Split {
361 project_root: root.0.clone(),
362 paths,
363 };
364 let found = sources_for_roots(&roots).expect("a well-formed project must not error");
365 assert_eq!(found.len(), 2);
366 assert!(found.contains_key(&root.0.join("src/a.bynk")));
367 assert!(found.contains_key(&root.0.join("tests/a.bynk")));
368 }
369
370 #[test]
371 fn sources_for_roots_on_a_flat_include_root_excludes_its_own_caches() {
372 // `include = ["."]` (`ProjectPaths::conventional`'s flat fallback):
373 // one root, and `node_modules`/`out` must still be swept out of it.
374 let root = scratch(
375 "flat",
376 &[
377 ("bynk.toml", "[project]\nname = \"x\"\n"),
378 ("a.bynk", "context a\n"),
379 ("node_modules/dep.bynk", "context dep\n"),
380 ("out/built.bynk", "context built\n"),
381 ],
382 );
383 let paths = ProjectPaths {
384 include: vec![PathBuf::from(".")],
385 exclude: Vec::new(),
386 };
387 let roots = Roots::Split {
388 project_root: root.0.clone(),
389 paths,
390 };
391 let found = sources_for_roots(&roots).expect("must not error");
392 assert_eq!(
393 found.len(),
394 1,
395 "found: {:?}",
396 found.keys().collect::<Vec<_>>()
397 );
398 assert!(found.contains_key(&root.0.join("a.bynk")));
399 }
400}