Skip to content

fix: incorrect results from diff sometimes with prerelease versions #546

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

Merged
wraithgar merged 7 commits into from
Apr 13, 2023
Merged

fix: incorrect results from diff sometimes with prerelease versions #546

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
65b34a8
fix: diff giving wrong result when going prerelease => stable
tjenkinson Apr 11, 2023
891b7da
fix: incorrect diff when going from 0.0.0 prerelease to 0.0.0
tjenkinson Apr 11, 2023
f8c38e9
fix: diff not pre* when stable part of 2 prereleases changes
tjenkinson Apr 11, 2023
2c37998
fix: refactor to remove level of nesting
tjenkinson Apr 11, 2023
f584c08
Merge branch 'main' into fix-diff-prerelease
tjenkinson Apr 12, 2023
89ae1fe
add comment about prefix
tjenkinson Apr 12, 2023
f3fd4db
fix: make it `pre*` from diff if going to a prerelease version
tjenkinson Apr 13, 2023
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
Prev Previous commit
Next Next commit
fix: diff not pre* when stable part of 2 prereleases changes 
I.e. `1.0.0-1` => `2.0.0-1` should be `major` not `premajor`, because the biggest change is the major version
  • Loading branch information
@tjenkinson
tjenkinson committed Apr 11, 2023
commit f8c38e9b965a0289c9ce9f07891ee2ed7ef3a514
2 changes: 1 addition & 1 deletion functions/diff.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ const diff = (version1, version2) => {
const lowVersion = v1Higher ? v2 : v1
const highHasPre = !!highVersion.prerelease.length
const lowHasPre = !!lowVersion.prerelease.length
const prefix = highHasPre ? 'pre' : ''
const prefix = highHasPre && !lowHasPre ? 'pre' : ''
Comment thread
wraithgar marked this conversation as resolved.
Outdated

if (v1.major !== v2.major) {
return prefix + 'major'
Expand Down
3 changes: 3 additions & 0 deletions test/functions/diff.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,9 @@ test('diff versions test', (t) => {
['1.0.1-1', '1.0.1', 'patch'],

@wraithgar wraithgar Apr 12, 2023

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more. 

> semver.inc('1.0.1-1', 'patch')
'1.0.1'

['0.0.0-1', '0.0.0', 'major'],

@wraithgar wraithgar Apr 12, 2023

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more. 

> semver.inc('0.0.0-1', 'major')
'0.0.0'

['1.0.0-1', '2.0.0', 'major'],

@wraithgar wraithgar Apr 12, 2023

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Again this is two major .inc operations but that's still a major diff

> semver.inc('1.0.0-1', 'major')
'1.0.0'
> semver.inc('1.0.0', 'major')
'2.0.0'

['1.0.0-1', '2.0.0-1', 'major'],
['1.0.0-1', '1.1.0-1', 'minor'],
['1.0.0-1', '1.0.1-1', 'patch'],
Comment thread
wraithgar marked this conversation as resolved.
Outdated
].forEach((v) => {
const version1 = v[0]
const version2 = v[1]
Expand Down