Skip to content
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

Jump to bottom

Read non-hoisted deps #84

Closed
wants to merge 6 commits into from
Closed

Read non-hoisted deps #84

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
0eb833d
Read non-hoisted deps
DZakh Jan 12, 2024
e170bcf
Remove unused helpers
DZakh Jan 12, 2024
2684231
Support getting bs build path for non-hoisted packages
DZakh Jan 15, 2024
5e3a11a
Support get_build_path for non-hoisted set up
DZakh Jan 15, 2024
fe8f04c
Move some code from helper to the Package impl
DZakh Jan 15, 2024
a963b69
Always resolve using absolute path
DZakh Jan 15, 2024
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
63 changes: 37 additions & 26 deletions src/build/packages.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ struct Dependency {
bsconfig: bsconfig::T,
path: String,
is_pinned: bool,
dependencies: Vec<Dependency>
dependencies: Vec<Dependency>,
}

#[derive(Debug, Clone)]
Expand Down Expand Up @@ -201,6 +201,7 @@ fn read_bsconfig(package_dir: &str) -> bsconfig::T {
fn read_dependencies<'a>(
registered_dependencies_set: &'a mut AHashSet<String>,
parent_bsconfig: bsconfig::T,
parent_path: String,
) -> Vec<Dependency> {
return parent_bsconfig
.bs_dependencies
Expand All @@ -219,19 +220,25 @@ fn read_dependencies<'a>(
// Read all bsconfig files in parallel instead of blocking
.par_iter()
.map(|package_name| {
let path =
match PathBuf::from(helpers::get_relative_package_path(package_name, false)).canonicalize() {
Ok(dir) => dir.to_string_lossy().to_string(),
Err(e) => {
print!(
"{} {} Error building package tree (are node_modules up-to-date?)... \n More details: {}",
style("[1/2]").bold().dim(),
CROSS,
e.to_string()
);
std::process::exit(2)
let path_buf =
match PathBuf::from(format!("{}/node_modules/{}", parent_path, package_name)).canonicalize() {
Copy link
Collaborator

@jfrolich jfrolich Jan 12, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think the is_root condition isn't handled here

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's not needed here, since the code never runs for the root package

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

how is the root package handled then?

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ok so it's only run for deps, so you are probably right :)

Ok(p) => p,
Err(_) => {
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we print the error as well?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done

match PathBuf::from(format!("node_modules/{}", package_name)).canonicalize() {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we should use the absolute path and prepend with project_root here.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done

Ok(p) => p,
Err(e) => {
print!(
"{} {} Error building package tree (are node_modules up-to-date?)... \n More details: {}",
style("[1/2]").bold().dim(),
CROSS,
e.to_string()
);
std::process::exit(2)
}
}
}
};
let path = path_buf.to_string_lossy().to_string();

let bsconfig = read_bsconfig(&path);
let is_pinned = parent_bsconfig
Expand All @@ -240,7 +247,7 @@ fn read_dependencies<'a>(
.map(|p| p.contains(&bsconfig.name))
.unwrap_or(false);

let dependencies = read_dependencies(&mut registered_dependencies_set.clone(),bsconfig.to_owned());
let dependencies = read_dependencies(&mut registered_dependencies_set.clone(),bsconfig.to_owned(), path.to_owned());

Dependency {
name: package_name.to_owned(),
Expand All @@ -249,8 +256,7 @@ fn read_dependencies<'a>(
is_pinned,
dependencies,
}
})
.collect::<Vec<Dependency>>();
}).collect::<Vec<Dependency>>();
}

fn flatten_dependencies(dependencies: Vec<Dependency>) -> Vec<Dependency> {
Expand All @@ -263,12 +269,7 @@ fn flatten_dependencies(dependencies: Vec<Dependency>) -> Vec<Dependency> {
flattened
}

fn make_package (
bsconfig: bsconfig::T,
package_dir: &str,
is_pinned_dep: bool,
is_root: bool
) -> Package {
fn make_package(bsconfig: bsconfig::T, package_dir: &str, is_pinned_dep: bool, is_root: bool) -> Package {
let source_folders = match bsconfig.sources.to_owned() {
bsconfig::OneOrMore::Single(source) => get_source_dirs(source, None),
bsconfig::OneOrMore::Multiple(sources) => {
Expand Down Expand Up @@ -332,14 +333,24 @@ fn read_packages(project_root: &str) -> AHashMap<String, Package> {

// Store all packages and completely deduplicate them
let mut map: AHashMap<String, Package> = AHashMap::new();
map.insert(root_bsconfig.name.to_owned(), make_package(root_bsconfig.to_owned(), project_root, false, true));
map.insert(
root_bsconfig.name.to_owned(),
make_package(root_bsconfig.to_owned(), project_root, false, true),
);

let mut registered_dependencies_set: AHashSet<String> = AHashSet::new();
let dependencies = flatten_dependencies(read_dependencies(&mut registered_dependencies_set, root_bsconfig.to_owned()));
let dependencies = flatten_dependencies(read_dependencies(
&mut registered_dependencies_set,
root_bsconfig.to_owned(),
project_root.to_string(),
));
dependencies.iter().for_each(|d| {
if !map.contains_key(&d.name) {
map.insert(d.name.to_owned(), make_package(d.bsconfig.to_owned(), &d.path, d.is_pinned, false));
}
if !map.contains_key(&d.name) {
map.insert(
d.name.to_owned(),
make_package(d.bsconfig.to_owned(), &d.path, d.is_pinned, false),
);
}
});

return map;
Expand Down
Loading