From 05917d5627c41d83b3adcf735b22c48d3371587d Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Mon, 22 Jun 2026 22:11:16 +0000 Subject: [PATCH] refactor: address review feedback on Community resolver --- dist/setup/index.js | 9 +++++---- src/distributions/graalvm/installer.ts | 5 +++-- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/dist/setup/index.js b/dist/setup/index.js index 989958be..370e569c 100644 --- a/dist/setup/index.js +++ b/dist/setup/index.js @@ -79087,6 +79087,7 @@ const GRAALVM_COMMUNITY_RELEASES_URL = 'https://api.github.com/repos/graalvm/gra const GRAALVM_COMMUNITY_RELEASES_PAGE_ORIGIN = 'https://api.github.com'; const GRAALVM_COMMUNITY_DOWNLOAD_URL = 'https://github.com/graalvm/graalvm-ce-builds/releases'; const GRAALVM_COMMUNITY_ASSET_PREFIX = 'graalvm-community-jdk-'; +const GRAALVM_COMMUNITY_VERSION_PATTERN = /^\d+(?:\.\d+)*$/; const IS_WINDOWS = process.platform === 'win32'; const GRAALVM_PLATFORM = IS_WINDOWS ? 'windows' : process.platform; const GRAALVM_MIN_VERSION = 17; @@ -79292,14 +79293,14 @@ class GraalVMCommunityDistribution extends GraalVMDistribution { }); } getAvailableVersions(assetSuffix) { - var _a, _b; + var _a; return __awaiter(this, void 0, void 0, function* () { const headers = (0, util_1.getGitHubHttpHeaders)(); const versions = new Map(); let releasesUrl = GRAALVM_COMMUNITY_RELEASES_URL; for (let page = 0; releasesUrl && page < util_1.MAX_PAGINATION_PAGES; page++) { const response = yield this.http.getJson(releasesUrl, headers); - const releases = (_a = response.result) !== null && _a !== void 0 ? _a : []; + const releases = Array.isArray(response.result) ? response.result : []; if (releases.length === 0) { break; } @@ -79307,7 +79308,7 @@ class GraalVMCommunityDistribution extends GraalVMDistribution { if (release.draft || release.prerelease) { continue; } - for (const asset of (_b = release.assets) !== null && _b !== void 0 ? _b : []) { + for (const asset of (_a = release.assets) !== null && _a !== void 0 ? _a : []) { const version = this.extractAssetVersion(asset.name, assetSuffix); if (version) { versions.set(version, { @@ -79330,7 +79331,7 @@ class GraalVMCommunityDistribution extends GraalVMDistribution { return null; } const rawVersion = assetName.slice(GRAALVM_COMMUNITY_ASSET_PREFIX.length, -assetSuffix.length); - if (!/^\d+(?:\.\d+)*$/.test(rawVersion)) { + if (!GRAALVM_COMMUNITY_VERSION_PATTERN.test(rawVersion)) { return null; } return (0, util_1.convertVersionToSemver)(rawVersion); diff --git a/src/distributions/graalvm/installer.ts b/src/distributions/graalvm/installer.ts index 377d1b6e..eb2cba63 100644 --- a/src/distributions/graalvm/installer.ts +++ b/src/distributions/graalvm/installer.ts @@ -31,6 +31,7 @@ const GRAALVM_COMMUNITY_RELEASES_PAGE_ORIGIN = 'https://api.github.com'; const GRAALVM_COMMUNITY_DOWNLOAD_URL = 'https://github.com/graalvm/graalvm-ce-builds/releases'; const GRAALVM_COMMUNITY_ASSET_PREFIX = 'graalvm-community-jdk-'; +const GRAALVM_COMMUNITY_VERSION_PATTERN = /^\d+(?:\.\d+)*$/; const IS_WINDOWS = process.platform === 'win32'; const GRAALVM_PLATFORM = IS_WINDOWS ? 'windows' : process.platform; const GRAALVM_MIN_VERSION = 17; @@ -386,7 +387,7 @@ export class GraalVMCommunityDistribution extends GraalVMDistribution { headers ); - const releases = response.result ?? []; + const releases = Array.isArray(response.result) ? response.result : []; if (releases.length === 0) { break; } @@ -431,7 +432,7 @@ export class GraalVMCommunityDistribution extends GraalVMDistribution { -assetSuffix.length ); - if (!/^\d+(?:\.\d+)*$/.test(rawVersion)) { + if (!GRAALVM_COMMUNITY_VERSION_PATTERN.test(rawVersion)) { return null; }