fix(align-deps): fix vigilant mode not handling catalog: in peer dependencies (#4066)

Author: tido64

.changeset/ripe-dragons-lick.md

@@ -0,0 +1,5 @@
+---
+"@rnx-kit/align-deps": patch
+---
+
+Fixed vigilant mode not handling `catalog:` in peer dependencies

packages/align-deps/src/commands/vigilant.ts

@@ -4,13 +4,12 @@ import type { Capability, KitConfig } from "@rnx-kit/types-kit-config";
 import type { PackageManifest } from "@rnx-kit/types-node";
 import * as nodefs from "node:fs";
 import * as path from "node:path";
-import semverSubset from "semver/ranges/subset.js";
 import {
   capabilityProvidedBy,
   resolveCapabilities,
   resolveCapabilitiesUnchecked,
 } from "../capabilities.ts";
-import { stringify } from "../diff.ts";
+import { isSubset, stringify } from "../diff.ts";
 import { dependencySections, modifyManifest } from "../helpers.ts";
 import { updateDependencies } from "../manifest.ts";
 import { ensurePreset, filterPreset, mergePresets } from "../preset.ts";
@@ -46,7 +45,7 @@ function isMisalignedDirect(from: string, to: string): boolean {
 }
 
 function isMisalignedPeer(from: string, to: string): boolean {
-  return from !== to && !semverSubset(to, from, { includePrerelease: true });
+  return !isSubset(to, from, { includePrerelease: true });
 }
 
 /**

packages/align-deps/src/diff.ts

@@ -1,19 +1,20 @@
 import type { PackageManifest } from "@rnx-kit/types-node";
-import semverCoerce from "semver/functions/coerce.js";
+import type { RangeOptions } from "semver";
 import semverRangeSubset from "semver/ranges/subset.js";
+import semverValidRange from "semver/ranges/valid.js";
 import { dependencySections } from "./helpers.ts";
 import type { Changes, Options } from "./types.ts";
 
 function isStrictlyEqual(version: string, range: string) {
   return version === range;
 }
 
-export function isSubset(sub: string, dom: string) {
+export function isSubset(sub: string, dom: string, options?: RangeOptions) {
   // If either side is not a valid version number, fall back to strict equality
-  if (!semverCoerce(sub) || !semverCoerce(dom)) {
+  if (!semverValidRange(sub) || !semverValidRange(dom)) {
     return isStrictlyEqual(sub, dom);
   }
-  return semverRangeSubset(sub, dom);
+  return semverRangeSubset(sub, dom, options);
 }
 
 export function diff(