[unstable] BREAKING(semver): remove comparator.semver field (#4533)

semver/constants.ts

@@ -68,7 +68,6 @@ export const ANY: SemVer = {
 export const ALL: Comparator = {
   operator: undefined,
   ...ANY,
-  semver: ANY,
 };
 
 /**
@@ -77,5 +76,4 @@ export const ALL: Comparator = {
 export const NONE: Comparator = {
   operator: "<",
   ...MIN,
-  semver: MIN,
 };

semver/format.ts

@@ -1,6 +1,6 @@
 // Copyright 2018-2024 the Deno authors. All rights reserved. MIT license.
-import { ANY } from "./constants.ts";
 import type { SemVer } from "./types.ts";
+import { isWildcardComparator } from "./_shared.ts";
 
 function formatNumber(value: number) {
   if (value === Number.POSITIVE_INFINITY) {
@@ -23,7 +23,7 @@ function formatNumber(value: number) {
  * @returns The string representation of a semantic version.
  */
 export function format(semver: SemVer): string {
-  if (semver === ANY) {
+  if (isWildcardComparator(semver)) {
     return "*";
   }
 

semver/format_range.ts

@@ -3,10 +3,8 @@ import { format } from "./format.ts";
 import type { Comparator, Range } from "./types.ts";
 
 function formatComparator(comparator: Comparator): string {
-  const { semver, operator } = comparator;
-  return `${operator === undefined ? "" : operator}${
-    format(semver ?? comparator)
-  }`;
+  const { operator } = comparator;
+  return `${operator === undefined ? "" : operator}${format(comparator)}`;
 }
 
 /**

semver/is_range.ts

@@ -10,11 +10,11 @@ function isComparator(value: unknown): value is Comparator {
     typeof value !== "object"
   ) return false;
   if (value === NONE || value === ALL) return true;
-  const { operator, semver } = value as Comparator;
+  const { operator } = value as Comparator;
   return (
     (operator === undefined ||
       OPERATORS.includes(operator)) &&
-    isSemVer(semver)
+    isSemVer(value)
   );
 }
 

semver/is_range_test.ts

@@ -13,15 +13,13 @@ Deno.test({
     ], [
       [{
         operator: ">=",
-        semver: { major: 0, minor: 0, patch: 0, prerelease: [], build: [] },
         major: 0,
         minor: 0,
         patch: 0,
         prerelease: [],
         build: [],
       }, {
         operator: "<",
-        semver: MIN,
         ...MIN,
       }],
     ]];

semver/parse_range.ts

@@ -45,7 +45,7 @@ function parseComparator(comparator: string): Comparator {
     }
     : ANY;
 
-  return { operator: operator || undefined, ...semver, semver };
+  return { operator: operator || undefined, ...semver };
 }
 
 function isWildcard(id?: string): boolean {

semver/parse_range_test.ts

@@ -360,7 +360,6 @@ Deno.test("parseRange() parse ranges of different kinds", () => {
           patch: 0,
           prerelease: [],
           build: [],
-          semver: { major: 0, minor: 0, patch: 0, prerelease: [], build: [] },
         },
       ],
     ]],
@@ -479,13 +478,6 @@ Deno.test("parseRange() parses ranges with x", () => {
           patch: NaN,
           prerelease: [],
           build: [],
-          semver: {
-            major: NaN,
-            minor: NaN,
-            patch: NaN,
-            prerelease: [],
-            build: [],
-          },
         },
       ],
     ]],
@@ -510,13 +502,6 @@ Deno.test("parseRange() parses ranges with x", () => {
           patch: NaN,
           prerelease: [],
           build: [],
-          semver: {
-            major: NaN,
-            minor: NaN,
-            patch: NaN,
-            prerelease: [],
-            build: [],
-          },
         },
       ],
     ]],

semver/range_max.ts

@@ -1,12 +1,13 @@
 // Copyright 2018-2024 the Deno authors. All rights reserved. MIT license.
-import { ANY, INVALID, MAX } from "./constants.ts";
+import { INVALID, MAX } from "./constants.ts";
 import type { Comparator, Range, SemVer } from "./types.ts";
 import { testRange } from "./test_range.ts";
 import { greaterThan } from "./greater_than.ts";
+import { isWildcardComparator } from "./_shared.ts";
 
 function comparatorMax(comparator: Comparator): SemVer {
-  const semver = comparator.semver ?? comparator;
-  if (semver === ANY) return MAX;
+  const semver = comparator;
+  if (isWildcardComparator(comparator)) return MAX;
   switch (comparator.operator) {
     case "!=":
     case ">":

semver/range_min.ts

@@ -1,14 +1,15 @@
 // Copyright 2018-2024 the Deno authors. All rights reserved. MIT license.
-import { ANY, INVALID, MAX, MIN } from "./constants.ts";
+import { INVALID, MAX, MIN } from "./constants.ts";
 import type { Comparator, Range, SemVer } from "./types.ts";
 import { testRange } from "./test_range.ts";
 import { lessThan } from "./less_than.ts";
 import { greaterThan } from "./greater_than.ts";
 import { increment } from "./increment.ts";
+import { isWildcardComparator } from "./_shared.ts";
 
 function comparatorMin(comparator: Comparator): SemVer {
-  const semver = comparator.semver ?? comparator;
-  if (semver === ANY) return MIN;
+  const semver = comparator;
+  if (isWildcardComparator(semver)) return MIN;
   switch (comparator.operator) {
     case ">":
       return semver.prerelease && semver.prerelease.length > 0

semver/test_range.ts

@@ -7,7 +7,7 @@ function testComparator(version: SemVer, comparator: Comparator): boolean {
   if (isWildcardComparator(comparator)) {
     return true;
   }
-  const cmp = compare(version, comparator.semver ?? comparator);
+  const cmp = compare(version, comparator);
   switch (comparator.operator) {
     case "=":
     case undefined: {
@@ -50,11 +50,8 @@ function testComparatorSet(
       if (isWildcardComparator(comparator)) {
         continue;
       }
-      const { prerelease } = comparator.semver ?? comparator;
+      const { major, minor, patch, prerelease } = comparator;
       if (prerelease && prerelease.length > 0) {
-        const major = comparator.semver?.major ?? comparator.major;
-        const minor = comparator.semver?.minor ?? comparator.minor;
-        const patch = comparator.semver?.patch ?? comparator.patch;
         if (
           version.major === major && version.minor === minor &&
           version.patch === patch

semver/types.ts

@@ -27,10 +27,6 @@ export type Operator = typeof OPERATORS[number];
  */
 export interface Comparator extends SemVer {
   operator?: Operator;
-  /**
-   * @deprecated (will be removed in 0.219.0) {@linkcode Comparator} extends {@linkcode SemVer}. Use `major`, `minor`, `patch`, `prerelease`, and `build` properties instead.
-   */
-  semver?: SemVer;
 }
 
 /**