refactor(semver): clean up parseRange, add missing tests

semver/compare_test.ts

@@ -1,5 +1,5 @@
 // Copyright 2018-2025 the Deno authors. MIT license.
-import { assertEquals } from "@std/assert";
+import { assertEquals, assertThrows } from "@std/assert";
 import { parse } from "./parse.ts";
 import { compare } from "./compare.ts";
 
@@ -54,3 +54,50 @@ Deno.test({
     }
   },
 });
+
+Deno.test({
+  name: "compare() throws on NaN",
+  fn: () => {
+    assertThrows(
+      () =>
+        compare({ major: NaN, minor: 0, patch: 0 }, {
+          major: 1,
+          minor: 0,
+          patch: 0,
+        }),
+      Error,
+      "Cannot compare against non-numbers",
+    );
+
+    assertThrows(
+      () =>
+        compare({ major: 1, minor: 0, patch: 0 }, {
+          major: 1,
+          minor: NaN,
+          patch: 0,
+        }),
+      Error,
+      "Cannot compare against non-numbers",
+    );
+  },
+});
+
+Deno.test({
+  name: "compare() handles undefined in prerelease",
+  fn: () => {
+    assertEquals(
+      compare({
+        major: 1,
+        minor: 0,
+        patch: 0,
+        prerelease: [undefined as unknown as string],
+      }, {
+        major: 1,
+        minor: 0,
+        patch: 0,
+        prerelease: [undefined as unknown as string],
+      }),
+      0,
+    );
+  },
+});

semver/greater_than_range_test.ts

@@ -1,14 +1,15 @@
 // Copyright 2018-2025 the Deno authors. MIT license.
 // Copyright Isaac Z. Schlueter and npm contributors. All rights reserved. ISC license.
 
-import { assert, assertFalse } from "@std/assert";
+import { assert, assertEquals, assertFalse } from "@std/assert";
 import {
   format,
   formatRange,
   greaterThanRange,
   parse,
   parseRange,
 } from "./mod.ts";
+import type { Operator } from "./types.ts";
 
 Deno.test("greaterThanRange() checks if the semver is greater than the range", async (t) => {
   // from https://github.com/npm/node-semver/blob/692451bd6f75b38a71a99f39da405c94a5954a22/test/fixtures/version-gt-range.js
@@ -167,3 +168,42 @@ Deno.test("greaterThanRange() checks if the semver is greater than the range", a
     });
   }
 });
+
+Deno.test("greaterThanRange() handles equals operator", () => {
+  const version = {
+    major: 1,
+    minor: 0,
+    patch: 0,
+    prerelease: [],
+    build: [],
+  };
+  const range = [[{
+    operator: "=" as unknown as Operator,
+    major: 1,
+    minor: 0,
+    patch: 0,
+    prerelease: [],
+    build: [],
+  }]];
+  assertEquals(greaterThanRange(version, range), false);
+});
+
+Deno.test("greaterThanRange() handles not equals operator", () => {
+  const version = {
+    major: 1,
+    minor: 0,
+    patch: 0,
+    prerelease: [],
+    build: [],
+  };
+  const range = [[{
+    operator: "!=" as const,
+    major: 1,
+    minor: 0,
+    patch: 0,
+    prerelease: [],
+    build: [],
+  }]];
+  // FIXME(kt3k): This demonstrates a bug. This should be false
+  assertEquals(greaterThanRange(version, range), true);
+});

semver/is_range_test.ts

@@ -1,16 +1,13 @@
 // Copyright 2018-2025 the Deno authors. MIT license.
-import { assert } from "@std/assert";
+import { assertEquals } from "@std/assert";
 import { ALL, MIN } from "./_constants.ts";
-import { formatRange } from "./format_range.ts";
 import { isRange } from "./is_range.ts";
 import type { Range } from "./types.ts";
 
 Deno.test({
-  name: "isRange()",
-  fn: async (t) => {
-    const ranges: Range[] = [[
-      [ALL],
-    ], [
+  name: "isRange() handles simple range",
+  fn: () => {
+    const range: Range = [
       [{
         operator: ">=",
         major: 0,
@@ -22,12 +19,53 @@ Deno.test({
         operator: "<",
         ...MIN,
       }],
-    ]];
-    for (const r of ranges) {
-      await t.step(`${formatRange(r)}`, () => {
-        const actual = isRange(r);
-        assert(actual);
-      });
-    }
+    ];
+    const actual = isRange(range);
+    assertEquals(actual, true);
+  },
+});
+
+Deno.test({
+  name: "isRange() handles ALL constant",
+  fn: () => {
+    const range: Range = [[ALL]];
+    const actual = isRange(range);
+    assertEquals(actual, true);
+  },
+});
+
+Deno.test({
+  name: "isRange() handles null",
+  fn: () => {
+    const range: Range = [[null]] as unknown as Range;
+    const actual = isRange(range);
+    assertEquals(actual, false);
+  },
+});
+
+Deno.test({
+  name: "isRange() handles undefined",
+  fn: () => {
+    const range: Range = [[undefined]] as unknown as Range;
+    const actual = isRange(range);
+    assertEquals(actual, false);
+  },
+});
+
+Deno.test({
+  name: "isRange() handles array type",
+  fn: () => {
+    const range: Range = [[[1, 2, 3]]] as unknown as Range;
+    const actual = isRange(range);
+    assertEquals(actual, false);
+  },
+});
+
+Deno.test({
+  name: "isRange() handles not object type",
+  fn: () => {
+    const range: Range = [[[true]]] as unknown as Range;
+    const actual = isRange(range);
+    assertEquals(actual, false);
   },
 });

semver/is_semver_test.ts

@@ -1,6 +1,6 @@
 // Copyright 2018-2025 the Deno authors. MIT license.
 import { assert } from "@std/assert";
-import { MIN } from "./_constants.ts";
+import { ANY, MIN } from "./_constants.ts";
 import { isSemVer } from "./is_semver.ts";
 
 Deno.test({
@@ -61,6 +61,7 @@ Deno.test({
       [{ major: 0, minor: 0, patch: 0, build: [], prerelease: ["abc"] }],
       [{ major: 0, minor: 0, patch: 0, build: [], prerelease: ["abc", 0] }],
       [MIN],
+      [ANY],
     ];
     for (const [v] of versions) {
       await t.step(

semver/less_than_range_test.ts

@@ -1,7 +1,7 @@
 // Copyright 2018-2025 the Deno authors. MIT license.
 // Copyright Isaac Z. Schlueter and npm contributors. All rights reserved. ISC license.
 
-import { assert, assertFalse } from "@std/assert";
+import { assert, assertEquals, assertFalse } from "@std/assert";
 import {
   format,
   formatRange,
@@ -169,3 +169,23 @@ Deno.test("lessThanRange() checks if the SemVer is less than the range", async (
     });
   }
 });
+
+Deno.test("lessThanRange() handles not equals operator", () => {
+  const version = {
+    major: 1,
+    minor: 0,
+    patch: 0,
+    prerelease: [],
+    build: [],
+  };
+  const range = [[{
+    operator: "!=" as const,
+    major: 1,
+    minor: 0,
+    patch: 0,
+    prerelease: [],
+    build: [],
+  }]];
+  // FIXME(kt3k): This demonstrates a bug. This should be false
+  assertEquals(lessThanRange(version, range), true);
+});

semver/parse_range.ts

@@ -141,27 +141,25 @@ function handleRightHyphenRangeGroups(
     major: +rightGroups.major,
     minor: +rightGroups.minor,
     patch: +rightGroups.patch,
-    prerelease: rightGroups.prerelease
-      ? parsePrerelease(rightGroups.prerelease)
-      : [],
+    prerelease: [],
     build: [],
   };
 }
-function parseHyphenRange(range: string): Comparator[] | undefined {
+function parseHyphenRange(range: string): Comparator[] | null {
   const leftMatch = range.match(new RegExp(`^${XRANGE}`));
   const leftGroup = leftMatch?.groups;
-  if (!leftGroup) return;
+  if (!leftGroup) return null;
   const leftLength = leftMatch[0].length;
 
   const hyphenMatch = range.slice(leftLength).match(/^\s+-\s+/);
-  if (!hyphenMatch) return;
+  if (!hyphenMatch) return null;
   const hyphenLength = hyphenMatch[0].length;
 
   const rightMatch = range.slice(leftLength + hyphenLength).match(
     new RegExp(`^${XRANGE}\\s*$`),
   );
   const rightGroups = rightMatch?.groups;
-  if (!rightGroups) return;
+  if (!rightGroups) return null;
 
   const from = handleLeftHyphenRangeGroups(leftGroup as RangeRegExpGroups);
   const to = handleRightHyphenRangeGroups(rightGroups as RangeRegExpGroups);
@@ -255,7 +253,7 @@ function handleLessThanOperator(groups: RangeRegExpGroups): Comparator[] {
   if (majorIsWildcard) return [{ operator: "<", major: 0, minor: 0, patch: 0 }];
   if (minorIsWildcard) {
     if (patchIsWildcard) return [{ operator: "<", major, minor: 0, patch: 0 }];
-    return [{ operator: "<", major, minor, patch: 0 }];
+    return [{ operator: "<", major, minor: 0, patch: 0 }];
   }
   if (patchIsWildcard) return [{ operator: "<", major, minor, patch: 0 }];
   const prerelease = parsePrerelease(groups.prerelease ?? "");
@@ -318,7 +316,7 @@ function handleGreaterOrEqualOperator(groups: RangeRegExpGroups): Comparator[] {
   if (majorIsWildcard) return [ALL];
   if (minorIsWildcard) {
     if (patchIsWildcard) return [{ operator: ">=", major, minor: 0, patch: 0 }];
-    return [{ operator: ">=", major, minor, patch: 0 }];
+    return [{ operator: ">=", major, minor: 0, patch: 0 }];
   }
   if (patchIsWildcard) return [{ operator: ">=", major, minor, patch: 0 }];
   const prerelease = parsePrerelease(groups.prerelease ?? "");

semver/parse_range_test.ts

@@ -666,3 +666,24 @@ Deno.test("parseRange() throws on invalid range", () => {
     'Cannot parse version range: range "blerg" is invalid',
   );
 });
+
+Deno.test("parseRange() handles wildcards", () => {
+  assertEquals(parseRange("<1.*"), [
+    [{ operator: "<", major: 1, minor: 0, patch: 0 }],
+  ]);
+  assertEquals(parseRange("<1.*.0"), [
+    [{ operator: "<", major: 1, minor: 0, patch: 0 }],
+  ]);
+  assertEquals(parseRange("<1.*.*"), [
+    [{ operator: "<", major: 1, minor: 0, patch: 0 }],
+  ]);
+  assertEquals(parseRange(">=1.*.0"), [
+    [{ operator: ">=", major: 1, minor: 0, patch: 0 }],
+  ]);
+  assertEquals(parseRange(">=1.*.*"), [
+    [{ operator: ">=", major: 1, minor: 0, patch: 0 }],
+  ]);
+  assertEquals(parseRange(">=1.0.*"), [
+    [{ operator: ">=", major: 1, minor: 0, patch: 0 }],
+  ]);
+});

semver/try_parse_range_test.ts

@@ -0,0 +1,34 @@
+// Copyright 2018-2025 the Deno authors. MIT license.
+
+import { assertEquals } from "@std/assert";
+import { tryParseRange } from "./try_parse_range.ts";
+import type { Range } from "./types.ts";
+
+Deno.test("tryParseRange()", () => {
+  const actual = tryParseRange(">=1.2.3 <1.2.4");
+  const expected: Range = [
+    [
+      {
+        operator: ">=",
+        major: 1,
+        minor: 2,
+        patch: 3,
+        prerelease: [],
+        build: [],
+      },
+      {
+        operator: "<",
+        major: 1,
+        minor: 2,
+        patch: 4,
+        prerelease: [],
+        build: [],
+      },
+    ],
+  ];
+  assertEquals(actual, expected);
+});
+
+Deno.test("tryParseRange() handles invalid range", () => {
+  assertEquals(tryParseRange("blerg"), undefined);
+});

semver/types.ts

@@ -21,6 +21,7 @@ export type ReleaseType =
 export type Operator =
   | undefined
   | "="
+  // Note: `!=` operator type does not exist in npm:semver
   | "!="
   | ">"
   | ">="