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/// #1883, slice 1b: the project's `assets/` folder, listed
84/// ([`bynk_emit::project::assets::AssetFolder::on_disk`]) for
85/// `CompileOptions::asset_files`. No file's bytes are read here: the build
86/// reads only the files a declaration names. A missing folder is empty; an
87/// unlistable one is a [`DiscoveryError`] naming the folder.
88pub fn list_asset_folder(
89 project_root: &Path,
90) -> Result<bynk_emit::project::assets::AssetFolder, DiscoveryError> {
91 bynk_emit::project::assets::AssetFolder::on_disk(project_root).map_err(|source| {
92 DiscoveryError {
93 path: project_root.join(bynk_emit::project::assets::PROJECT_ASSETS_DIR),
94 source,
95 }
96 })
97}
98
99/// Walk `root` for every `.bynk` file (skipping `excludes` and hidden
100/// directories, mirroring `bynk-emit`'s former `discover_bynk_files` exactly)
101/// and read each one's content. Keys are the same literal (non-canonicalised)
102/// path shape a plain recursive walk produces — `CompileOptions.sources`'s own
103/// contract, and what `read_source`'s overlay lookup tries first.
104pub fn read_bynk_tree(
105 root: &Path,
106 excludes: &[PathBuf],
107) -> Result<HashMap<PathBuf, String>, DiscoveryError> {
108 let mut out = HashMap::new();
109 let is_excluded = |dir: &Path| {
110 excludes.iter().any(|ex| dir == ex || dir.starts_with(ex))
111 || dir
112 .file_name()
113 .and_then(|n| n.to_str())
114 .is_some_and(|n| n.starts_with('.') && n != ".")
115 };
116 let to_err = |path: &Path, source: std::io::Error| DiscoveryError {
117 path: path.to_path_buf(),
118 source,
119 };
120 let mut stack = vec![root.to_path_buf()];
121 while let Some(dir) = stack.pop() {
122 let rd = std::fs::read_dir(&dir).map_err(|e| to_err(&dir, e))?;
123 for entry in rd {
124 let entry = entry.map_err(|e| to_err(&dir, e))?;
125 let p = entry.path();
126 if p.is_dir() {
127 if !is_excluded(&p) {
128 stack.push(p);
129 }
130 } else if p.extension().and_then(|e| e.to_str()) == Some("bynk") {
131 let text = std::fs::read_to_string(&p).map_err(|e| to_err(&p, e))?;
132 out.insert(p, text);
133 }
134 }
135 }
136 Ok(out)
137}
138
139/// [`read_bynk_tree`] with no excludes — the common case for a single-root
140/// project (`CompileOptions::single`, whose own `Roots::excludes()` is always
141/// empty) and for test fixtures, which rarely declare an `exclude` list.
142pub fn read_bynk_tree_single(root: &Path) -> Result<HashMap<PathBuf, String>, DiscoveryError> {
143 read_bynk_tree(root, &[])
144}
145
146/// [`read_bynk_tree`] merged across every one of a split project's `include`
147/// roots, matching `Roots::trees`' shape — the primary root's `paths.exclude`
148/// (plus the tool's own `out`/`node_modules` caches) applies to all of them.
149///
150/// R3.9 (#1113): walks every tree `Roots::trees` resolves to, not a hardcoded
151/// primary/secondary pair. `trees[0]` is mandatory (a missing directory is a
152/// real [`DiscoveryError`], same as any other unreadable directory); every
153/// later tree is optional — a conventional `src`-only project simply has no
154/// `tests/` at all — so only its absence is tolerated. Tried via
155/// `read_bynk_tree` itself (a `fs::read_dir`) and its `NotFound` caught for
156/// an optional tree, rather than a `root.exists()` pre-check, which would
157/// cost a redundant `stat()` per optional tree for the same answer.
158///
159/// Only a `NotFound` reported *for the root itself* is tolerated — matched by
160/// `e.path == *root`, true only for the walk's very first `fs::read_dir`
161/// call. A `NotFound` for anything deeper (a dangling symlink, a
162/// subdirectory removed mid-walk) means the tree exists and had real files;
163/// swallowing that would silently discard everything `read_bynk_tree` had
164/// already collected for it, with no diagnostic — a review-caught defect in
165/// an earlier cut of this fix, which matched on the error's `io::ErrorKind`
166/// alone regardless of which path it named.
167pub fn read_bynk_tree_split(
168 trees: &[PathBuf],
169 excludes: &[PathBuf],
170) -> Result<HashMap<PathBuf, String>, DiscoveryError> {
171 let mut out = HashMap::new();
172 for (i, root) in trees.iter().enumerate() {
173 match read_bynk_tree(root, excludes) {
174 Ok(files) => out.extend(files),
175 Err(e)
176 if i > 0 && &e.path == root && e.source.kind() == std::io::ErrorKind::NotFound => {}
177 Err(e) => return Err(e),
178 }
179 }
180 Ok(out)
181}
182
183/// The complete `CompileOptions.sources` map for a project rooted at `roots`.
184///
185/// #1081 review: this used to re-implement `Roots::resolve`/`Roots::excludes`
186/// verbatim (down to the hardcoded `out`/`node_modules` cache list) because
187/// those were private to `bynk-emit`. Now that they're `pub` (moved to
188/// `bynk-project`, #1113), this calls them directly — one definition of
189/// "which files are in this project", shared by the CLI's own walk and
190/// `compile_project`'s in-memory partitioning, so the two can no longer drift.
191pub fn sources_for_roots(roots: &Roots) -> Result<HashMap<PathBuf, String>, DiscoveryError> {
192 let mut trees: Vec<PathBuf> = roots.trees().into_iter().map(|(root, _)| root).collect();
193 // #2223: and each path dependency's trees, computed as `compile_project`
194 // computes them, so its partitioning finds every dependency file a home.
195 if let Roots::Split { project_root, .. } = roots {
196 trees.extend(
197 bynk_emit::project::dependency_trees(project_root, &HashMap::new())
198 .into_iter()
199 .map(|(root, _)| root),
200 );
201 }
202 read_bynk_tree_split(&trees, &roots.excludes())
203}
204
205#[cfg(test)]
206mod tests {
207 use super::*;
208 use bynk_emit::project::{ProjectPaths, try_read_project_paths};
209 use std::fs;
210
211 /// A throwaway on-disk directory tree, removed on drop (including on
212 /// panic) — mirrors `bynk-driver/tests/project_diagnostics.rs`'s own
213 /// `Scratch` helper.
214 struct Scratch(PathBuf);
215 impl Drop for Scratch {
216 fn drop(&mut self) {
217 let _ = fs::remove_dir_all(&self.0);
218 }
219 }
220
221 fn scratch(tag: &str, files: &[(&str, &str)]) -> Scratch {
222 let dir = std::env::temp_dir().join(format!(
223 "bynk_driver_discovery_{tag}_{}_{:?}",
224 std::process::id(),
225 std::thread::current().id()
226 ));
227 let _ = fs::remove_dir_all(&dir);
228 for (rel, body) in files {
229 let p = dir.join(rel);
230 fs::create_dir_all(p.parent().unwrap()).unwrap();
231 fs::write(&p, body).unwrap();
232 }
233 Scratch(dir)
234 }
235
236 #[test]
237 fn walks_nested_files_and_skips_hidden_directories() {
238 let root = scratch(
239 "hidden",
240 &[
241 ("a.bynk", "context a\n"),
242 ("nested/b.bynk", "context b\n"),
243 (".git/c.bynk", "context c\n"),
244 ],
245 );
246 let found = read_bynk_tree(&root.0, &[]).expect("a real tree must not error");
247 assert_eq!(
248 found.len(),
249 2,
250 "found: {:?}",
251 found.keys().collect::<Vec<_>>()
252 );
253 assert!(found.contains_key(&root.0.join("a.bynk")));
254 assert!(found.contains_key(&root.0.join("nested/b.bynk")));
255 }
256
257 #[test]
258 fn excludes_skip_the_named_subtree() {
259 let root = scratch(
260 "excludes",
261 &[("a.bynk", "context a\n"), ("out/b.bynk", "context b\n")],
262 );
263 let found = read_bynk_tree(&root.0, &[root.0.join("out")]).expect("must not error");
264 assert_eq!(found.len(), 1);
265 assert!(found.contains_key(&root.0.join("a.bynk")));
266 }
267
268 #[test]
269 fn an_empty_tree_is_not_an_error() {
270 let root = scratch("empty", &[(".keep", "")]);
271 let found = read_bynk_tree(&root.0, &[]).expect("an empty tree is a valid, empty result");
272 assert!(found.is_empty());
273 }
274
275 #[test]
276 fn a_missing_root_is_a_discovery_error_not_a_panic() {
277 let missing = std::env::temp_dir().join(format!(
278 "bynk_driver_discovery_missing_{}_{:?}",
279 std::process::id(),
280 std::thread::current().id()
281 ));
282 let _ = fs::remove_dir_all(&missing);
283 let err = read_bynk_tree(&missing, &[]).expect_err("a nonexistent root must not panic");
284 assert!(err.to_string().contains(&missing.display().to_string()));
285 }
286
287 #[test]
288 fn split_secondary_root_is_optional_but_primary_is_not() {
289 // `tests/` need not exist for a `src`-only project.
290 let root = scratch("split_no_secondary", &[("src/a.bynk", "context a\n")]);
291 let found = read_bynk_tree_split(&[root.0.join("src"), root.0.join("tests")], &[])
292 .expect("a missing secondary root is tolerated");
293 assert_eq!(found.len(), 1);
294
295 // A missing *primary* root is a real error, matching the review's
296 // "missing include root panics instead of erroring" finding.
297 let missing_primary = root.0.join("does-not-exist");
298 read_bynk_tree_split(&[missing_primary, root.0.join("tests")], &[])
299 .expect_err("a missing primary root must error, not panic");
300 }
301
302 /// Regression (code review of the #1114 fix itself): an earlier cut of
303 /// the optional-tree `NotFound` tolerance matched on `io::ErrorKind`
304 /// alone, regardless of *which path* the error named — so a `NotFound`
305 /// anywhere inside an *existing* optional tree's walk (a dangling
306 /// symlink, a subdirectory removed mid-walk) was silently treated the
307 /// same as the tree itself being absent, discarding every real file
308 /// `read_bynk_tree` had already collected for it with no diagnostic.
309 /// Only a `NotFound` for the root itself should be tolerated.
310 #[cfg(unix)]
311 #[test]
312 fn a_dangling_symlink_deep_in_an_optional_tree_is_a_real_error_not_a_silent_drop() {
313 let root = scratch(
314 "split_dangling_symlink",
315 &[("src/a.bynk", "context a\n"), ("tests/b.bynk", "suite a\n")],
316 );
317 // The tree itself (`tests/`) exists and has a real `.bynk` file
318 // already collected by the time the walk reaches this dangling
319 // entry — `NotFound` here must not look like "no such optional
320 // tree."
321 std::os::unix::fs::symlink(
322 root.0.join("tests/does-not-exist.bynk"),
323 root.0.join("tests/dangling.bynk"),
324 )
325 .expect("symlink creation must succeed on unix");
326 let err = read_bynk_tree_split(&[root.0.join("src"), root.0.join("tests")], &[])
327 .expect_err("a NotFound deep in an existing optional tree's walk must still error");
328 assert!(
329 err.to_string().contains("dangling.bynk"),
330 "the error must name the file that actually failed: {err}"
331 );
332 }
333
334 /// R3.9 (#1113): three or more `include` roots are all merged — not just
335 /// the first two — exercised through `sources_for_roots` the way
336 /// `project_options` calls it — the file set a real `bynk.toml` project
337 /// resolves to.
338 #[test]
339 fn sources_for_roots_merges_three_or_more_include_roots() {
340 let root = scratch(
341 "many_includes",
342 &[
343 (
344 "bynk.toml",
345 "[project]\nname = \"x\"\n\n[paths]\ninclude = [\"src\", \"tests\", \"examples\"]\n",
346 ),
347 ("src/a.bynk", "context a\n"),
348 ("tests/a.bynk", "suite a\n"),
349 ("examples/e.bynk", "context e\n"),
350 ],
351 );
352 let paths: ProjectPaths =
353 try_read_project_paths(&root.0).expect("well-formed fixture manifest");
354 let roots = Roots::Split {
355 project_root: root.0.clone(),
356 paths,
357 };
358 let found = sources_for_roots(&roots).expect("a well-formed project must not error");
359 assert_eq!(
360 found.len(),
361 3,
362 "found: {:?}",
363 found.keys().collect::<Vec<_>>()
364 );
365 assert!(found.contains_key(&root.0.join("src/a.bynk")));
366 assert!(found.contains_key(&root.0.join("tests/a.bynk")));
367 assert!(found.contains_key(&root.0.join("examples/e.bynk")));
368 }
369
370 /// The `include.len()` == 0/1/2 branches, exercised through
371 /// `sources_for_roots` the way `project_options` calls it — the file set
372 /// a real `bynk.toml` project resolves to.
373 #[test]
374 fn sources_for_roots_matches_a_conventional_split_project() {
375 let root = scratch(
376 "conventional",
377 &[
378 ("bynk.toml", "[project]\nname = \"x\"\n"),
379 ("src/a.bynk", "context a\n"),
380 ("tests/a.bynk", "suite a\n"),
381 ],
382 );
383 let paths: ProjectPaths =
384 try_read_project_paths(&root.0).expect("well-formed fixture manifest");
385 let roots = Roots::Split {
386 project_root: root.0.clone(),
387 paths,
388 };
389 let found = sources_for_roots(&roots).expect("a well-formed project must not error");
390 assert_eq!(found.len(), 2);
391 assert!(found.contains_key(&root.0.join("src/a.bynk")));
392 assert!(found.contains_key(&root.0.join("tests/a.bynk")));
393 }
394
395 #[test]
396 fn sources_for_roots_on_a_flat_include_root_excludes_its_own_caches() {
397 // `include = ["."]` (`ProjectPaths::conventional`'s flat fallback):
398 // one root, and `node_modules`/`out` must still be swept out of it.
399 let root = scratch(
400 "flat",
401 &[
402 ("bynk.toml", "[project]\nname = \"x\"\n"),
403 ("a.bynk", "context a\n"),
404 ("node_modules/dep.bynk", "context dep\n"),
405 ("out/built.bynk", "context built\n"),
406 ],
407 );
408 let paths = ProjectPaths {
409 include: vec![PathBuf::from(".")],
410 exclude: Vec::new(),
411 };
412 let roots = Roots::Split {
413 project_root: root.0.clone(),
414 paths,
415 };
416 let found = sources_for_roots(&roots).expect("must not error");
417 assert_eq!(
418 found.len(),
419 1,
420 "found: {:?}",
421 found.keys().collect::<Vec<_>>()
422 );
423 assert!(found.contains_key(&root.0.join("a.bynk")));
424 }
425}