diff options
Diffstat (limited to 'crates/shirabe/src/package')
| -rw-r--r-- | crates/shirabe/src/package/loader/array_loader.rs | 22 | ||||
| -rw-r--r-- | crates/shirabe/src/package/loader/root_package_loader.rs | 14 | ||||
| -rw-r--r-- | crates/shirabe/src/package/version/version_bumper.rs | 12 |
3 files changed, 31 insertions, 17 deletions
diff --git a/crates/shirabe/src/package/loader/array_loader.rs b/crates/shirabe/src/package/loader/array_loader.rs index 844b3ef..20280e0 100644 --- a/crates/shirabe/src/package/loader/array_loader.rs +++ b/crates/shirabe/src/package/loader/array_loader.rs @@ -370,7 +370,7 @@ impl ArrayLoader { package.package_mut().set_is_default_branch(true); } - if let Some(source) = config.get("source").cloned() { + if let Some(source) = config.get("source").filter(|v| !v.is_null()).cloned() { let source_map = match &source { PhpMixed::Array(m) => Some(m.clone()), _ => None, @@ -404,9 +404,12 @@ impl ArrayLoader { package .package_mut() .set_source_url(source_map.get("url").map(|v| strval(v))); - package - .package_mut() - .set_source_reference(source_map.get("reference").map(|v| strval(v))); + package.package_mut().set_source_reference( + source_map + .get("reference") + .filter(|v| !v.is_null()) + .map(|v| strval(v)), + ); if let Some(mirrors) = source_map.get("mirrors") { package .package_mut() @@ -414,7 +417,7 @@ impl ArrayLoader { } } - if let Some(dist) = config.get("dist").cloned() { + if let Some(dist) = config.get("dist").filter(|v| !v.is_null()).cloned() { let dist_map = match &dist { PhpMixed::Array(m) => Some(m.clone()), _ => None, @@ -446,9 +449,12 @@ impl ArrayLoader { package .package_mut() .set_dist_url(dist_map.get("url").map(|v| strval(v))); - package - .package_mut() - .set_dist_reference(dist_map.get("reference").map(|v| strval(v))); + package.package_mut().set_dist_reference( + dist_map + .get("reference") + .filter(|v| !v.is_null()) + .map(|v| strval(v)), + ); package .package_mut() .set_dist_sha1_checksum(dist_map.get("shasum").map(|v| strval(v))); diff --git a/crates/shirabe/src/package/loader/root_package_loader.rs b/crates/shirabe/src/package/loader/root_package_loader.rs index 9cd1eac..308706f 100644 --- a/crates/shirabe/src/package/loader/root_package_loader.rs +++ b/crates/shirabe/src/package/loader/root_package_loader.rs @@ -266,7 +266,7 @@ impl RootPackageLoader { for (req_name, req_version) in requires { let mut m: IndexMap<CaptureKey, String> = IndexMap::new(); if Preg::is_match3( - r"(?:^|\| *|, *)([^,\s#|]+)(?:#[^ ]+)? +as +([^,\s|]+)(?:$| *\|| *)", + r"{(?:^|\| *|, *)([^,\s#|]+)(?:#[^ ]+)? +as +([^,\s|]+)(?:$| *\|| *,)}", req_version, Some(&mut m), ) { @@ -320,7 +320,7 @@ impl RootPackageLoader { for (req_name, req_version) in requires { let mut constraints: Vec<String> = vec![]; - let or_split = Preg::split(r"\s*\|\|?\s*", req_version.trim()); + let or_split = Preg::split(r"{\s*\|\|?\s*}", req_version.trim()); for or_constraint in &or_split { let and_split = shirabe_semver::split_and_constraints(or_constraint); for and_constraint in and_split { @@ -329,7 +329,7 @@ impl RootPackageLoader { } let stability_names: Vec<&str> = stabilities.keys().copied().collect(); - let pattern = format!("^[^@]*?@({})$", stability_names.join("|")); + let pattern = format!("{{^[^@]*?@({})$}}i", stability_names.join("|")); let mut matched = false; for constraint in &constraints { @@ -353,8 +353,8 @@ impl RootPackageLoader { } for constraint in &constraints { - let req_version_stripped = Preg::replace(r"^([^,\s@]+) as .+$", "$1", constraint); - if Preg::is_match(r"^[^,\s@]+$", &req_version_stripped) { + let req_version_stripped = Preg::replace(r"{^([^,\s@]+) as .+$}", "$1", constraint); + if Preg::is_match(r"{^[^,\s@]+$}", &req_version_stripped) { let stability_name = VersionParser::parse_stability(&req_version_stripped); if stability_name != "stable" { let name = strtolower(req_name); @@ -378,9 +378,9 @@ impl RootPackageLoader { mut references: IndexMap<String, String>, ) -> IndexMap<String, String> { for (req_name, req_version) in requires { - let req_version = Preg::replace(r"^([^,\s@]+) as .+$", "$1", req_version); + let req_version = Preg::replace(r"{^([^,\s@]+) as .+$}", "$1", req_version); let mut m: IndexMap<CaptureKey, String> = IndexMap::new(); - if Preg::is_match3(r"^[^,\s@]+?#([a-f0-9]+)$", &req_version, Some(&mut m)) + if Preg::is_match3(r"{^[^,\s@]+?#([a-f0-9]+)$}", &req_version, Some(&mut m)) && VersionParser::parse_stability(&req_version) == "dev" { let name = strtolower(req_name); diff --git a/crates/shirabe/src/package/version/version_bumper.rs b/crates/shirabe/src/package/version/version_bumper.rs index c029e3b..4deb450 100644 --- a/crates/shirabe/src/package/version/version_bumper.rs +++ b/crates/shirabe/src/package/version/version_bumper.rs @@ -54,9 +54,17 @@ impl VersionBumper { return Ok(pretty_constraint); } + // Regex pattern compatibility: + // PHP uses zero-width look-behind `(?<=,|\ |\||^)` and look-ahead `(?=,|$|\ |\||@)` to require + // a separator around the constraint. The `regex` crate supports neither, so the separators are + // matched as *consuming* groups instead. Only the `constraint` named group's own offset/length + // is used for the replacement below (never group 0), so consuming the surrounding separators + // does not shift the rewrite. The single-character `|`/space/comma separators are not consumed + // by both an adjacent trailing and leading match, but Composer never packs two same-major + // constraints around a single such separator (alternatives use `||`, ranges use spaces). let pattern = format!( r#"{{ - (?<=,|\ |\||^) # leading separator + (?:^|[,\ |]) # leading separator (?P<constraint> \^v?{major}(?:\.\d+)* # e.g. ^2.anything | ~v?{major}(?:\.\d+){{1,3}} # e.g. ~2.2 or ~2.2.2 or ~2.2.2.2 @@ -64,7 +72,7 @@ impl VersionBumper { | >=v?\d(?:\.\d+)* # e.g. >=2 or >=1.2 etc | \* # full wildcard ) - (?=,|$|\ |\||@) # trailing separator + (?:$|[,\ |@]) # trailing separator }}x"#, major = major ); |