robojerk/codeql-action

Avoid using SemVer instances

Browse source 
Use strings instead. They are easier to serialize and deserialize.
This commit is contained in:
Andrew Eisenberg 2021-06-04 13:34:55 -07:00
parent 9b5753ab00
commit 06687e95c8
10 changed files with 26 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/analyze.js generated
View file

@ -179,7 +179,7 @@ function createPackSuiteContents(packsWithVersion) {
function packWithVersionToQuerySuiteEntry(pack) {
let text = `- qlpack: ${pack.packName}`;
if (pack.version) {
text += `${"\n"} version: ${pack.version.format()}`;
text += `${"\n"} version: ${pack.version}`;
}
return text;
}

2
lib/analyze.js.map
View file

File diff suppressed because one or more lines are too long

4
lib/analyze.test.js generated
View file

@ -45,13 +45,13 @@ ava_1.default("status report fields and search path setting", async (t) => {
[languages_1.Language.cpp]: [
{
packName: "a/b",
version: semver_1.parse("1.0.0"),
version: semver_1.clean("1.0.0"),
},
],
[languages_1.Language.java]: [
{
packName: "c/d",
version: semver_1.parse("2.0.0"),
version: semver_1.clean("2.0.0"),
},
],
};

2
lib/config-utils.js generated
View file

@ -592,7 +592,7 @@ function toPackWithVersion(packStr, configFile) {
throw new Error(getPacksStrInvalid(packStr, configFile));
}
else if (nameWithVersion.length === 2) {
version = semver.parse(nameWithVersion[1]) || undefined;
version = semver.clean(nameWithVersion[1]) || undefined;
if (!version) {
throw new Error(getPacksStrInvalid(packStr, configFile));
}

2
lib/config-utils.js.map
View file

File diff suppressed because one or more lines are too long

12
lib/config-utils.test.js generated
View file

@ -584,7 +584,7 @@ ava_1.default("Config specifies packages", async (t) => {
[languages_1.Language.javascript]: [
{
packName: "a/b",
version: semver_1.parse("1.2.3"),
version: semver_1.clean("1.2.3"),
},
],
});
@ -623,13 +623,13 @@ ava_1.default("Config specifies packages for multiple languages", async (t) => {
[languages_1.Language.javascript]: [
{
packName: "a/b",
version: semver_1.parse("1.2.3"),
version: semver_1.clean("1.2.3"),
},
],
[languages_1.Language.python]: [
{
packName: "c/d",
version: semver_1.parse("1.2.3"),
version: semver_1.clean("1.2.3"),
},
],
});
@ -767,7 +767,7 @@ ava_1.default("no packs", parsePacksMacro, undefined, [], {});
ava_1.default("two packs", parsePacksMacro, ["a/b", "c/d@1.2.3"], [languages_1.Language.cpp], {
[languages_1.Language.cpp]: [
{ packName: "a/b", version: undefined },
{ packName: "c/d", version: semver_1.parse("1.2.3") },
{ packName: "c/d", version: semver_1.clean("1.2.3") },
],
});
ava_1.default("two packs with language", parsePacksMacro, {
@ -776,11 +776,11 @@ ava_1.default("two packs with language", parsePacksMacro, {
}, [languages_1.Language.cpp, languages_1.Language.java, languages_1.Language.csharp], {
[languages_1.Language.cpp]: [
{ packName: "a/b", version: undefined },
{ packName: "c/d", version: semver_1.parse("1.2.3") },
{ packName: "c/d", version: semver_1.clean("1.2.3") },
],
[languages_1.Language.java]: [
{ packName: "d/e", version: undefined },
{ packName: "f/g", version: semver_1.parse("1.2.3") },
{ packName: "f/g", version: semver_1.clean("1.2.3") },
],
});
ava_1.default("no language", parsePacksErrorMacro, ["a/b@1.2.3"], [languages_1.Language.java, languages_1.Language.python], /The configuration file "\/a\/b" is invalid: property "packs" must split packages by language/);