Skip to content
Snippets Groups Projects
Unverified Commit e09881b1 authored by Jeremy's avatar Jeremy
Browse files

Small tweaks

parent d80d53d8
No related branches found
Tags
No related merge requests found
...@@ -267,6 +267,8 @@ export class ClientOptionsHandler { ...@@ -267,6 +267,8 @@ export class ClientOptionsHandler {
libpath: string[]; libpath: string[];
liblink: string[]; liblink: string[];
lookupversion: null | PropertyValue; lookupversion: null | PropertyValue;
options: string[];
hidden: boolean;
}; };
type Library = { type Library = {
name: string; name: string;
...@@ -301,7 +303,7 @@ export class ClientOptionsHandler { ...@@ -301,7 +303,7 @@ export class ClientOptionsHandler {
if (listedVersions) { if (listedVersions) {
for (const version of listedVersions.split(':')) { for (const version of listedVersions.split(':')) {
const libVersionName = libBaseName + `.versions.${version}`; const libVersionName = libBaseName + `.versions.${version}`;
const versionObject = { const versionObject: VersionInfo = {
version: this.compilerProps<string>(lang, libVersionName + '.version'), version: this.compilerProps<string>(lang, libVersionName + '.version'),
staticliblink: splitIntoArray( staticliblink: splitIntoArray(
this.compilerProps<string>(lang, libVersionName + '.staticliblink'), this.compilerProps<string>(lang, libVersionName + '.staticliblink'),
...@@ -312,8 +314,8 @@ export class ClientOptionsHandler { ...@@ -312,8 +314,8 @@ export class ClientOptionsHandler {
this.compilerProps<string>(lang, libVersionName + '.dependencies'), this.compilerProps<string>(lang, libVersionName + '.dependencies'),
libraries[lang][lib].dependencies, libraries[lang][lib].dependencies,
), ),
path: [] as string[], path: [],
libpath: [] as string[], libpath: [],
liblink: splitIntoArray( liblink: splitIntoArray(
this.compilerProps<string>(lang, libVersionName + '.liblink'), this.compilerProps<string>(lang, libVersionName + '.liblink'),
libraries[lang][lib].liblink, libraries[lang][lib].liblink,
...@@ -321,7 +323,7 @@ export class ClientOptionsHandler { ...@@ -321,7 +323,7 @@ export class ClientOptionsHandler {
// Library options might get overridden later // Library options might get overridden later
options: libraries[lang][lib].options, options: libraries[lang][lib].options,
hidden: this.compilerProps(lang, libVersionName + '.hidden', false), hidden: this.compilerProps(lang, libVersionName + '.hidden', false),
lookupversion: null as null | PropertyValue, lookupversion: null,
}; };
const lookupversion = this.compilerProps(lang, libVersionName + '.lookupversion'); const lookupversion = this.compilerProps(lang, libVersionName + '.lookupversion');
...@@ -357,6 +359,8 @@ export class ClientOptionsHandler { ...@@ -357,6 +359,8 @@ export class ClientOptionsHandler {
for (const langGroup of Object.values(libraries)) { for (const langGroup of Object.values(libraries)) {
for (const libGroup of Object.values(langGroup)) { for (const libGroup of Object.values(langGroup)) {
const versions = Object.values(libGroup.versions); const versions = Object.values(libGroup.versions);
// TODO: A and B don't contain any property called semver here. It's probably leftover from old code
// and should be removed in the future.
versions.sort((a, b) => versions.sort((a, b) =>
semverParser.compare(asSafeVer((a as any).semver), asSafeVer((b as any).semver), true), semverParser.compare(asSafeVer((a as any).semver), asSafeVer((b as any).semver), true),
); );
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment