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

Jump to bottom

refactor(semver): prepare for noUncheckedIndexedAccess #4354

Merged
merged 1 commit into from
Feb 20, 2024
+15 −9
Merged

refactor(semver): prepare for noUncheckedIndexedAccess #4354

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
10 changes: 8 additions & 2 deletions semver/_parse_comparator.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,14 @@ export function parseComparator(comparator: string): Comparator {
const semver = groups.major
? {
major: parseNumber(groups.major, "Invalid major version"),
minor: parseNumber(groups.minor, "Invalid minor version"),
patch: parseNumber(groups.patch, "Invalid patch version"),
minor: parseNumber(
groups.minor!,
"Invalid minor version",
),
patch: parseNumber(
groups.patch!,
"Invalid patch version",
),
prerelease: prerelease ? parsePrerelease(prerelease) : [],
build: buildmetadata ? parseBuild(buildmetadata) : [],
}
Expand Down
6 changes: 3 additions & 3 deletions semver/parse.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@ export function parse(version: string): SemVer {
const groups = version.match(FULL_REGEXP)?.groups;
if (!groups) throw new TypeError(`Invalid Version: ${version}`);

const major = parseNumber(groups.major, "Invalid major version");
const minor = parseNumber(groups.minor, "Invalid minor version");
const patch = parseNumber(groups.patch, "Invalid patch version");
const major = parseNumber(groups.major!, "Invalid major version");
const minor = parseNumber(groups.minor!, "Invalid minor version");
const patch = parseNumber(groups.patch!, "Invalid patch version");

const prerelease = groups.prerelease
? parsePrerelease(groups.prerelease)
Expand Down
6 changes: 3 additions & 3 deletions semver/parse_range.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { OPERATOR_XRANGE_REGEXP, XRANGE } from "./_shared.ts";
import { parseComparator } from "./_parse_comparator.ts";
import { parseBuild, parsePrerelease } from "./_shared.ts";

function isWildcard(id: string): boolean {
function isWildcard(id?: string): boolean {
return !id || id.toLowerCase() === "x" || id === "*";
}

Expand Down Expand Up @@ -50,9 +50,9 @@ function parseHyphenRange(range: string) {
if (isWildcard(rightGroups.major)) {
to = "";
} else if (isWildcard(rightGroups.minor)) {
to = `<${+rightGroups.major + 1}.0.0`;
to = `<${+rightGroups.major! + 1}.0.0`;
iuioiua marked this conversation as resolved.
Show resolved Hide resolved
} else if (isWildcard(rightGroups.patch)) {
to = `<${rightGroups.major}.${+rightGroups.minor + 1}.0`;
to = `<${rightGroups.major}.${+rightGroups.minor! + 1}.0`;
} else if (rightGroups.prerelease) {
to =
`<=${rightGroups.major}.${rightGroups.minor}.${rightGroups.patch}-${rightGroups.prerelease}`;
Expand Down
2 changes: 1 addition & 1 deletion semver/range_intersects.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ function rangesSatisfiable(ranges: Range[]): boolean {
function comparatorsSatisfiable(comparators: Comparator[]): boolean {
// Comparators are satisfiable if they all intersect with each other
for (let i = 0; i < comparators.length - 1; i++) {
const c0 = comparators[i];
const c0 = comparators[i]!;
iuioiua marked this conversation as resolved.
Show resolved Hide resolved
for (const c1 of comparators.slice(i + 1)) {
if (!comparatorIntersects(c0, c1)) {
return false;
Expand Down