Skip to content

Commit 5bce1d8

Browse files
committedDec 1, 2022
fix(semver-ranges): fix regression in 8.4.10 {lint,set}-semver-ranges
1 parent cc76e8b commit 5bce1d8

File tree

2 files changed

+20
-17
lines changed

2 files changed

+20
-17
lines changed
 

‎src/bin-lint-semver-ranges/lint-semver-ranges.ts

+17-16
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import chalk from 'chalk';
22
import type { Disk } from '../lib/disk';
33
import type { ProgramInput } from '../lib/get-input';
4+
import { isValidSemverRange } from '../lib/is-semver';
45
import { setSemverRange } from '../lib/set-semver-range';
56
import { listSemverGroupMismatches } from './list-semver-group-mismatches';
67

@@ -13,25 +14,25 @@ export function lintSemverRanges(input: ProgramInput, disk: Disk): void {
1314
* will then start from index 1.
1415
*/
1516
input.instances.semverGroups.reverse().forEach((semverGroup, i) => {
16-
if (!('range' in semverGroup && semverGroup.range)) return;
17+
if ('range' in semverGroup && isValidSemverRange(semverGroup.range)) {
18+
const isSemverGroup = i > 0;
19+
const mismatches = listSemverGroupMismatches(semverGroup);
1720

18-
const isSemverGroup = i > 0;
19-
const mismatches = listSemverGroupMismatches(semverGroup);
21+
if (isSemverGroup && mismatches.length > 0) {
22+
console.log(chalk`{dim = Semver Group ${i} ${'='.repeat(63)}}`);
23+
}
2024

21-
if (isSemverGroup && mismatches.length > 0) {
22-
console.log(chalk`{dim = Semver Group ${i} ${'='.repeat(63)}}`);
23-
}
24-
25-
mismatches.forEach(({ dependencyType, name, version, wrapper }) => {
26-
console.log(
27-
chalk`{red ✕ ${name}} {red.dim ${version} in ${dependencyType} of ${
28-
wrapper.contents.name
29-
} should be ${setSemverRange(semverGroup.range, version)}}`,
30-
);
31-
});
25+
mismatches.forEach(({ dependencyType, name, version, wrapper }) => {
26+
console.log(
27+
chalk`{red ✕ ${name}} {red.dim ${version} in ${dependencyType} of ${
28+
wrapper.contents.name
29+
} should be ${setSemverRange(semverGroup.range, version)}}`,
30+
);
31+
});
3232

33-
if (mismatches.length > 0) {
34-
isInvalid = true;
33+
if (mismatches.length > 0) {
34+
isInvalid = true;
35+
}
3536
}
3637
});
3738

‎src/bin-set-semver-ranges/set-semver-ranges.ts

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
1+
import { isString } from 'expect-more';
12
import { listSemverGroupMismatches } from '../bin-lint-semver-ranges/list-semver-group-mismatches';
23
import type { Disk } from '../lib/disk';
34
import type { ProgramInput } from '../lib/get-input';
5+
import { isValidSemverRange } from '../lib/is-semver';
46
import { setSemverRange } from '../lib/set-semver-range';
57
import { writeIfChanged } from '../lib/write-if-changed';
68

79
export const setSemverRanges = (input: ProgramInput, disk: Disk): void => {
810
input.instances.semverGroups.reverse().forEach((semverGroup) => {
9-
if ('range' in semverGroup && semverGroup.range) {
11+
if ('range' in semverGroup && isValidSemverRange(semverGroup.range)) {
1012
const mismatches = listSemverGroupMismatches(semverGroup);
1113
mismatches.forEach(({ dependencyType, name, version, wrapper }) => {
1214
if (dependencyType === 'workspace') return;

0 commit comments

Comments
 (0)
Please sign in to comment.