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

Improve parsing of node version #361

Merged
merged 1 commit into from
Jul 25, 2022
Merged

Improve parsing of node version #361

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
80 changes: 78 additions & 2 deletions src/providers/node.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,8 @@ impl NodeProvider {
}

// Parse `18` or `18.x` into nodejs-18_x
let re = Regex::new(r"^(\d+)\.?[x|X]?$").unwrap();
// This also supports 18.x.x, or any number in place of the x.
let re = Regex::new(r"^(\d+)\.?([x|X]|[0-9]+)\.?([x|X]|[0-9]+)?$").unwrap();
if let Some(node_pkg) = parse_regex_into_pkg(&re, node_version.clone()) {
return Ok(Pkg::new(node_pkg.as_str()));
}
Expand Down Expand Up @@ -379,7 +380,12 @@ fn version_number_to_pkg(version: &u32) -> String {
fn parse_regex_into_pkg(re: &Regex, node_version: String) -> Option<String> {
let matches: Vec<_> = re.captures_iter(node_version.as_str()).collect();
if let Some(m) = matches.get(0) {
match m[1].parse::<u32>() {
let capture = if node_version.contains('.') {
&m[1]
} else {
&m[0]
};
match capture.parse::<u32>() {
Ok(version) => return Some(version_number_to_pkg(&version)),
Err(_e) => {}
}
Expand Down Expand Up @@ -477,6 +483,76 @@ mod test {
Ok(())
}

#[test]
fn test_advanced_engine_x() -> Result<()> {
assert_eq!(
NodeProvider::get_nix_node_pkg(
&PackageJson {
name: Some(String::default()),
engines: engines_node("18.x.x"),
..Default::default()
},
&Environment::default()
)?,
Pkg::new("nodejs-18_x")
);

assert_eq!(
NodeProvider::get_nix_node_pkg(
&PackageJson {
name: Some(String::default()),
engines: engines_node("14.X.x"),
..Default::default()
},
&Environment::default()
)?,
Pkg::new("nodejs-14_x")
);

Ok(())
}

#[test]
fn test_advanced_engine_number() -> Result<()> {
assert_eq!(
NodeProvider::get_nix_node_pkg(
&PackageJson {
name: Some(String::default()),
engines: engines_node("18.4.2"),
..Default::default()
},
&Environment::default()
)?,
Pkg::new("nodejs-18_x")
);

assert_eq!(
NodeProvider::get_nix_node_pkg(
&PackageJson {
name: Some(String::default()),
engines: engines_node("14.8.x"),
..Default::default()
},
&Environment::default()
)?,
Pkg::new("nodejs-14_x")
);

assert_eq!(
NodeProvider::get_nix_node_pkg(
&PackageJson {
name: Some(String::default()),
engines: engines_node("14.x.8"),
..Default::default()
},
&Environment::default()
)?,
Pkg::new("nodejs-14_x")
);

Ok(())
}

#[test]
fn test_engine_range() -> Result<()> {
assert_eq!(
Expand Down