Skip to content

Remove BuildOptions #18

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
TheKnarf wants to merge 1 commit into from
Closed

Remove BuildOptions #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/analysis.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ mod tests {
let root = fs.root();

let logger = crate::EmptyLogger;
let graph = build_dependency_graph(&root, Default::default(), &logger).unwrap();
let graph = build_dependency_graph(&root, None, &logger).unwrap();
let folder_idx = graph
.node_indices()
.find(|i| graph[*i].name == "foo" && graph[*i].kind == NodeKind::Folder)
Expand All @@ -125,7 +125,7 @@ mod tests {
let root = fs.root();

let logger = crate::EmptyLogger;
let graph = build_dependency_graph(&root, Default::default(), &logger).unwrap();
let graph = build_dependency_graph(&root, None, &logger).unwrap();
let js_idx = graph
.node_indices()
.find(|i| graph[*i].name == "index.js" && graph[*i].kind == NodeKind::File)
Expand All @@ -147,7 +147,7 @@ mod tests {
let fs = TestFS::new([("index.js", "import './b.js';"), ("b.js", "")]);
let root = fs.root();
let logger = crate::EmptyLogger;
let graph = build_dependency_graph(&root, Default::default(), &logger).unwrap();
let graph = build_dependency_graph(&root, None, &logger).unwrap();
let json = graph_to_json(&filter_graph(&graph, true, true, false, true, true, &[]));
assert!(json.contains("index.js"));
assert!(json.contains("b.js"));
Expand All @@ -158,7 +158,7 @@ mod tests {
let fs = TestFS::new([("a.js", ""), ("b.js", "")]);
let root = fs.root();
let logger = crate::EmptyLogger;
let graph = build_dependency_graph(&root, Default::default(), &logger).unwrap();
let graph = build_dependency_graph(&root, None, &logger).unwrap();
let dot = graph_to_dot(&filter_graph(
&graph,
true,
Expand Down
61 changes: 21 additions & 40 deletions src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,23 +51,6 @@ pub struct Node {
pub kind: NodeKind,
}

#[derive(Clone, Copy)]
pub struct BuildOptions {
pub workers: Option<usize>,
pub verbose: bool,
pub color: bool,
}

impl Default for BuildOptions {
fn default() -> Self {
Self {
workers: None,
verbose: false,
color: true,
}
}
}

pub(crate) fn ensure_folders(
rel: &str,
data: &mut types::GraphCtx,
Expand Down Expand Up @@ -105,13 +88,11 @@ pub(crate) fn ensure_folders(
/// Build a dependency graph of all JS/TS files within `root`.
pub fn build_dependency_graph(
root: &VfsPath,
opts: BuildOptions,
workers: Option<usize>,
logger: &dyn Logger,
) -> anyhow::Result<DiGraph<Node, ()>> {
let files = traversal::collect_files(root, logger)?;
if opts.verbose {
logger.log(LogLevel::Debug, &format!("found {} files", files.len()));
}
logger.log(LogLevel::Debug, &format!("found {} files", files.len()));
let aliases = load_tsconfig_aliases(root, logger)?;
let ctx = types::Context {
root,
Expand All @@ -124,10 +105,11 @@ pub fn build_dependency_graph(
Box::new(types::js::JsParser),
Box::new(types::html::HtmlParser),
];
let workers = opts.workers.unwrap_or_else(|| num_cpus::get());
if opts.verbose {
logger.log(LogLevel::Debug, &format!("using {} worker threads", workers));
}
let workers = workers.unwrap_or_else(|| num_cpus::get());
logger.log(
LogLevel::Debug,
&format!("using {} worker threads", workers),
);
let edges: Arc<Mutex<Vec<types::Edge>>> = Arc::new(Mutex::new(Vec::new()));
let pool = rayon::ThreadPoolBuilder::new()
.num_threads(workers)
Expand All @@ -137,22 +119,19 @@ pub fn build_dependency_graph(
for path in &files {
let parsers = &parsers;
let ctx = &ctx;
let verbose = opts.verbose;
let edges = edges.clone();
let path_clone = path.clone();
let should_parse = parsers.iter().any(|p| p.can_parse(&path_clone));
if should_parse {
parsed_files.push(path_clone.clone());
}
s.spawn(move |_| {
if verbose {
ctx.logger.log(LogLevel::Debug, &format!("file: {}", path_clone.as_str()));
}
ctx.logger
.log(LogLevel::Debug, &format!("file: {}", path_clone.as_str()));
for p in parsers {
if p.can_parse(&path_clone) {
if verbose {
ctx.logger.log(LogLevel::Debug, &format!(" parser {}", p.name()));
}
ctx.logger
.log(LogLevel::Debug, &format!(" parser {}", p.name()));
match p.parse(&path_clone, ctx) {
Ok(mut es) => {
if !es.is_empty() {
Expand Down Expand Up @@ -243,12 +222,14 @@ pub fn build_dependency_graph(
}

let res = data.graph;
if opts.verbose {
logger.log(
LogLevel::Debug,
&format!("graph: nodes={}, edges={}", res.node_count(), res.edge_count()),
);
}
logger.log(
LogLevel::Debug,
&format!(
"graph: nodes={}, edges={}",
res.node_count(),
res.edge_count()
),
);
Ok(res)
}

Expand All @@ -265,7 +246,7 @@ mod tests {
let root = fs.root();

let logger = EmptyLogger;
let graph = build_dependency_graph(&root, Default::default(), &logger).unwrap();
let graph = build_dependency_graph(&root, None, &logger).unwrap();
let a_idx = graph
.node_indices()
.find(|i| graph[*i].name == "a.js" && graph[*i].kind == NodeKind::File)
Expand All @@ -289,7 +270,7 @@ mod tests {
let fs = TestFS::new(entries.iter().map(|(p,c)| (p.as_str(), c.as_slice())));
let path = fs.root().join("proj").unwrap();
let logger = EmptyLogger;
let graph = build_dependency_graph(&path, Default::default(), &logger).unwrap();
let graph = build_dependency_graph(&path, None, &logger).unwrap();

let main_rel = format!("src/main.{ext_a}");
let util_rel = format!("lib/util.{ext_b}");
Expand Down
22 changes: 9 additions & 13 deletions src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,22 +73,18 @@ fn default_color() -> bool {
fn main() -> anyhow::Result<()> {
let args = Args::parse();
let root: VfsPath = PhysicalFS::new(&args.path).into();
let logger = dep::ConsoleLogger { color: args.color, verbose: args.verbose };
let mut graph = dep::build_dependency_graph(
&root,
dep::BuildOptions {
workers: args.workers,
verbose: args.verbose,
color: args.color,
},
&logger,
)?;
let logger = dep::ConsoleLogger {
color: args.color,
verbose: args.verbose,
};
let mut graph = dep::build_dependency_graph(&root, args.workers, &logger)?;
if args.prune {
let before = graph.node_count();
dep::prune_unconnected(&mut graph);
if args.verbose {
logger.log(LogLevel::Debug, &format!("pruned {} nodes", before - graph.node_count()));
}
logger.log(
LogLevel::Debug,
&format!("pruned {} nodes", before - graph.node_count()),
);
}
let filtered = dep::filter_graph(
&graph,
Expand Down
2 changes: 1 addition & 1 deletion src/output/json.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ mod tests {
let fs = TestFS::new([("index.js", "import './b.js';"), ("b.js", "")]);
let root = fs.root();
let logger = crate::EmptyLogger;
let graph = build_dependency_graph(&root, Default::default(), &logger).unwrap();
let graph = build_dependency_graph(&root, None, &logger).unwrap();
let json = graph_to_json(&filter_graph(&graph, true, true, false, true, true, &[]));
assert!(json.contains("index.js"));
assert!(json.contains("b.js"));
Expand Down
8 changes: 4 additions & 4 deletions src/tsconfig.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ mod tests {
]);
let root = fs.root();
let logger = crate::EmptyLogger;
let graph = build_dependency_graph(&root, Default::default(), &logger).unwrap();
let graph = build_dependency_graph(&root, None, &logger).unwrap();

let idx_index = graph
.node_indices()
Expand All @@ -113,7 +113,7 @@ mod tests {
]);
let root = fs.root();
let logger = crate::EmptyLogger;
let graph = build_dependency_graph(&root, Default::default(), &logger).unwrap();
let graph = build_dependency_graph(&root, None, &logger).unwrap();

let idx_index = graph
.node_indices()
Expand All @@ -139,7 +139,7 @@ mod tests {
]);
let root = fs.root();
let logger = crate::EmptyLogger;
let graph = build_dependency_graph(&root, Default::default(), &logger).unwrap();
let graph = build_dependency_graph(&root, None, &logger).unwrap();

let idx_a = graph
.node_indices()
Expand Down Expand Up @@ -169,7 +169,7 @@ mod tests {
let fs = TestFS::new([("tsconfig.json", "not json"), ("index.ts", "")]);
let root = fs.root();
let logger = crate::EmptyLogger;
let res = build_dependency_graph(&root, Default::default(), &logger);
let res = build_dependency_graph(&root, None, &logger);
assert!(res.is_ok());
}
}
4 changes: 2 additions & 2 deletions src/types/html.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ mod tests {
]);
let root = fs.root();
let logger = crate::EmptyLogger;
let graph = build_dependency_graph(&root, Default::default(), &logger).unwrap();
let graph = build_dependency_graph(&root, None, &logger).unwrap();
let html_idx = graph
.node_indices()
.find(|i| graph[*i].name == "index.html" && graph[*i].kind == NodeKind::File)
Expand All @@ -136,7 +136,7 @@ mod tests {
]);
let root = fs.root();
let logger = crate::EmptyLogger;
let res = build_dependency_graph(&root, Default::default(), &logger);
let res = build_dependency_graph(&root, None, &logger);
assert!(res.is_ok());
}
}
12 changes: 6 additions & 6 deletions src/types/js.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,7 +268,7 @@ mod tests {
let fs = TestFS::new([("a.js", "import './b.js';"), ("b.js", "")]);
let root = fs.root();
let logger = crate::EmptyLogger;
let graph = crate::build_dependency_graph(&root, Default::default(), &logger).unwrap();
let graph = crate::build_dependency_graph(&root, None, &logger).unwrap();
assert!(graph.node_indices().any(|i| graph[i].name == "a.js"));
}

Expand All @@ -277,7 +277,7 @@ mod tests {
let fs = TestFS::new([("a.js", "import ???")]);
let root = fs.root();
let logger = crate::EmptyLogger;
let res = crate::build_dependency_graph(&root, Default::default(), &logger);
let res = crate::build_dependency_graph(&root, None, &logger);
assert!(res.is_ok());
}

Expand Down Expand Up @@ -315,7 +315,7 @@ mod tests {
]);
let root = fs.root();
let logger = crate::EmptyLogger;
let graph = crate::build_dependency_graph(&root, Default::default(), &logger).unwrap();
let graph = crate::build_dependency_graph(&root, None, &logger).unwrap();
let a_idx = graph
.node_indices()
.find(|i| graph[*i].name == "a.ts" && graph[*i].kind == NodeKind::File)
Expand All @@ -337,7 +337,7 @@ mod tests {
let fs = TestFS::new([("index.js", "import './logo.svg';"), ("logo.svg", "")]);
let root = fs.root();
let logger = crate::EmptyLogger;
let graph = crate::build_dependency_graph(&root, Default::default(), &logger).unwrap();
let graph = crate::build_dependency_graph(&root, None, &logger).unwrap();
let js_idx = graph
.node_indices()
.find(|i| graph[*i].name == "index.js" && graph[*i].kind == NodeKind::File)
Expand All @@ -361,7 +361,7 @@ mod tests {
]);
let root = fs.root();
let logger = crate::EmptyLogger;
let graph = crate::build_dependency_graph(&root, Default::default(), &logger).unwrap();
let graph = crate::build_dependency_graph(&root, None, &logger).unwrap();
let main_idx = graph
.node_indices()
.find(|i| graph[*i].name == "index.js" && graph[*i].kind == NodeKind::File)
Expand All @@ -383,7 +383,7 @@ mod tests {
let fs = TestFS::new([("a.mjs", "import './b.cjs';"), ("b.cjs", "")]);
let root = fs.root();
let logger = crate::EmptyLogger;
let graph = crate::build_dependency_graph(&root, Default::default(), &logger).unwrap();
let graph = crate::build_dependency_graph(&root, None, &logger).unwrap();
let a_idx = graph
.node_indices()
.find(|i| graph[*i].name == "a.mjs" && graph[*i].kind == NodeKind::File)
Expand Down
2 changes: 1 addition & 1 deletion src/types/monorepo.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ mod tests {
]);
let root = fs.root();
let logger = crate::EmptyLogger;
let graph = crate::build_dependency_graph(&root, Default::default(), &logger).unwrap();
let graph = crate::build_dependency_graph(&root, None, &logger).unwrap();
let a_idx = graph
.node_indices()
.find(|i| graph[*i].name == "a" && graph[*i].kind == crate::NodeKind::Package)
Expand Down
6 changes: 3 additions & 3 deletions src/types/package_json.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ mod tests {
]);
let root = fs.root();
let logger = crate::EmptyLogger;
let graph = crate::build_dependency_graph(&root, Default::default(), &logger).unwrap();
let graph = crate::build_dependency_graph(&root, None, &logger).unwrap();
assert!(graph.node_indices().any(|i| graph[i].name == "pkg"));
}

Expand All @@ -134,7 +134,7 @@ mod tests {
let fs = TestFS::new([("pkg/package.json", "not json")]);
let root = fs.root();
let logger = crate::EmptyLogger;
let res = crate::build_dependency_graph(&root, Default::default(), &logger);
let res = crate::build_dependency_graph(&root, None, &logger);
assert!(res.is_ok());
}

Expand All @@ -143,7 +143,7 @@ mod tests {
let fs = TestFS::new([("pkg/package.json", "notjson")]);
let root = fs.root();
let logger = crate::EmptyLogger;
let res = crate::build_dependency_graph(&root, Default::default(), &logger);
let res = crate::build_dependency_graph(&root, None, &logger);
assert!(res.is_ok());
}
}
Loading