Skip to content
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

feat: improve heuristics when dist-tags.latest is in range #33

Merged
merged 1 commit into from
Jul 9, 2024
Merged

feat: improve heuristics when dist-tags.latest is in range #33

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 11 additions & 5 deletions lib/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,9 +123,15 @@ const pickManifest = (packument, wanted, opts) => {
const defaultVer = distTags[defaultTag]
if (defaultVer &&
(range === '*' || semver.satisfies(defaultVer, range, { loose: true })) &&
!restricted[defaultVer] &&
!shouldAvoid(defaultVer, avoid)) {
const mani = versions[defaultVer]
if (mani && isBefore(verTimes, defaultVer, time)) {
const ok = mani &&
isBefore(verTimes, defaultVer, time) &&
engineOk(mani, npmVersion, nodeVersion) &&
!mani.deprecated &&
!staged[defaultVer]
if (ok) {
return mani
}
}
Expand Down Expand Up @@ -155,10 +161,10 @@ const pickManifest = (packument, wanted, opts) => {
const [verb, manib] = b
const notavoida = !shouldAvoid(vera, avoid)
const notavoidb = !shouldAvoid(verb, avoid)
const notrestra = !restricted[a]
const notrestrb = !restricted[b]
const notstagea = !staged[a]
const notstageb = !staged[b]
const notrestra = !restricted[vera]
const notrestrb = !restricted[verb]
const notstagea = !staged[vera]
const notstageb = !staged[verb]
const notdepra = !mania.deprecated
const notdeprb = !manib.deprecated
const enginea = engineOk(mania, npmVersion, nodeVersion)
Expand Down
11 changes: 11 additions & 0 deletions test/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,9 @@ test('ETARGET if range does not match anything', t => {

test('E403 if version is forbidden', t => {
const metadata = {
'dist-tags': {
latest: '2.1.0', // do not default the latest if restricted
},
policyRestrictions: {
versions: {
'2.1.0': { version: '2.1.0' },
Expand All @@ -141,6 +144,9 @@ test('E403 if version is forbidden', t => {
'2.0.5': { version: '2.0.5' },
},
}
t.equal(pickManifest(metadata, '2').version, '2.0.5')
t.equal(pickManifest(metadata, '').version, '2.0.5')
t.equal(pickManifest(metadata, '1 || 2').version, '2.0.5')
t.throws(() => {
pickManifest(metadata, '2.1.0')
}, { code: 'E403' }, 'got correct error on match failure')
Expand Down Expand Up @@ -423,13 +429,18 @@ test('accepts opts.before option to do date-based cutoffs', t => {

test('prefers versions that satisfy the engines requirement', t => {
const pack = {
'dist-tags': {
latest: '1.5.0', // do not default latest if engine mismatch
},
versions: {
'1.0.0': { version: '1.0.0', engines: { node: '>=4' } },
'1.1.0': { version: '1.1.0', engines: { node: '>=6' } },
'1.2.0': { version: '1.2.0', engines: { node: '>=8' } },
'1.3.0': { version: '1.3.0', engines: { node: '>=10' } },
'1.4.0': { version: '1.4.0', engines: { node: '>=12' } },
'1.5.0': { version: '1.5.0', engines: { node: '>=14' } },
// not tagged as latest, won't be chosen by default
'1.5.1': { version: '1.5.0', engines: { node: '>=14' } },
},
}

Expand Down
Loading