Skip to content

Commit 05917d5

Browse files
authored
refactor: address review feedback on Community resolver
1 parent 651865a commit 05917d5

2 files changed

Lines changed: 8 additions & 6 deletions

File tree

dist/setup/index.js

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -79087,6 +79087,7 @@ const GRAALVM_COMMUNITY_RELEASES_URL = 'https://api.github.com/repos/graalvm/gra
7908779087
const GRAALVM_COMMUNITY_RELEASES_PAGE_ORIGIN = 'https://api.github.com';
7908879088
const GRAALVM_COMMUNITY_DOWNLOAD_URL = 'https://github.com/graalvm/graalvm-ce-builds/releases';
7908979089
const GRAALVM_COMMUNITY_ASSET_PREFIX = 'graalvm-community-jdk-';
79090+
const GRAALVM_COMMUNITY_VERSION_PATTERN = /^\d+(?:\.\d+)*$/;
7909079091
const IS_WINDOWS = process.platform === 'win32';
7909179092
const GRAALVM_PLATFORM = IS_WINDOWS ? 'windows' : process.platform;
7909279093
const GRAALVM_MIN_VERSION = 17;
@@ -79292,22 +79293,22 @@ class GraalVMCommunityDistribution extends GraalVMDistribution {
7929279293
});
7929379294
}
7929479295
getAvailableVersions(assetSuffix) {
79295-
var _a, _b;
79296+
var _a;
7929679297
return __awaiter(this, void 0, void 0, function* () {
7929779298
const headers = (0, util_1.getGitHubHttpHeaders)();
7929879299
const versions = new Map();
7929979300
let releasesUrl = GRAALVM_COMMUNITY_RELEASES_URL;
7930079301
for (let page = 0; releasesUrl && page < util_1.MAX_PAGINATION_PAGES; page++) {
7930179302
const response = yield this.http.getJson(releasesUrl, headers);
79302-
const releases = (_a = response.result) !== null && _a !== void 0 ? _a : [];
79303+
const releases = Array.isArray(response.result) ? response.result : [];
7930379304
if (releases.length === 0) {
7930479305
break;
7930579306
}
7930679307
for (const release of releases) {
7930779308
if (release.draft || release.prerelease) {
7930879309
continue;
7930979310
}
79310-
for (const asset of (_b = release.assets) !== null && _b !== void 0 ? _b : []) {
79311+
for (const asset of (_a = release.assets) !== null && _a !== void 0 ? _a : []) {
7931179312
const version = this.extractAssetVersion(asset.name, assetSuffix);
7931279313
if (version) {
7931379314
versions.set(version, {
@@ -79330,7 +79331,7 @@ class GraalVMCommunityDistribution extends GraalVMDistribution {
7933079331
return null;
7933179332
}
7933279333
const rawVersion = assetName.slice(GRAALVM_COMMUNITY_ASSET_PREFIX.length, -assetSuffix.length);
79333-
if (!/^\d+(?:\.\d+)*$/.test(rawVersion)) {
79334+
if (!GRAALVM_COMMUNITY_VERSION_PATTERN.test(rawVersion)) {
7933479335
return null;
7933579336
}
7933679337
return (0, util_1.convertVersionToSemver)(rawVersion);

src/distributions/graalvm/installer.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ const GRAALVM_COMMUNITY_RELEASES_PAGE_ORIGIN = 'https://api.github.com';
3131
const GRAALVM_COMMUNITY_DOWNLOAD_URL =
3232
'https://github.com/graalvm/graalvm-ce-builds/releases';
3333
const GRAALVM_COMMUNITY_ASSET_PREFIX = 'graalvm-community-jdk-';
34+
const GRAALVM_COMMUNITY_VERSION_PATTERN = /^\d+(?:\.\d+)*$/;
3435
const IS_WINDOWS = process.platform === 'win32';
3536
const GRAALVM_PLATFORM = IS_WINDOWS ? 'windows' : process.platform;
3637
const GRAALVM_MIN_VERSION = 17;
@@ -386,7 +387,7 @@ export class GraalVMCommunityDistribution extends GraalVMDistribution {
386387
headers
387388
);
388389

389-
const releases = response.result ?? [];
390+
const releases = Array.isArray(response.result) ? response.result : [];
390391
if (releases.length === 0) {
391392
break;
392393
}
@@ -431,7 +432,7 @@ export class GraalVMCommunityDistribution extends GraalVMDistribution {
431432
-assetSuffix.length
432433
);
433434

434-
if (!/^\d+(?:\.\d+)*$/.test(rawVersion)) {
435+
if (!GRAALVM_COMMUNITY_VERSION_PATTERN.test(rawVersion)) {
435436
return null;
436437
}
437438

0 commit comments

Comments
 (0)