Remove deprecrated custom manifest (#813)

src/download/download-version.ts

@@ -8,20 +8,11 @@ import {
   ASTRAL_MIRROR_PREFIX,
   GITHUB_RELEASES_PREFIX,
   TOOL_CACHE_NAME,
-  VERSIONS_NDJSON_URL,
+  VERSIONS_MANIFEST_URL,
 } from "../utils/constants";
 import type { Architecture, Platform } from "../utils/platforms";
 import { validateChecksum } from "./checksum/checksum";
-import {
-  getAllVersions as getAllManifestVersions,
-  getLatestKnownVersion as getLatestVersionInManifest,
-  getManifestArtifact,
-} from "./version-manifest";
-import {
-  getAllVersions as getAllVersionsFromNdjson,
-  getArtifact as getArtifactFromNdjson,
-  getLatestVersion as getLatestVersionFromNdjson,
-} from "./versions-client";
+import { getAllVersions, getArtifact, getLatestVersion } from "./manifest";
 
 export function tryGetFromToolCache(
   arch: Architecture,
@@ -38,36 +29,42 @@ export function tryGetFromToolCache(
   return { installedPath, version: resolvedVersion };
 }
 
-export async function downloadVersionFromNdjson(
+export async function downloadVersion(
   platform: Platform,
   arch: Architecture,
   version: string,
   checkSum: string | undefined,
   githubToken: string,
+  manifestUrl?: string,
 ): Promise<{ version: string; cachedToolDir: string }> {
-  const artifact = await getArtifactFromNdjson(version, arch, platform);
+  const artifact = await getArtifact(version, arch, platform, manifestUrl);
 
   if (!artifact) {
     throw new Error(
-      `Could not find artifact for version ${version}, arch ${arch}, platform ${platform} in ${VERSIONS_NDJSON_URL} .`,
+      getMissingArtifactMessage(version, arch, platform, manifestUrl),
     );
   }
 
-  const mirrorUrl = rewriteToMirror(artifact.url);
-  const downloadUrl = mirrorUrl ?? artifact.url;
+  // For the default astral-sh/versions source, checksum validation relies on
+  // user input or the built-in KNOWN_CHECKSUMS table, not manifest sha256 values.
+  const checksum =
+    manifestUrl === undefined
+      ? checkSum
+      : resolveChecksum(checkSum, artifact.checksum);
+
+  const mirrorUrl = rewriteToMirror(artifact.downloadUrl);
+  const downloadUrl = mirrorUrl ?? artifact.downloadUrl;
   // Don't send the GitHub token to the Astral mirror.
   const downloadToken = mirrorUrl !== undefined ? undefined : githubToken;
 
-  // For the default astral-sh/versions source, checksum validation relies on
-  // user input or the built-in KNOWN_CHECKSUMS table, not NDJSON sha256 values.
   try {
-    return await downloadVersion(
+    return await downloadArtifact(
       downloadUrl,
       `uv-${arch}-${platform}`,
       platform,
       arch,
       version,
-      checkSum,
+      checksum,
       downloadToken,
     );
   } catch (err) {
@@ -79,13 +76,13 @@ export async function downloadVersionFromNdjson(
       `Failed to download from mirror, falling back to GitHub Releases: ${(err as Error).message}`,
     );
 
-    return await downloadVersion(
-      artifact.url,
+    return await downloadArtifact(
+      artifact.downloadUrl,
       `uv-${arch}-${platform}`,
       platform,
       arch,
       version,
-      checkSum,
+      checksum,
       githubToken,
     );
   }
@@ -99,41 +96,11 @@ export function rewriteToMirror(url: string): string | undefined {
   if (!url.startsWith(GITHUB_RELEASES_PREFIX)) {
     return undefined;
   }
+
   return ASTRAL_MIRROR_PREFIX + url.slice(GITHUB_RELEASES_PREFIX.length);
 }
 
-export async function downloadVersionFromManifest(
-  manifestUrl: string,
-  platform: Platform,
-  arch: Architecture,
-  version: string,
-  checkSum: string | undefined,
-  githubToken: string,
-): Promise<{ version: string; cachedToolDir: string }> {
-  const artifact = await getManifestArtifact(
-    manifestUrl,
-    version,
-    arch,
-    platform,
-  );
-  if (!artifact) {
-    throw new Error(
-      `manifest-file does not contain version ${version}, arch ${arch}, platform ${platform}.`,
-    );
-  }
-
-  return await downloadVersion(
-    artifact.downloadUrl,
-    `uv-${arch}-${platform}`,
-    platform,
-    arch,
-    version,
-    resolveChecksum(checkSum, artifact.checksum),
-    githubToken,
-  );
-}
-
-async function downloadVersion(
+async function downloadArtifact(
   downloadUrl: string,
   artifactName: string,
   platform: Platform,
@@ -177,13 +144,26 @@ async function downloadVersion(
     version,
     arch,
   );
-  return { cachedToolDir, version: version };
+  return { cachedToolDir, version };
+}
+
+function getMissingArtifactMessage(
+  version: string,
+  arch: Architecture,
+  platform: Platform,
+  manifestUrl?: string,
+): string {
+  if (manifestUrl === undefined) {
+    return `Could not find artifact for version ${version}, arch ${arch}, platform ${platform} in ${VERSIONS_MANIFEST_URL} .`;
+  }
+
+  return `manifest-file does not contain version ${version}, arch ${arch}, platform ${platform}.`;
 }
 
 function resolveChecksum(
   checkSum: string | undefined,
-  manifestChecksum?: string,
-): string | undefined {
+  manifestChecksum: string,
+): string {
   return checkSum !== undefined && checkSum !== ""
     ? checkSum
     : manifestChecksum;
@@ -199,31 +179,27 @@ export async function resolveVersion(
   resolutionStrategy: "highest" | "lowest" = "highest",
 ): Promise<string> {
   core.debug(`Resolving version: ${versionInput}`);
-  let version: string;
   const isSimpleMinimumVersionSpecifier =
     versionInput.includes(">") && !versionInput.includes(",");
   const resolveVersionSpecifierToLatest =
     isSimpleMinimumVersionSpecifier && resolutionStrategy === "highest";
+
   if (resolveVersionSpecifierToLatest) {
     core.info("Found minimum version specifier, using latest version");
   }
-  if (manifestUrl !== undefined) {
-    version =
-      versionInput === "latest" || resolveVersionSpecifierToLatest
-        ? await getLatestVersionInManifest(manifestUrl)
-        : versionInput;
-  } else {
-    version =
-      versionInput === "latest" || resolveVersionSpecifierToLatest
-        ? await getLatestVersionFromNdjson()
-        : versionInput;
-  }
+
+  const version =
+    versionInput === "latest" || resolveVersionSpecifierToLatest
+      ? await getLatestVersion(manifestUrl)
+      : versionInput;
+
   if (tc.isExplicitVersion(version)) {
     core.debug(`Version ${version} is an explicit version.`);
-    if (resolveVersionSpecifierToLatest) {
-      if (!pep440.satisfies(version, versionInput)) {
-        throw new Error(`No version found for ${versionInput}`);
-      }
+    if (
+      resolveVersionSpecifierToLatest &&
+      !pep440.satisfies(version, versionInput)
+    ) {
+      throw new Error(`No version found for ${versionInput}`);
     }
     return version;
   }
@@ -249,11 +225,11 @@ async function getAvailableVersions(
     core.info(
       `Getting available versions from manifest-file ${manifestUrl} ...`,
     );
-    return await getAllManifestVersions(manifestUrl);
+  } else {
+    core.info(`Getting available versions from ${VERSIONS_MANIFEST_URL} ...`);
   }
 
-  core.info(`Getting available versions from ${VERSIONS_NDJSON_URL} ...`);
-  return await getAllVersionsFromNdjson();
+  return await getAllVersions(manifestUrl);
 }
 
 function maxSatisfying(

src/download/legacy-version-manifest.ts

@@ -1,80 +0,0 @@
-import * as core from "@actions/core";
-
-export interface ManifestEntry {
-  arch: string;
-  platform: string;
-  version: string;
-  downloadUrl: string;
-  checksum?: string;
-  variant?: string;
-  archiveFormat?: string;
-}
-
-interface LegacyManifestEntry {
-  arch: string;
-  platform: string;
-  version: string;
-  downloadUrl: string;
-  checksum?: string;
-}
-
-const warnedLegacyManifestUrls = new Set<string>();
-
-export function parseLegacyManifestEntries(
-  parsedEntries: unknown[],
-  manifestUrl: string,
-): ManifestEntry[] {
-  warnAboutLegacyManifestFormat(manifestUrl);
-
-  return parsedEntries.map((entry, index) => {
-    if (!isLegacyManifestEntry(entry)) {
-      throw new Error(
-        `Invalid legacy manifest-file entry at index ${index} in ${manifestUrl}.`,
-      );
-    }
-
-    return {
-      arch: entry.arch,
-      checksum: entry.checksum,
-      downloadUrl: entry.downloadUrl,
-      platform: entry.platform,
-      version: entry.version,
-    };
-  });
-}
-
-export function clearLegacyManifestWarnings(): void {
-  warnedLegacyManifestUrls.clear();
-}
-
-function warnAboutLegacyManifestFormat(manifestUrl: string): void {
-  if (warnedLegacyManifestUrls.has(manifestUrl)) {
-    return;
-  }
-
-  warnedLegacyManifestUrls.add(manifestUrl);
-  core.warning(
-    `manifest-file ${manifestUrl} uses the legacy JSON array format, which is deprecated. Please migrate to the astral-sh/versions NDJSON format before the next major release.`,
-  );
-}
-
-function isLegacyManifestEntry(value: unknown): value is LegacyManifestEntry {
-  if (!isRecord(value)) {
-    return false;
-  }
-
-  const checksumIsValid =
-    typeof value.checksum === "string" || value.checksum === undefined;
-
-  return (
-    typeof value.arch === "string" &&
-    checksumIsValid &&
-    typeof value.downloadUrl === "string" &&
-    typeof value.platform === "string" &&
-    typeof value.version === "string"
-  );
-}
-
-function isRecord(value: unknown): value is Record<string, unknown> {
-  return typeof value === "object" && value !== null;
-}

src/download/manifest.ts

@@ -0,0 +1,208 @@
+import * as core from "@actions/core";
+import * as semver from "semver";
+import { VERSIONS_MANIFEST_URL } from "../utils/constants";
+import { fetch } from "../utils/fetch";
+import { selectDefaultVariant } from "./variant-selection";
+
+export interface ManifestArtifact {
+  platform: string;
+  variant?: string;
+  url: string;
+  archive_format: string;
+  sha256: string;
+}
+
+export interface ManifestVersion {
+  version: string;
+  artifacts: ManifestArtifact[];
+}
+
+export interface ArtifactResult {
+  archiveFormat: string;
+  checksum: string;
+  downloadUrl: string;
+}
+
+const cachedManifestData = new Map<string, ManifestVersion[]>();
+
+export async function fetchManifest(
+  manifestUrl: string = VERSIONS_MANIFEST_URL,
+): Promise<ManifestVersion[]> {
+  const cachedVersions = cachedManifestData.get(manifestUrl);
+  if (cachedVersions !== undefined) {
+    core.debug(`Using cached manifest data from ${manifestUrl}`);
+    return cachedVersions;
+  }
+
+  core.info(`Fetching manifest data from ${manifestUrl} ...`);
+  const response = await fetch(manifestUrl, {});
+  if (!response.ok) {
+    throw new Error(
+      `Failed to fetch manifest data: ${response.status} ${response.statusText}`,
+    );
+  }
+
+  const body = await response.text();
+  const versions = parseManifest(body, manifestUrl);
+  cachedManifestData.set(manifestUrl, versions);
+  return versions;
+}
+
+export function parseManifest(
+  data: string,
+  sourceDescription: string,
+): ManifestVersion[] {
+  const trimmed = data.trim();
+  if (trimmed === "") {
+    throw new Error(`Manifest at ${sourceDescription} is empty.`);
+  }
+
+  if (trimmed.startsWith("[")) {
+    throw new Error(
+      `Legacy JSON array manifests are no longer supported in ${sourceDescription}. Use the astral-sh/versions manifest format instead.`,
+    );
+  }
+
+  const versions: ManifestVersion[] = [];
+
+  for (const [index, line] of data.split("\n").entries()) {
+    const record = line.trim();
+    if (record === "") {
+      continue;
+    }
+
+    let parsed: unknown;
+    try {
+      parsed = JSON.parse(record);
+    } catch (error) {
+      throw new Error(
+        `Failed to parse manifest data from ${sourceDescription} at line ${index + 1}: ${(error as Error).message}`,
+      );
+    }
+
+    if (!isManifestVersion(parsed)) {
+      throw new Error(
+        `Invalid manifest record in ${sourceDescription} at line ${index + 1}.`,
+      );
+    }
+
+    versions.push(parsed);
+  }
+
+  if (versions.length === 0) {
+    throw new Error(`No manifest data found in ${sourceDescription}.`);
+  }
+
+  return versions;
+}
+
+export async function getLatestVersion(
+  manifestUrl: string = VERSIONS_MANIFEST_URL,
+): Promise<string> {
+  const versions = await fetchManifest(manifestUrl);
+  const [firstVersion, ...remainingVersions] = versions.map(
+    (versionData) => versionData.version,
+  );
+
+  if (firstVersion === undefined) {
+    throw new Error("No versions found in manifest data");
+  }
+
+  const latestVersion = remainingVersions.reduce(
+    (latest, current) => (semver.gt(current, latest) ? current : latest),
+    firstVersion,
+  );
+
+  core.debug(`Latest version from manifest: ${latestVersion}`);
+  return latestVersion;
+}
+
+export async function getAllVersions(
+  manifestUrl: string = VERSIONS_MANIFEST_URL,
+): Promise<string[]> {
+  const versions = await fetchManifest(manifestUrl);
+  return versions.map((versionData) => versionData.version);
+}
+
+export async function getArtifact(
+  version: string,
+  arch: string,
+  platform: string,
+  manifestUrl: string = VERSIONS_MANIFEST_URL,
+): Promise<ArtifactResult | undefined> {
+  const versions = await fetchManifest(manifestUrl);
+  const versionData = versions.find(
+    (candidate) => candidate.version === version,
+  );
+  if (!versionData) {
+    core.debug(`Version ${version} not found in manifest ${manifestUrl}`);
+    return undefined;
+  }
+
+  const targetPlatform = `${arch}-${platform}`;
+  const matchingArtifacts = versionData.artifacts.filter(
+    (candidate) => candidate.platform === targetPlatform,
+  );
+
+  if (matchingArtifacts.length === 0) {
+    core.debug(
+      `Artifact for ${targetPlatform} not found in version ${version}. Available platforms: ${versionData.artifacts
+        .map((candidate) => candidate.platform)
+        .join(", ")}`,
+    );
+    return undefined;
+  }
+
+  const artifact = selectDefaultVariant(
+    matchingArtifacts,
+    `Multiple artifacts found for ${targetPlatform} in version ${version}`,
+  );
+
+  return {
+    archiveFormat: artifact.archive_format,
+    checksum: artifact.sha256,
+    downloadUrl: artifact.url,
+  };
+}
+
+export function clearManifestCache(manifestUrl?: string): void {
+  if (manifestUrl === undefined) {
+    cachedManifestData.clear();
+    return;
+  }
+
+  cachedManifestData.delete(manifestUrl);
+}
+
+function isManifestVersion(value: unknown): value is ManifestVersion {
+  if (!isRecord(value)) {
+    return false;
+  }
+
+  if (typeof value.version !== "string" || !Array.isArray(value.artifacts)) {
+    return false;
+  }
+
+  return value.artifacts.every(isManifestArtifact);
+}
+
+function isManifestArtifact(value: unknown): value is ManifestArtifact {
+  if (!isRecord(value)) {
+    return false;
+  }
+
+  const variantIsValid =
+    typeof value.variant === "string" || value.variant === undefined;
+
+  return (
+    typeof value.archive_format === "string" &&
+    typeof value.platform === "string" &&
+    typeof value.sha256 === "string" &&
+    typeof value.url === "string" &&
+    variantIsValid
+  );
+}
+
+function isRecord(value: unknown): value is Record<string, unknown> {
+  return typeof value === "object" && value !== null;
+}

src/download/version-manifest.ts

@@ -1,169 +0,0 @@
-import * as core from "@actions/core";
-import * as semver from "semver";
-import { fetch } from "../utils/fetch";
-import {
-  clearLegacyManifestWarnings,
-  type ManifestEntry,
-  parseLegacyManifestEntries,
-} from "./legacy-version-manifest";
-import { selectDefaultVariant } from "./variant-selection";
-import { type NdjsonVersion, parseVersionData } from "./versions-client";
-
-export interface ManifestArtifact {
-  downloadUrl: string;
-  checksum?: string;
-  archiveFormat?: string;
-}
-
-const cachedManifestEntries = new Map<string, ManifestEntry[]>();
-
-export async function getLatestKnownVersion(
-  manifestUrl: string,
-): Promise<string> {
-  const versions = await getAllVersions(manifestUrl);
-  const latestVersion = versions.reduce((latest, current) =>
-    semver.gt(current, latest) ? current : latest,
-  );
-
-  return latestVersion;
-}
-
-export async function getAllVersions(manifestUrl: string): Promise<string[]> {
-  const manifestEntries = await getManifestEntries(manifestUrl);
-  return [...new Set(manifestEntries.map((entry) => entry.version))];
-}
-
-export async function getManifestArtifact(
-  manifestUrl: string,
-  version: string,
-  arch: string,
-  platform: string,
-): Promise<ManifestArtifact | undefined> {
-  const manifestEntries = await getManifestEntries(manifestUrl);
-  const entry = selectManifestEntry(
-    manifestEntries,
-    manifestUrl,
-    version,
-    arch,
-    platform,
-  );
-
-  if (!entry) {
-    return undefined;
-  }
-
-  return {
-    archiveFormat: entry.archiveFormat,
-    checksum: entry.checksum,
-    downloadUrl: entry.downloadUrl,
-  };
-}
-
-export function clearManifestCache(): void {
-  cachedManifestEntries.clear();
-  clearLegacyManifestWarnings();
-}
-
-async function getManifestEntries(
-  manifestUrl: string,
-): Promise<ManifestEntry[]> {
-  const cachedEntries = cachedManifestEntries.get(manifestUrl);
-  if (cachedEntries !== undefined) {
-    core.debug(`Using cached manifest-file from: ${manifestUrl}`);
-    return cachedEntries;
-  }
-
-  core.info(`Fetching manifest-file from: ${manifestUrl}`);
-  const response = await fetch(manifestUrl, {});
-  if (!response.ok) {
-    throw new Error(
-      `Failed to fetch manifest-file: ${response.status} ${response.statusText}`,
-    );
-  }
-
-  const data = await response.text();
-  const parsedEntries = parseManifestEntries(data, manifestUrl);
-  cachedManifestEntries.set(manifestUrl, parsedEntries);
-
-  return parsedEntries;
-}
-
-function parseManifestEntries(
-  data: string,
-  manifestUrl: string,
-): ManifestEntry[] {
-  const trimmed = data.trim();
-  if (trimmed === "") {
-    throw new Error(`manifest-file at ${manifestUrl} is empty.`);
-  }
-
-  const parsedAsJson = tryParseJson(trimmed);
-  if (Array.isArray(parsedAsJson)) {
-    return parseLegacyManifestEntries(parsedAsJson, manifestUrl);
-  }
-
-  const versions = parseVersionData(trimmed, manifestUrl);
-  return mapNdjsonVersionsToManifestEntries(versions, manifestUrl);
-}
-
-function mapNdjsonVersionsToManifestEntries(
-  versions: NdjsonVersion[],
-  manifestUrl: string,
-): ManifestEntry[] {
-  const manifestEntries: ManifestEntry[] = [];
-
-  for (const versionData of versions) {
-    for (const artifact of versionData.artifacts) {
-      const [arch, ...platformParts] = artifact.platform.split("-");
-      if (arch === undefined || platformParts.length === 0) {
-        throw new Error(
-          `Invalid artifact platform '${artifact.platform}' in manifest-file ${manifestUrl}.`,
-        );
-      }
-
-      manifestEntries.push({
-        arch,
-        archiveFormat: artifact.archive_format,
-        checksum: artifact.sha256,
-        downloadUrl: artifact.url,
-        platform: platformParts.join("-"),
-        variant: artifact.variant,
-        version: versionData.version,
-      });
-    }
-  }
-
-  return manifestEntries;
-}
-
-function selectManifestEntry(
-  manifestEntries: ManifestEntry[],
-  manifestUrl: string,
-  version: string,
-  arch: string,
-  platform: string,
-): ManifestEntry | undefined {
-  const matches = manifestEntries.filter(
-    (candidate) =>
-      candidate.version === version &&
-      candidate.arch === arch &&
-      candidate.platform === platform,
-  );
-
-  if (matches.length === 0) {
-    return undefined;
-  }
-
-  return selectDefaultVariant(
-    matches,
-    `manifest-file ${manifestUrl} contains multiple artifacts for version ${version}, arch ${arch}, platform ${platform}`,
-  );
-}
-
-function tryParseJson(value: string): unknown {
-  try {
-    return JSON.parse(value);
-  } catch {
-    return undefined;
-  }
-}

src/download/versions-client.ts

@@ -1,191 +0,0 @@
-import * as core from "@actions/core";
-import { VERSIONS_NDJSON_URL } from "../utils/constants";
-import { fetch } from "../utils/fetch";
-import { selectDefaultVariant } from "./variant-selection";
-
-export interface NdjsonArtifact {
-  platform: string;
-  variant?: string;
-  url: string;
-  archive_format: string;
-  sha256: string;
-}
-
-export interface NdjsonVersion {
-  version: string;
-  artifacts: NdjsonArtifact[];
-}
-
-export interface ArtifactResult {
-  url: string;
-  sha256: string;
-  archiveFormat: string;
-}
-
-const cachedVersionData = new Map<string, NdjsonVersion[]>();
-
-export async function fetchVersionData(
-  url: string = VERSIONS_NDJSON_URL,
-): Promise<NdjsonVersion[]> {
-  const cachedVersions = cachedVersionData.get(url);
-  if (cachedVersions !== undefined) {
-    core.debug(`Using cached NDJSON version data from ${url}`);
-    return cachedVersions;
-  }
-
-  core.info(`Fetching version data from ${url} ...`);
-  const response = await fetch(url, {});
-  if (!response.ok) {
-    throw new Error(
-      `Failed to fetch version data: ${response.status} ${response.statusText}`,
-    );
-  }
-
-  const body = await response.text();
-  const versions = parseVersionData(body, url);
-  cachedVersionData.set(url, versions);
-  return versions;
-}
-
-export function parseVersionData(
-  data: string,
-  sourceDescription: string,
-): NdjsonVersion[] {
-  const versions: NdjsonVersion[] = [];
-
-  for (const [index, line] of data.split("\n").entries()) {
-    const trimmed = line.trim();
-    if (trimmed === "") {
-      continue;
-    }
-
-    let parsed: unknown;
-    try {
-      parsed = JSON.parse(trimmed);
-    } catch (error) {
-      throw new Error(
-        `Failed to parse version data from ${sourceDescription} at line ${index + 1}: ${(error as Error).message}`,
-      );
-    }
-
-    if (!isNdjsonVersion(parsed)) {
-      throw new Error(
-        `Invalid NDJSON record in ${sourceDescription} at line ${index + 1}.`,
-      );
-    }
-
-    versions.push(parsed);
-  }
-
-  if (versions.length === 0) {
-    throw new Error(`No version data found in ${sourceDescription}.`);
-  }
-
-  return versions;
-}
-
-export async function getLatestVersion(): Promise<string> {
-  const versions = await fetchVersionData();
-  const latestVersion = versions[0]?.version;
-  if (!latestVersion) {
-    throw new Error("No versions found in NDJSON data");
-  }
-
-  core.debug(`Latest version from NDJSON: ${latestVersion}`);
-  return latestVersion;
-}
-
-export async function getAllVersions(): Promise<string[]> {
-  const versions = await fetchVersionData();
-  return versions.map((versionData) => versionData.version);
-}
-
-export async function getArtifact(
-  version: string,
-  arch: string,
-  platform: string,
-): Promise<ArtifactResult | undefined> {
-  const versions = await fetchVersionData();
-  const versionData = versions.find(
-    (candidate) => candidate.version === version,
-  );
-  if (!versionData) {
-    core.debug(`Version ${version} not found in NDJSON data`);
-    return undefined;
-  }
-
-  const targetPlatform = `${arch}-${platform}`;
-  const matchingArtifacts = versionData.artifacts.filter(
-    (candidate) => candidate.platform === targetPlatform,
-  );
-
-  if (matchingArtifacts.length === 0) {
-    core.debug(
-      `Artifact for ${targetPlatform} not found in version ${version}. Available platforms: ${versionData.artifacts
-        .map((candidate) => candidate.platform)
-        .join(", ")}`,
-    );
-    return undefined;
-  }
-
-  const artifact = selectArtifact(matchingArtifacts, version, targetPlatform);
-
-  return {
-    archiveFormat: artifact.archive_format,
-    sha256: artifact.sha256,
-    url: artifact.url,
-  };
-}
-
-export function clearCache(url?: string): void {
-  if (url === undefined) {
-    cachedVersionData.clear();
-    return;
-  }
-
-  cachedVersionData.delete(url);
-}
-
-function selectArtifact(
-  artifacts: NdjsonArtifact[],
-  version: string,
-  targetPlatform: string,
-): NdjsonArtifact {
-  return selectDefaultVariant(
-    artifacts,
-    `Multiple artifacts found for ${targetPlatform} in version ${version}`,
-  );
-}
-
-function isNdjsonVersion(value: unknown): value is NdjsonVersion {
-  if (!isRecord(value)) {
-    return false;
-  }
-
-  if (typeof value.version !== "string" || !Array.isArray(value.artifacts)) {
-    return false;
-  }
-
-  return value.artifacts.every(isNdjsonArtifact);
-}
-
-function isNdjsonArtifact(value: unknown): value is NdjsonArtifact {
-  if (!isRecord(value)) {
-    return false;
-  }
-
-  const variantIsValid =
-    typeof value.variant === "string" || value.variant === undefined;
-
-  return (
-    typeof value.archive_format === "string" &&
-    typeof value.platform === "string" &&
-    typeof value.sha256 === "string" &&
-    typeof value.url === "string" &&
-    variantIsValid
-  );
-}
-
-function isRecord(value: unknown): value is Record<string, unknown> {
-  return typeof value === "object" && value !== null;
-}

src/setup-uv.ts

@@ -4,8 +4,7 @@ import * as core from "@actions/core";
 import * as exec from "@actions/exec";
 import { restoreCache } from "./cache/restore-cache";
 import {
-  downloadVersionFromManifest,
-  downloadVersionFromNdjson,
+  downloadVersion,
   resolveVersion,
   tryGetFromToolCache,
 } from "./download/download-version";
@@ -132,7 +131,7 @@ async function setupUv(
   checkSum: string | undefined,
   githubToken: string,
 ): Promise<{ uvDir: string; version: string }> {
-  const resolvedVersion = await determineVersion(manifestFile);
+  const resolvedVersion = await determineVersion();
   const toolCacheResult = tryGetFromToolCache(arch, resolvedVersion);
   if (toolCacheResult.installedPath) {
     core.info(`Found uv in tool-cache for ${toolCacheResult.version}`);
@@ -142,36 +141,34 @@ async function setupUv(
     };
   }
 
-  const downloadVersionResult =
-    manifestFile !== undefined
-      ? await downloadVersionFromManifest(
-          manifestFile,
-          platform,
-          arch,
-          resolvedVersion,
-          checkSum,
-          githubToken,
-        )
-      : await downloadVersionFromNdjson(
-          platform,
-          arch,
-          resolvedVersion,
-          checkSum,
-          githubToken,
-        );
+  const downloadResult = await downloadVersion(
+    platform,
+    arch,
+    resolvedVersion,
+    checkSum,
+    githubToken,
+    manifestFile,
+  );
 
   return {
-    uvDir: downloadVersionResult.cachedToolDir,
-    version: downloadVersionResult.version,
+    uvDir: downloadResult.cachedToolDir,
+    version: downloadResult.version,
   };
 }
 
-async function determineVersion(
-  manifestFile: string | undefined,
-): Promise<string> {
+async function determineVersion(): Promise<string> {
+  return await resolveVersion(
+    getRequestedVersion(),
+    manifestFile,
+    resolutionStrategy,
+  );
+}
+
+function getRequestedVersion(): string {
   if (versionInput !== "") {
-    return await resolveVersion(versionInput, manifestFile, resolutionStrategy);
+    return versionInput;
   }
+
   if (versionFileInput !== "") {
     const versionFromFile = getUvVersionFromFile(versionFileInput);
     if (versionFromFile === undefined) {
@@ -179,28 +176,23 @@ async function determineVersion(
         `Could not determine uv version from file: ${versionFileInput}`,
       );
     }
-    return await resolveVersion(
-      versionFromFile,
-      manifestFile,
-      resolutionStrategy,
-    );
+    return versionFromFile;
   }
+
   const versionFromUvToml = getUvVersionFromFile(
     `${workingDirectory}${path.sep}uv.toml`,
   );
   const versionFromPyproject = getUvVersionFromFile(
     `${workingDirectory}${path.sep}pyproject.toml`,
   );
+
   if (versionFromUvToml === undefined && versionFromPyproject === undefined) {
     core.info(
       "Could not determine uv version from uv.toml or pyproject.toml. Falling back to latest.",
     );
   }
-  return await resolveVersion(
-    versionFromUvToml || versionFromPyproject || "latest",
-    manifestFile,
-    resolutionStrategy,
-  );
+
+  return versionFromUvToml || versionFromPyproject || "latest";
 }
 
 function addUvToPathAndOutput(cachedPath: string): void {

src/update-known-checksums.ts

@@ -6,10 +6,10 @@ import {
   updateChecksums,
 } from "./download/checksum/update-known-checksums";
 import {
-  fetchVersionData,
+  fetchManifest,
   getLatestVersion,
-  type NdjsonVersion,
-} from "./download/versions-client";
+  type ManifestVersion,
+} from "./download/manifest";
 
 const VERSION_IN_CHECKSUM_KEY_PATTERN =
   /-(\d+\.\d+\.\d+(?:[-+][0-9A-Za-z.-]+)?)$/;
@@ -32,8 +32,8 @@ async function run(): Promise<void> {
     return;
   }
 
-  const versions = await fetchVersionData();
-  const checksumEntries = extractChecksumsFromNdjson(versions);
+  const versions = await fetchManifest();
+  const checksumEntries = extractChecksumsFromManifest(versions);
   await updateChecksums(checksumFilePath, checksumEntries);
 
   core.setOutput("latest-version", latestVersion);
@@ -61,8 +61,8 @@ function extractVersionFromChecksumKey(key: string): string | undefined {
   return key.match(VERSION_IN_CHECKSUM_KEY_PATTERN)?.[1];
 }
 
-function extractChecksumsFromNdjson(
-  versions: NdjsonVersion[],
+function extractChecksumsFromManifest(
+  versions: ManifestVersion[],
 ): ChecksumEntry[] {
   const checksums: ChecksumEntry[] = [];
 

src/utils/constants.ts

@@ -1,7 +1,7 @@
 export const TOOL_CACHE_NAME = "uv";
 export const STATE_UV_PATH = "uv-path";
 export const STATE_UV_VERSION = "uv-version";
-export const VERSIONS_NDJSON_URL =
+export const VERSIONS_MANIFEST_URL =
   "https://raw.githubusercontent.com/astral-sh/versions/main/v1/uv.ndjson";
 
 /** GitHub Releases URL prefix for uv artifacts. */