mirror of
https://github.com/denoland/deno.git
synced 2024-12-22 23:34:47 -05:00
600fff79cd
- Generalizes the npm version code (ex. `NpmVersion` -> `Version`, `NpmVersionReq` -> `VersionReq`). This is a slow refactor towards extracting out this code for deno specifiers and better usage in deno_graph. - Removes `SpecifierVersionReq`. Consolidates `NpmVersionReq` and `SpecifierVersionReq` to just `VersionReq` - Removes `NpmVersionMatcher`. This now just looks at `VersionReq`. - Paves the way to allow us to create `NpmPackageReference`'s from a package.json's dependencies/dev dependencies (`VersionReq::parse_from_npm`).
265 lines
7.3 KiB
Rust
265 lines
7.3 KiB
Rust
// Copyright 2018-2023 the Deno authors. All rights reserved. MIT license.
|
|
|
|
use deno_core::anyhow::Context;
|
|
use deno_core::error::AnyError;
|
|
use monch::*;
|
|
|
|
use super::range::Partial;
|
|
use super::range::VersionRange;
|
|
use super::range::VersionRangeSet;
|
|
use super::range::XRange;
|
|
use super::RangeSetOrTag;
|
|
use super::VersionReq;
|
|
|
|
use super::is_valid_tag;
|
|
|
|
pub fn parse_version_req_from_specifier(
|
|
text: &str,
|
|
) -> Result<VersionReq, AnyError> {
|
|
with_failure_handling(|input| {
|
|
map_res(version_range, |result| {
|
|
let (new_input, range_result) = match result {
|
|
Ok((input, range)) => (input, Ok(range)),
|
|
// use an empty string because we'll consider it a tag
|
|
Err(err) => ("", Err(err)),
|
|
};
|
|
Ok((
|
|
new_input,
|
|
VersionReq::from_raw_text_and_inner(
|
|
input.to_string(),
|
|
match range_result {
|
|
Ok(range) => RangeSetOrTag::RangeSet(VersionRangeSet(vec![range])),
|
|
Err(err) => {
|
|
if !is_valid_tag(input) {
|
|
return Err(err);
|
|
} else {
|
|
RangeSetOrTag::Tag(input.to_string())
|
|
}
|
|
}
|
|
},
|
|
),
|
|
))
|
|
})(input)
|
|
})(text)
|
|
.with_context(|| {
|
|
format!("Invalid npm specifier version requirement '{text}'.")
|
|
})
|
|
}
|
|
|
|
// Note: Although the code below looks very similar to what's used for
|
|
// parsing npm version requirements, the code here is more strict
|
|
// in order to not allow for people to get ridiculous when using
|
|
// npm specifiers.
|
|
//
|
|
// A lot of the code below is adapted from https://github.com/npm/node-semver
|
|
// which is Copyright (c) Isaac Z. Schlueter and Contributors (ISC License)
|
|
|
|
// version_range ::= partial | tilde | caret
|
|
fn version_range(input: &str) -> ParseResult<VersionRange> {
|
|
or3(
|
|
map(preceded(ch('~'), partial), |partial| {
|
|
partial.as_tilde_version_range()
|
|
}),
|
|
map(preceded(ch('^'), partial), |partial| {
|
|
partial.as_caret_version_range()
|
|
}),
|
|
map(partial, |partial| partial.as_equal_range()),
|
|
)(input)
|
|
}
|
|
|
|
// partial ::= xr ( '.' xr ( '.' xr qualifier ? )? )?
|
|
fn partial(input: &str) -> ParseResult<Partial> {
|
|
let (input, major) = xr()(input)?;
|
|
let (input, maybe_minor) = maybe(preceded(ch('.'), xr()))(input)?;
|
|
let (input, maybe_patch) = if maybe_minor.is_some() {
|
|
maybe(preceded(ch('.'), xr()))(input)?
|
|
} else {
|
|
(input, None)
|
|
};
|
|
let (input, qual) = if maybe_patch.is_some() {
|
|
maybe(qualifier)(input)?
|
|
} else {
|
|
(input, None)
|
|
};
|
|
let qual = qual.unwrap_or_default();
|
|
Ok((
|
|
input,
|
|
Partial {
|
|
major,
|
|
minor: maybe_minor.unwrap_or(XRange::Wildcard),
|
|
patch: maybe_patch.unwrap_or(XRange::Wildcard),
|
|
pre: qual.pre,
|
|
build: qual.build,
|
|
},
|
|
))
|
|
}
|
|
|
|
// xr ::= 'x' | 'X' | '*' | nr
|
|
fn xr<'a>() -> impl Fn(&'a str) -> ParseResult<'a, XRange> {
|
|
or(
|
|
map(or3(tag("x"), tag("X"), tag("*")), |_| XRange::Wildcard),
|
|
map(nr, XRange::Val),
|
|
)
|
|
}
|
|
|
|
// nr ::= '0' | ['1'-'9'] ( ['0'-'9'] ) *
|
|
fn nr(input: &str) -> ParseResult<u64> {
|
|
or(map(tag("0"), |_| 0), move |input| {
|
|
let (input, result) = if_not_empty(substring(pair(
|
|
if_true(next_char, |c| c.is_ascii_digit() && *c != '0'),
|
|
skip_while(|c| c.is_ascii_digit()),
|
|
)))(input)?;
|
|
let val = match result.parse::<u64>() {
|
|
Ok(val) => val,
|
|
Err(err) => {
|
|
return ParseError::fail(
|
|
input,
|
|
format!("Error parsing '{result}' to u64.\n\n{err:#}"),
|
|
)
|
|
}
|
|
};
|
|
Ok((input, val))
|
|
})(input)
|
|
}
|
|
|
|
#[derive(Debug, Clone, Default)]
|
|
struct Qualifier {
|
|
pre: Vec<String>,
|
|
build: Vec<String>,
|
|
}
|
|
|
|
// qualifier ::= ( '-' pre )? ( '+' build )?
|
|
fn qualifier(input: &str) -> ParseResult<Qualifier> {
|
|
let (input, pre_parts) = maybe(pre)(input)?;
|
|
let (input, build_parts) = maybe(build)(input)?;
|
|
Ok((
|
|
input,
|
|
Qualifier {
|
|
pre: pre_parts.unwrap_or_default(),
|
|
build: build_parts.unwrap_or_default(),
|
|
},
|
|
))
|
|
}
|
|
|
|
// pre ::= parts
|
|
fn pre(input: &str) -> ParseResult<Vec<String>> {
|
|
preceded(ch('-'), parts)(input)
|
|
}
|
|
|
|
// build ::= parts
|
|
fn build(input: &str) -> ParseResult<Vec<String>> {
|
|
preceded(ch('+'), parts)(input)
|
|
}
|
|
|
|
// parts ::= part ( '.' part ) *
|
|
fn parts(input: &str) -> ParseResult<Vec<String>> {
|
|
if_not_empty(map(separated_list(part, ch('.')), |text| {
|
|
text.into_iter().map(ToOwned::to_owned).collect()
|
|
}))(input)
|
|
}
|
|
|
|
// part ::= nr | [-0-9A-Za-z]+
|
|
fn part(input: &str) -> ParseResult<&str> {
|
|
// nr is in the other set, so don't bother checking for it
|
|
if_true(
|
|
take_while(|c| c.is_ascii_alphanumeric() || c == '-'),
|
|
|result| !result.is_empty(),
|
|
)(input)
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod tests {
|
|
use super::super::Version;
|
|
use super::*;
|
|
|
|
struct VersionReqTester(VersionReq);
|
|
|
|
impl VersionReqTester {
|
|
fn new(text: &str) -> Self {
|
|
Self(parse_version_req_from_specifier(text).unwrap())
|
|
}
|
|
|
|
fn matches(&self, version: &str) -> bool {
|
|
self.0.matches(&Version::parse_from_npm(version).unwrap())
|
|
}
|
|
}
|
|
|
|
#[test]
|
|
fn version_req_exact() {
|
|
let tester = VersionReqTester::new("1.0.1");
|
|
assert!(!tester.matches("1.0.0"));
|
|
assert!(tester.matches("1.0.1"));
|
|
assert!(!tester.matches("1.0.2"));
|
|
assert!(!tester.matches("1.1.1"));
|
|
|
|
// pre-release
|
|
let tester = VersionReqTester::new("1.0.0-alpha.13");
|
|
assert!(tester.matches("1.0.0-alpha.13"));
|
|
}
|
|
|
|
#[test]
|
|
fn version_req_minor() {
|
|
let tester = VersionReqTester::new("1.1");
|
|
assert!(!tester.matches("1.0.0"));
|
|
assert!(tester.matches("1.1.0"));
|
|
assert!(tester.matches("1.1.1"));
|
|
assert!(!tester.matches("1.2.0"));
|
|
assert!(!tester.matches("1.2.1"));
|
|
}
|
|
|
|
#[test]
|
|
fn version_req_caret() {
|
|
let tester = VersionReqTester::new("^1.1.1");
|
|
assert!(!tester.matches("1.1.0"));
|
|
assert!(tester.matches("1.1.1"));
|
|
assert!(tester.matches("1.1.2"));
|
|
assert!(tester.matches("1.2.0"));
|
|
assert!(!tester.matches("2.0.0"));
|
|
|
|
let tester = VersionReqTester::new("^0.1.1");
|
|
assert!(!tester.matches("0.0.0"));
|
|
assert!(!tester.matches("0.1.0"));
|
|
assert!(tester.matches("0.1.1"));
|
|
assert!(tester.matches("0.1.2"));
|
|
assert!(!tester.matches("0.2.0"));
|
|
assert!(!tester.matches("1.0.0"));
|
|
|
|
let tester = VersionReqTester::new("^0.0.1");
|
|
assert!(!tester.matches("0.0.0"));
|
|
assert!(tester.matches("0.0.1"));
|
|
assert!(!tester.matches("0.0.2"));
|
|
assert!(!tester.matches("0.1.0"));
|
|
assert!(!tester.matches("1.0.0"));
|
|
}
|
|
|
|
#[test]
|
|
fn version_req_tilde() {
|
|
let tester = VersionReqTester::new("~1.1.1");
|
|
assert!(!tester.matches("1.1.0"));
|
|
assert!(tester.matches("1.1.1"));
|
|
assert!(tester.matches("1.1.2"));
|
|
assert!(!tester.matches("1.2.0"));
|
|
assert!(!tester.matches("2.0.0"));
|
|
|
|
let tester = VersionReqTester::new("~0.1.1");
|
|
assert!(!tester.matches("0.0.0"));
|
|
assert!(!tester.matches("0.1.0"));
|
|
assert!(tester.matches("0.1.1"));
|
|
assert!(tester.matches("0.1.2"));
|
|
assert!(!tester.matches("0.2.0"));
|
|
assert!(!tester.matches("1.0.0"));
|
|
|
|
let tester = VersionReqTester::new("~0.0.1");
|
|
assert!(!tester.matches("0.0.0"));
|
|
assert!(tester.matches("0.0.1"));
|
|
assert!(tester.matches("0.0.2")); // for some reason this matches, but not with ^
|
|
assert!(!tester.matches("0.1.0"));
|
|
assert!(!tester.matches("1.0.0"));
|
|
}
|
|
|
|
#[test]
|
|
fn parses_tag() {
|
|
let latest_tag = VersionReq::parse_from_specifier("latest").unwrap();
|
|
assert_eq!(latest_tag.tag().unwrap(), "latest");
|
|
}
|
|
}
|