From f3ad6a12a3dc62b3f7dd4aee1061506bdc909e9c Mon Sep 17 00:00:00 2001 From: Paul Horn Date: Sun, 28 Feb 2021 02:57:44 +0100 Subject: [PATCH] Initial project --- .github/dependabot.yml | 7 + .github/workflows/checks.yml | 37 ++ .gitignore | 4 + Cargo.toml | 18 + LICENSE | 21 + LICENSE-APL | 201 ++++++++ Makefile.toml | 19 + README.md | 5 + README.tpl | 5 + release.toml | 1 + src/lib.rs | 931 +++++++++++++++++++++++++++++++++++ 11 files changed, 1249 insertions(+) create mode 100644 .github/dependabot.yml create mode 100644 .github/workflows/checks.yml create mode 100644 .gitignore create mode 100644 Cargo.toml create mode 100644 LICENSE create mode 100644 LICENSE-APL create mode 100644 Makefile.toml create mode 100644 README.md create mode 100644 README.tpl create mode 100644 release.toml create mode 100644 src/lib.rs diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 0000000..ab912ab --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,7 @@ +version: 2 +updates: + - package-ecosystem: "cargo" + directory: "/" + schedule: + interval: "daily" + open-pull-requests-limit: 42 diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml new file mode 100644 index 0000000..842132d --- /dev/null +++ b/.github/workflows/checks.yml @@ -0,0 +1,37 @@ +name: checks + +on: + push: + branches: + - master + pull_request: + branches: + - master + workflow_dispatch: + + +jobs: + checks: + name: Tests and clippy checks + strategy: + matrix: + os: [ubuntu-latest, windows-latest, macOS-latest] + rust: [stable, beta, nightly] + runs-on: ${{ matrix.os }} + steps: + - name: Checkout code + uses: actions/checkout@v2 + - name: Setup Rust + uses: actions-rs/toolchain@v1 + with: + profile: minimal + toolchain: ${{ matrix.rust }} + components: rustfmt, clippy + override: true + - name: Install cargo-make + uses: davidB/rust-cargo-make@v1 + - name: Run CI + uses: actions-rs/cargo@v1 + with: + command: make + args: ci diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..9b2beb9 --- /dev/null +++ b/.gitignore @@ -0,0 +1,4 @@ +!.github/ +target +Cargo.lock +*.code-workspace diff --git a/Cargo.toml b/Cargo.toml new file mode 100644 index 0000000..91b7d5d --- /dev/null +++ b/Cargo.toml @@ -0,0 +1,18 @@ +[package] +name = "lenient_semver_range" +version = "0.0.1" +description = "Lenient Semantic Version range." +authors = ["Paul Horn "] +edition = "2018" +license = "MIT OR Apache-2.0" +homepage = "https://github.com/knutwalker/lenient-semver-range/" +repository = "https://github.com/knutwalker/lenient-semver-range/" +categories = ["development-tools", "parser-implementations"] +keywords = ["lenient", "loose", "parser", "semver", "semantic", "version"] + +[dependencies] +lenient_semver_parser = { version = "0.3", default-features = false } +lenient_version = { version = "0.3", default-features = false, features = [ "parser" ] } + +[patch.crates-io] +lenient_semver_parser = { git = "https://github.com/knutwalker/lenient-semver", package = "lenient_semver_parser", branch = "master" } diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..1b3cec2 --- /dev/null +++ b/LICENSE @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) 2020 Paul Horn + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/LICENSE-APL b/LICENSE-APL new file mode 100644 index 0000000..752b944 --- /dev/null +++ b/LICENSE-APL @@ -0,0 +1,201 @@ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright 2020 Paul Horn + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/Makefile.toml b/Makefile.toml new file mode 100644 index 0000000..5e243a4 --- /dev/null +++ b/Makefile.toml @@ -0,0 +1,19 @@ +[tasks.outdated] +args = ["outdated", "--root-deps-only", "--exit-code", "0"] + +[tasks.ci] +workspace = false +run_task = { name = "ci-flow", fork = true } + +[tasks.readme] +workspace = false +command = "cargo" +args = ["readme", "--output", "README.md"] + +[tasks.t] +workspace = false +run_task = { name = "test", fork = true } + +[tasks.r] +workspace = false +run_task = "readme" diff --git a/README.md b/README.md new file mode 100644 index 0000000..7f1f497 --- /dev/null +++ b/README.md @@ -0,0 +1,5 @@ +# Lenient Semantic Version Parser + +Lenient parser or Semantic Version ranges. + +License: MIT OR Apache-2.0 diff --git a/README.tpl b/README.tpl new file mode 100644 index 0000000..af114cb --- /dev/null +++ b/README.tpl @@ -0,0 +1,5 @@ +# Lenient Semantic Version Parser + +{{readme}} + +License: {{license}} diff --git a/release.toml b/release.toml new file mode 100644 index 0000000..2bc79bd --- /dev/null +++ b/release.toml @@ -0,0 +1 @@ +pre-release-commit-message = "Release {{crate_name}} {{version}}" diff --git a/src/lib.rs b/src/lib.rs new file mode 100644 index 0000000..5481539 --- /dev/null +++ b/src/lib.rs @@ -0,0 +1,931 @@ +// #![warn(missing_docs)] + +/*! +Lenient parser or Semantic Version ranges. +*/ + +use lenient_semver_parser::{parse_partial, VersionBuilder}; +use lenient_version::Version; + +pub fn parse<'a>(input: &'a str) -> Result, Box> { + parse_compat(input, Compat::Cargo) +} + +pub fn parse_npm<'a>(input: &'a str) -> Result, Box> { + parse_compat(input, Compat::Npm) +} + +pub fn parse_compat<'a>( + mut input: &'a str, + compat: Compat, +) -> Result, Box> { + let default_op = match compat { + Compat::Cargo => Op::Caret, + Compat::Npm => Op::Eq, + }; + let mut ranges = vec![]; + let mut comparators = vec![]; + let mut allow_chain_operators = true; + loop { + let (op, next_input) = match input.as_bytes() { + &[] => { + if !comparators.is_empty() { + ranges.push(Range { comparators }); + } + return Ok(RangeSet { ranges }); + } + &[b'|', b'|', ..] if allow_chain_operators => { + let comparators = std::mem::take(&mut comparators); + ranges.push(Range { comparators }); + input = &input[2..]; + allow_chain_operators = false; + continue; + } + &[b',', ..] if allow_chain_operators => { + input = &input[1..]; + allow_chain_operators = false; + continue; + } + &[b' ', ..] if allow_chain_operators => { + input = &input[1..]; + continue; + } + &[b'-', ..] => (Op::Hyphen, &input[1..]), + &[b'^', ..] => (Op::Caret, &input[1..]), + &[b'~', ..] => (Op::Tilde, &input[1..]), + &[b'>', b'=', ..] => (Op::Gte, &input[2..]), + &[b'>', ..] => (Op::Gt, &input[1..]), + &[b'<', b'=', ..] => (Op::Lte, &input[2..]), + &[b'<', ..] => (Op::Lt, &input[1..]), + &[b'=', ..] => (Op::Eq, &input[1..]), + _ => (default_op, input), + }; + + let (version, remainder) = parse_partial::>(next_input)?; + + let prev = if op == Op::Hyphen { + let prev = comparators + .pop() + .ok_or_else(|| String::from("The hyphen operator requires a previous range"))?; + + if prev.op != Operator::Eq { + Err(format!( + "The hyphen operator does not allow the previous range to use an operator, but the version [{}] is using the operator [{:?}]", + prev.version, prev.op + ))?; + } + + Some(prev.version) + } else { + None + }; + + let ((op, version), other) = version.into_versions(op, prev); + comparators.push(Comparator { op, version }); + if let Some((op, version)) = other { + comparators.push(Comparator { op, version }); + } + + input = remainder; + } +} + +#[derive(Clone, PartialEq, Eq, PartialOrd, Ord, Hash, Debug)] +pub struct RangeSet<'input> { + ranges: Vec>, +} + +#[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash, Debug)] +pub enum Compat { + /// default operator is ^ + Cargo, + /// default opertaor is = + Npm, +} + +#[derive(Clone, PartialEq, Eq, PartialOrd, Ord, Hash, Debug)] +struct Range<'input> { + comparators: Vec>, +} + +#[derive(Clone, PartialEq, Eq, PartialOrd, Ord, Hash, Debug)] +struct Comparator<'input> { + op: Operator, + version: Version<'input>, +} + +#[derive(Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Hash, Debug)] +enum Operator { + /// Equal, = + Eq, + /// Greater than, > + Gt, + /// Greater than or equal, >= + Gte, + /// Less than, < + Lt, + /// Less than or equal, <= + Lte, +} + +#[derive(Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Hash, Debug)] +enum Op { + Eq, + Gt, + Gte, + Lt, + Lte, + Tilde, + Caret, + Hyphen, +} + +#[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash, Debug)] +enum VersionNumber { + Unspecified, + Wildcard, + Num(u64), +} + +#[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash, Debug)] +enum Segment { + Empty, + Major, + Minor, + Patch, + Additional, + PreRelease, +} + +impl From for u64 { + fn from(v: VersionNumber) -> Self { + match v { + VersionNumber::Unspecified => 0, + VersionNumber::Wildcard => 0, + VersionNumber::Num(n) => n, + } + } +} + +#[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)] +struct VersionQualifier<'input> { + segment: Segment, + major: VersionNumber, + minor: VersionNumber, + patch: VersionNumber, + additional: Vec, + pre: Vec<&'input str>, + build: Vec<&'input str>, +} + +impl<'input> VersionQualifier<'input> { + const fn empty() -> Self { + Self { + segment: Segment::Empty, + major: VersionNumber::Unspecified, + minor: VersionNumber::Unspecified, + patch: VersionNumber::Unspecified, + additional: Vec::new(), + pre: Vec::new(), + build: Vec::new(), + } + } +} + +impl<'input> VersionBuilder<'input> for VersionQualifier<'input> { + type Out = Self; + + fn new() -> Self { + Self::empty() + } + + fn set_major(&mut self, major: u64) { + self.major = VersionNumber::Num(major); + self.segment = Segment::Major; + } + + fn set_minor(&mut self, minor: u64) { + self.minor = VersionNumber::Num(minor); + self.segment = Segment::Minor; + } + + fn set_patch(&mut self, patch: u64) { + self.patch = VersionNumber::Num(patch); + self.segment = Segment::Patch; + } + + fn add_additional(&mut self, num: u64) { + self.additional.push(VersionNumber::Num(num)); + self.segment = Segment::Additional; + } + + fn add_pre_release(&mut self, pre_release: &'input str) { + if matches!(pre_release, "x" | "X" | "*" | "?") { + if self.major == VersionNumber::Unspecified { + self.major = VersionNumber::Wildcard; + } else if self.minor == VersionNumber::Unspecified { + self.minor = VersionNumber::Wildcard; + } else if self.patch == VersionNumber::Unspecified { + self.patch = VersionNumber::Wildcard; + } else if self.segment == Segment::PreRelease { + self.pre.push(pre_release); + } else { + self.additional.push(VersionNumber::Wildcard); + } + } else { + self.pre.push(pre_release); + self.segment = Segment::PreRelease; + } + } + + fn add_build(&mut self, build: &'input str) { + self.build.push(build) + } + + fn build(self) -> Self::Out { + self + } +} + +impl<'input> VersionQualifier<'input> { + fn into_versions( + self, + op: Op, + prev: Option>, + ) -> ( + (Operator, Version<'input>), + Option<(Operator, Version<'input>)>, + ) { + match op { + Op::Eq | Op::Gt | Op::Gte | Op::Lt | Op::Lte => ( + ( + match op { + Op::Eq => Operator::Eq, + Op::Gt => Operator::Gt, + Op::Gte => Operator::Gte, + Op::Lt => Operator::Lt, + Op::Lte => Operator::Lte, + Op::Tilde => unreachable!(), + Op::Caret => unreachable!(), + Op::Hyphen => unreachable!(), + }, + Version { + major: self.major.into(), + minor: self.minor.into(), + patch: self.patch.into(), + additional: self.additional.into_iter().map(u64::from).collect(), + pre: self.pre, + build: self.build, + }, + ), + None, + ), + Op::Tilde => match self.segment { + Segment::Empty => ((Operator::Gte, Version::new(0, 0, 0)), None), + Segment::Major => { + let major = u64::from(self.major); + ( + (Operator::Gte, Version::new(major, 0, 0)), + major + .checked_add(1) + .map(|m| (Operator::Lt, Version::new(m, 0, 0))), + ) + } + Segment::Minor => { + let major = u64::from(self.major); + let minor = u64::from(self.minor); + ( + (Operator::Gte, Version::new(major, minor, 0)), + minor + .checked_add(1) + .map(|m| (Operator::Lt, Version::new(major, m, 0))), + ) + } + Segment::Patch => { + let major = u64::from(self.major); + let minor = u64::from(self.minor); + let patch = u64::from(self.patch); + ( + (Operator::Gte, Version::new(major, minor, patch)), + minor + .checked_add(1) + .map(|m| (Operator::Lt, Version::new(major, minor, m))), + ) + } + Segment::Additional => { + let major = u64::from(self.major); + let minor = u64::from(self.minor); + let patch = u64::from(self.patch); + + let mut min = Version::new(major, minor, patch); + min.additional = self.additional.into_iter().map(u64::from).collect(); + + let max = min + .additional + .last() + .expect("empty additional") + .checked_add(1) + .map(|m| { + let mut add = min.additional.clone(); + *add.last_mut().expect("empty additional") = m; + let mut max = Version::new(major, minor, patch); + max.additional = add; + (Operator::Lt, max) + }); + + ((Operator::Gte, min), max) + } + Segment::PreRelease => { + let min = Version { + major: u64::from(self.major), + minor: u64::from(self.minor), + patch: u64::from(self.patch), + additional: self.additional.into_iter().map(u64::from).collect(), + pre: self.pre, + build: self.build, + }; + let max = min.clone(); + ((Operator::Gte, min), Some((Operator::Lt, max))) + } + }, + Op::Caret => { + let major = u64::from(self.major); + let minor = u64::from(self.minor); + let patch = u64::from(self.patch); + + if major > 0 { + ( + (Operator::Gte, Version::new(major, minor, patch)), + major + .checked_add(1) + .map(|m| (Operator::Lt, Version::new(m, 0, 0))), + ) + } else if minor > 0 { + ( + (Operator::Gte, Version::new(0, minor, patch)), + minor + .checked_add(1) + .map(|m| (Operator::Lt, Version::new(0, m, 0))), + ) + } else if patch > 0 { + ( + (Operator::Gte, Version::new(0, 0, patch)), + patch + .checked_add(1) + .map(|m| (Operator::Lt, Version::new(0, 0, m))), + ) + } else { + match self.segment { + Segment::Major => ( + (Operator::Gte, Version::empty()), + Some((Operator::Lt, Version::new(1, 0, 0))), + ), + Segment::Minor => ( + (Operator::Gte, Version::empty()), + Some((Operator::Lt, Version::new(0, 1, 0))), + ), + Segment::Patch => ( + (Operator::Gte, Version::empty()), + Some((Operator::Lt, Version::new(0, 0, 1))), + ), + Segment::Empty => { + todo!() + } + Segment::Additional => { + todo!() + } + Segment::PreRelease => { + todo!() + } + } + } + } + Op::Hyphen => { + let prev = (Operator::Gte, prev.expect("previous version")); + let next = match self.segment { + Segment::Empty => None, + Segment::Major => { + let major = u64::from(self.major); + major + .checked_add(1) + .map(|m| (Operator::Lt, Version::new(m, 0, 0))) + } + Segment::Minor => { + let major = u64::from(self.major); + let minor = u64::from(self.minor); + minor + .checked_add(1) + .map(|m| (Operator::Lt, Version::new(major, m, 0))) + } + _ => Some(self.into_versions(Op::Lte, None).0), + }; + (prev, next) + } + } + } +} + +#[cfg(test)] +mod tests { + use super::*; + + #[test] + fn test_hyphen_1() { + assert_eq!( + parse("1.2.3 - 2.3.4").unwrap(), + RangeSet { + ranges: vec![Range { + comparators: vec![ + Comparator { + op: Operator::Gte, + version: Version::new(1, 2, 3) + }, + Comparator { + op: Operator::Lte, + version: Version::new(2, 3, 4) + }, + ] + }] + } + ); + } + + #[test] + fn test_hyphen_2() { + assert_eq!( + parse("1.2 - 2.3.4").unwrap(), + RangeSet { + ranges: vec![Range { + comparators: vec![ + Comparator { + op: Operator::Gte, + version: Version::new(1, 2, 0) + }, + Comparator { + op: Operator::Lte, + version: Version::new(2, 3, 4) + }, + ] + }] + } + ); + } + + #[test] + fn test_hyphen_3() { + assert_eq!( + parse("1.2.3 - 2.3").unwrap(), + RangeSet { + ranges: vec![Range { + comparators: vec![ + Comparator { + op: Operator::Gte, + version: Version::new(1, 2, 3) + }, + Comparator { + op: Operator::Lt, + version: Version::new(2, 4, 0) + }, + ] + }] + } + ); + } + + #[test] + fn test_hyphen_4() { + assert_eq!( + parse("1.2.3 - 2").unwrap(), + RangeSet { + ranges: vec![Range { + comparators: vec![ + Comparator { + op: Operator::Gte, + version: Version::new(1, 2, 3) + }, + Comparator { + op: Operator::Lt, + version: Version::new(3, 0, 0) + }, + ] + }] + } + ); + } + + #[test] + fn test_x_1() { + assert_eq!( + parse("*").unwrap(), + RangeSet { + ranges: vec![Range { + comparators: vec![Comparator { + op: Operator::Gte, + version: Version::new(0, 0, 0) + },] + }] + } + ); + } + + #[test] + fn test_x_2() { + assert_eq!( + parse("1.x").unwrap(), + RangeSet { + ranges: vec![Range { + comparators: vec![ + Comparator { + op: Operator::Gte, + version: Version::new(1, 0, 0) + }, + Comparator { + op: Operator::Lt, + version: Version::new(2, 0, 0) + }, + ] + }] + } + ); + } + + #[test] + fn test_x_3() { + assert_eq!( + parse("1.2.x").unwrap(), + RangeSet { + ranges: vec![Range { + comparators: vec![ + Comparator { + op: Operator::Gte, + version: Version::new(1, 2, 0) + }, + Comparator { + op: Operator::Lt, + version: Version::new(1, 3, 0) + }, + ] + }] + } + ); + } + + #[test] + fn test_x_4() { + assert_eq!( + parse("").unwrap(), + RangeSet { + ranges: vec![Range { + comparators: vec![Comparator { + op: Operator::Gte, + version: Version::new(0, 0, 0) + },] + }] + } + ); + } + + #[test] + fn test_x_5() { + assert_eq!( + parse("1.x.x").unwrap(), + RangeSet { + ranges: vec![Range { + comparators: vec![ + Comparator { + op: Operator::Gte, + version: Version::new(1, 0, 0) + }, + Comparator { + op: Operator::Lt, + version: Version::new(2, 0, 0) + }, + ] + }] + } + ); + } + + #[test] + fn test_tilde_1() { + assert_eq!( + parse("~1.2.3").unwrap(), + RangeSet { + ranges: vec![Range { + comparators: vec![ + Comparator { + op: Operator::Gte, + version: Version::new(1, 2, 3) + }, + Comparator { + op: Operator::Lt, + version: Version::new(1, 3, 0) + }, + ] + }] + } + ); + } + + #[test] + fn test_tilde_2() { + assert_eq!( + parse("~1.2").unwrap(), + RangeSet { + ranges: vec![Range { + comparators: vec![ + Comparator { + op: Operator::Gte, + version: Version::new(1, 2, 0) + }, + Comparator { + op: Operator::Lt, + version: Version::new(1, 3, 0) + }, + ] + }] + } + ); + } + + #[test] + fn test_tilde_3() { + assert_eq!( + parse("~1").unwrap(), + RangeSet { + ranges: vec![Range { + comparators: vec![ + Comparator { + op: Operator::Gte, + version: Version::new(1, 0, 0) + }, + Comparator { + op: Operator::Lt, + version: Version::new(2, 0, 0) + }, + ] + }] + } + ); + } + + #[test] + fn test_tilde_4() { + assert_eq!( + parse("~0.2.3").unwrap(), + RangeSet { + ranges: vec![Range { + comparators: vec![ + Comparator { + op: Operator::Gte, + version: Version::new(0, 2, 3) + }, + Comparator { + op: Operator::Lt, + version: Version::new(0, 3, 0) + }, + ] + }] + } + ); + } + + #[test] + fn test_tilde_5() { + assert_eq!( + parse("~0.2").unwrap(), + RangeSet { + ranges: vec![Range { + comparators: vec![ + Comparator { + op: Operator::Gte, + version: Version::new(0, 2, 0) + }, + Comparator { + op: Operator::Lt, + version: Version::new(0, 3, 0) + }, + ] + }] + } + ); + } + + #[test] + fn test_tilde_6() { + assert_eq!( + parse("~0").unwrap(), + RangeSet { + ranges: vec![Range { + comparators: vec![ + Comparator { + op: Operator::Gte, + version: Version::new(0, 0, 0) + }, + Comparator { + op: Operator::Lt, + version: Version::new(1, 0, 0) + }, + ] + }] + } + ); + } + + #[test] + fn test_caret_1() { + assert_eq!( + parse("^1.2.3").unwrap(), + RangeSet { + ranges: vec![Range { + comparators: vec![ + Comparator { + op: Operator::Gte, + version: Version::new(1, 2, 3) + }, + Comparator { + op: Operator::Lt, + version: Version::new(2, 0, 0) + }, + ] + }] + } + ); + } + + #[test] + fn test_caret_2() { + assert_eq!( + parse("^0.2.3").unwrap(), + RangeSet { + ranges: vec![Range { + comparators: vec![ + Comparator { + op: Operator::Gte, + version: Version::new(0, 2, 3) + }, + Comparator { + op: Operator::Lt, + version: Version::new(0, 3, 0) + }, + ] + }] + } + ); + } + + #[test] + fn test_caret_3() { + assert_eq!( + parse("^0.0.3").unwrap(), + RangeSet { + ranges: vec![Range { + comparators: vec![ + Comparator { + op: Operator::Gte, + version: Version::new(0, 0, 3) + }, + Comparator { + op: Operator::Lt, + version: Version::new(0, 0, 4) + }, + ] + }] + } + ); + } + + #[test] + fn test_caret_4() { + assert_eq!( + parse("^1.2.x").unwrap(), + RangeSet { + ranges: vec![Range { + comparators: vec![ + Comparator { + op: Operator::Gte, + version: Version::new(1, 2, 0) + }, + Comparator { + op: Operator::Lt, + version: Version::new(2, 0, 0) + }, + ] + }] + } + ); + } + + #[test] + fn test_caret_5() { + assert_eq!( + parse("^0.0.x").unwrap(), + RangeSet { + ranges: vec![Range { + comparators: vec![ + Comparator { + op: Operator::Gte, + version: Version::new(0, 0, 0) + }, + Comparator { + op: Operator::Lt, + version: Version::new(0, 1, 0) + }, + ] + }] + } + ); + } + + #[test] + fn test_caret_6() { + assert_eq!( + parse("^0.0").unwrap(), + RangeSet { + ranges: vec![Range { + comparators: vec![ + Comparator { + op: Operator::Gte, + version: Version::new(0, 0, 0) + }, + Comparator { + op: Operator::Lt, + version: Version::new(0, 1, 0) + }, + ] + }] + } + ); + } + + #[test] + fn test_caret_7() { + assert_eq!( + parse("^1.x").unwrap(), + RangeSet { + ranges: vec![Range { + comparators: vec![ + Comparator { + op: Operator::Gte, + version: Version::new(1, 0, 0) + }, + Comparator { + op: Operator::Lt, + version: Version::new(2, 0, 0) + }, + ] + }] + } + ); + } + + #[test] + fn test_caret_8() { + assert_eq!( + parse("^0.x").unwrap(), + RangeSet { + ranges: vec![Range { + comparators: vec![ + Comparator { + op: Operator::Gte, + version: Version::new(0, 0, 0) + }, + Comparator { + op: Operator::Lt, + version: Version::new(1, 0, 0) + }, + ] + }] + } + ); + } + + #[test] + fn test_or_1() { + assert_eq!( + parse("1.2.7 || >=1.2.9 <2.0.0").unwrap(), + RangeSet { + ranges: vec![ + Range { + comparators: vec![Comparator { + op: Operator::Eq, + version: Version::new(1, 2, 7) + },] + }, + Range { + comparators: vec![ + Comparator { + op: Operator::Gte, + version: Version::new(1, 2, 9) + }, + Comparator { + op: Operator::Lt, + version: Version::new(2, 0, 0) + }, + ] + }, + ] + } + ); + } +}