Refactoring: Add getExtractionVerbosityArguments wrapper

This commit is contained in:
Henry Mercer
2024-03-13 18:27:21 +00:00
parent 070b05147a
commit 8da95d81a8
3 changed files with 20 additions and 19 deletions

17
lib/codeql.js generated
View File

@@ -363,9 +363,7 @@ async function getCodeQLForCmd(cmd, checkVersion) {
"trace-command", "trace-command",
"--index-traceless-dbs", "--index-traceless-dbs",
...(await getTrapCachingExtractorConfigArgsForLang(config, language)), ...(await getTrapCachingExtractorConfigArgsForLang(config, language)),
...(config.debugMode ...getExtractionVerbosityArguments(config.debugMode),
? [`--verbosity=${EXTRACTION_DEBUG_MODE_VERBOSITY}`]
: []),
...getExtraOptionsFromEnv(["database", "trace-command"]), ...getExtraOptionsFromEnv(["database", "trace-command"]),
util.getCodeQLDatabasePath(config, language), util.getCodeQLDatabasePath(config, language),
]); ]);
@@ -376,9 +374,7 @@ async function getCodeQLForCmd(cmd, checkVersion) {
"trace-command", "trace-command",
"--use-build-mode", "--use-build-mode",
...(await getTrapCachingExtractorConfigArgsForLang(config, language)), ...(await getTrapCachingExtractorConfigArgsForLang(config, language)),
...(config.debugMode ...getExtractionVerbosityArguments(config.debugMode),
? [`--verbosity=${EXTRACTION_DEBUG_MODE_VERBOSITY}`]
: []),
...getExtraOptionsFromEnv(["database", "trace-command"]), ...getExtraOptionsFromEnv(["database", "trace-command"]),
util.getCodeQLDatabasePath(config, language), util.getCodeQLDatabasePath(config, language),
]); ]);
@@ -390,9 +386,7 @@ async function getCodeQLForCmd(cmd, checkVersion) {
"--finalize-dataset", "--finalize-dataset",
threadsFlag, threadsFlag,
memoryFlag, memoryFlag,
...(enableDebugLogging ...getExtractionVerbosityArguments(enableDebugLogging),
? [`--verbosity=${EXTRACTION_DEBUG_MODE_VERBOSITY}`]
: []),
...getExtraOptionsFromEnv(["database", "finalize"]), ...getExtraOptionsFromEnv(["database", "finalize"]),
databasePath, databasePath,
]; ];
@@ -937,4 +931,9 @@ async function getCodeScanningQueryHelpArguments(codeql) {
} }
return ["--sarif-add-query-help"]; return ["--sarif-add-query-help"];
} }
function getExtractionVerbosityArguments(enableDebugLogging) {
return enableDebugLogging
? [`--verbosity=${EXTRACTION_DEBUG_MODE_VERBOSITY}`]
: [];
}
//# sourceMappingURL=codeql.js.map //# sourceMappingURL=codeql.js.map

File diff suppressed because one or more lines are too long

View File

@@ -692,9 +692,7 @@ export async function getCodeQLForCmd(
"trace-command", "trace-command",
"--index-traceless-dbs", "--index-traceless-dbs",
...(await getTrapCachingExtractorConfigArgsForLang(config, language)), ...(await getTrapCachingExtractorConfigArgsForLang(config, language)),
...(config.debugMode ...getExtractionVerbosityArguments(config.debugMode),
? [`--verbosity=${EXTRACTION_DEBUG_MODE_VERBOSITY}`]
: []),
...getExtraOptionsFromEnv(["database", "trace-command"]), ...getExtraOptionsFromEnv(["database", "trace-command"]),
util.getCodeQLDatabasePath(config, language), util.getCodeQLDatabasePath(config, language),
]); ]);
@@ -705,9 +703,7 @@ export async function getCodeQLForCmd(
"trace-command", "trace-command",
"--use-build-mode", "--use-build-mode",
...(await getTrapCachingExtractorConfigArgsForLang(config, language)), ...(await getTrapCachingExtractorConfigArgsForLang(config, language)),
...(config.debugMode ...getExtractionVerbosityArguments(config.debugMode),
? [`--verbosity=${EXTRACTION_DEBUG_MODE_VERBOSITY}`]
: []),
...getExtraOptionsFromEnv(["database", "trace-command"]), ...getExtraOptionsFromEnv(["database", "trace-command"]),
util.getCodeQLDatabasePath(config, language), util.getCodeQLDatabasePath(config, language),
]); ]);
@@ -724,9 +720,7 @@ export async function getCodeQLForCmd(
"--finalize-dataset", "--finalize-dataset",
threadsFlag, threadsFlag,
memoryFlag, memoryFlag,
...(enableDebugLogging ...getExtractionVerbosityArguments(enableDebugLogging),
? [`--verbosity=${EXTRACTION_DEBUG_MODE_VERBOSITY}`]
: []),
...getExtraOptionsFromEnv(["database", "finalize"]), ...getExtraOptionsFromEnv(["database", "finalize"]),
databasePath, databasePath,
]; ];
@@ -1425,3 +1419,11 @@ async function getCodeScanningQueryHelpArguments(
} }
return ["--sarif-add-query-help"]; return ["--sarif-add-query-help"];
} }
function getExtractionVerbosityArguments(
enableDebugLogging: boolean,
): string[] {
return enableDebugLogging
? [`--verbosity=${EXTRACTION_DEBUG_MODE_VERBOSITY}`]
: [];
}