mirrors/compiler-explorer
1
0
Fork 0
mirror of https://github.com/compiler-explorer/compiler-explorer.git synced 2025-12-27 11:44:09 -05:00
Code Issues Packages Projects Releases Wiki Activity

Sort libs based on semver (#4153)

Browse Source
This commit is contained in:
Rubén Rincón Blanco
2022-10-12 21:12:44 +02:00
committed by GitHub
parent b8e4d2d105
commit c3eee72def
4 changed files with 25 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lib/options-handler.js
View File

@@ -242,6 +242,17 @@ export class ClientOptionsHandler {
}
}
}
for (const langGroup of Object.values(libraries)) {
for (const libGroup of Object.values(langGroup)) {
const versions = Object.values(libGroup.versions);
versions.sort((a, b) => semverParser.compare(asSafeVer(a.semver), asSafeVer(b.semver), true));
let order = 0;
// Set $order to index on array. As group is an array, iteration order is guaranteed.
for (const lib of versions) {
lib['$order'] = order++;
}
}
}
return libraries;
}

4
lib/utils.ts
View File

@@ -424,8 +424,8 @@ export function countOccurrences<T>(collection: Iterable<T>, item: T): number {
return result;
}
export function asSafeVer(semver: string | number | null) {
if (semver !== null) {
export function asSafeVer(semver: string | number | null | undefined) {
if (semver != null) {
if (typeof semver === 'number') {
semver = `${semver}`;
}

8
static/widgets/libs-widget.ts
View File

@@ -281,7 +281,13 @@ export class LibsWidget {
versions.append(noVersionSelectedOption);
let hasVisibleVersions = false;
for (const versionId in lib.versions) {
const versionsArr = Object.keys(lib.versions).map(id => {
return {id: id, order: lib.versions[id]['$order']};
});
versionsArr.sort((a, b) => b.order - a.order);
for (const libVersion of versionsArr) {
const versionId = libVersion.id;
const version = lib.versions[versionId];
const option = $('<option>');
if (version.used) {

5
test/options-handler.js
View File

@@ -172,6 +172,7 @@ describe('Options handler', () => {
options: [],
versions: {
noPaths: {
$order: 2,
path: [],
version: 'no paths',
liblink: [],
@@ -184,6 +185,7 @@ describe('Options handler', () => {
hidden: false,
},
onePath: {
$order: 0,
path: ['/dev/null'],
version: 'one path',
staticliblink: [],
@@ -195,6 +197,7 @@ describe('Options handler', () => {
hidden: false,
},
twoPaths: {
$order: 1,
path: ['/dev/null', '/dev/urandom'],
staticliblink: [],
dependencies: [],
@@ -218,6 +221,7 @@ describe('Options handler', () => {
options: [],
versions: {
std: {
$order: 0,
libpath: [],
path: [],
version: 'std',
@@ -241,6 +245,7 @@ describe('Options handler', () => {
options: [],
versions: {
trunk: {
$order: 0,
libpath: [],
path: [],
version: 'trunk',