robojerk/codeql-action

Use nullish conversion for packs

Browse source 
Slightly simplifies the `parsePacks` function.
This commit is contained in:
Andrew Eisenberg 2021-06-09 13:18:27 -07:00
parent 49b2220f92
commit 96e7de35af
3 changed files with 9 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lib/config-utils.js generated
View file

@ -441,6 +441,7 @@ exports.getDefaultConfig = getDefaultConfig;
* Load the config from the given file.
*/
async function loadConfig(languagesInput, queriesInput, configFile, dbLocation, repository, tempDir, toolCacheDir, codeQL, checkoutPath, gitHubVersion, apiDetails, logger) {
var _a;
let parsedYAML;
if (isLocal(configFile)) {
// Treat the config file as relative to the workspace
@ -522,7 +523,7 @@ async function loadConfig(languagesInput, queriesInput, configFile, dbLocation,
paths.push(validateAndSanitisePath(includePath, PATHS_PROPERTY, configFile, logger));
}
}
const packs = parsePacks(parsedYAML[PACKS_PROPERTY], languages, configFile);
const packs = parsePacks((_a = parsedYAML[PACKS_PROPERTY], (_a !== null && _a !== void 0 ? _a : {})), languages, configFile);
return {
languages,
queries,
@ -550,9 +551,6 @@ const PACK_IDENTIFIER_PATTERN = (function () {
// Exported for testing
function parsePacks(packsByLanguage, languages, configFile) {
const packs = {};
if (!packsByLanguage) {
return packs;
}
if (Array.isArray(packsByLanguage)) {
if (languages.length === 1) {
// single language analysis, so language is implicit

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

File diff suppressed because one or more lines are too long

12
src/config-utils.ts
View file

@ -999,7 +999,11 @@ async function loadConfig(
}
}
const packs = parsePacks(parsedYAML[PACKS_PROPERTY], languages, configFile);
const packs = parsePacks(
parsedYAML[PACKS_PROPERTY] ?? {},
languages,
configFile
);
return {
languages,
@ -1029,16 +1033,12 @@ const PACK_IDENTIFIER_PATTERN = (function () {
// Exported for testing
export function parsePacks(
packsByLanguage: string[] | Record<string, string[]> | undefined,
packsByLanguage: string[] | Record<string, string[]>,
languages: Language[],
configFile: string
): Packs {
const packs = {};
if (!packsByLanguage) {
return packs;
}
if (Array.isArray(packsByLanguage)) {
if (languages.length === 1) {
// single language analysis, so language is implicit