Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 7 additions & 1 deletion parser.go
Original file line number Diff line number Diff line change
Expand Up @@ -441,10 +441,16 @@ func (p *Parser) parseTildeRange(version string) (*Range, error) {
}), nil
}

segments := strings.Count(version, ".") + 1

var upper string
if v.Minor > 0 || v.Patch > 0 {
if segments >= 2 {
// ~1.2.3 := >=1.2.3 <1.3.0
// ~1.0.0 := >=1.0.0 <1.1.0
// ~1.0 := >=1.0.0 <1.1.0
upper = fmt.Sprintf("%d.%d.0", v.Major, v.Minor+1)
} else {
// ~1 := >=1.0.0 <2.0.0
upper = fmt.Sprintf("%d.0.0", v.Major+1)
}

Expand Down
6 changes: 6 additions & 0 deletions parser_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,12 @@ func TestParseNpmRange(t *testing.T) {
{"~1.2.3 excludes minor", "~1.2.3", "1.3.0", false},
{"~1.2.0 includes patch", "~1.2.0", "1.2.9", true},
{"~1.2.0 excludes minor", "~1.2.0", "1.3.0", false},
{"~1.0.0 includes patch", "~1.0.0", "1.0.9", true},
{"~1.0.0 excludes minor", "~1.0.0", "1.1.0", false},
{"~1.0 includes patch", "~1.0", "1.0.9", true},
{"~1.0 excludes minor", "~1.0", "1.1.0", false},
{"~1 includes minor", "~1", "1.9.0", true},
{"~1 excludes major", "~1", "2.0.0", false},

// X-ranges
{"1.x includes 1.0.0", "1.x", "1.0.0", true},
Expand Down
Loading