Add pack download to its own log group

Also, make the baseline count message less awkward sounding.

lib/analyze.js

@@ -85,7 +85,6 @@ async function runQueries(sarifFolder, memoryFlag, addSnippetsFlag, threadsFlag,
     // that here.
     config.paths, config.pathsIgnore, config.languages, logger);
     for (const language of config.languages) {
-        logger.startGroup(`Running queries for ${language}`);
         const queries = config.queries[language];
         const packsWithVersion = config.packs[language] || [];
         const hasBuiltinQueries = ((_a = queries) === null || _a === void 0 ? void 0 : _a.builtin.length) > 0;
@@ -96,12 +95,15 @@ async function runQueries(sarifFolder, memoryFlag, addSnippetsFlag, threadsFlag,
         }
         try {
             if (hasPackWithCustomQueries) {
+                logger.startGroup(`Downloading custom packs for ${language}`);
                 const codeql = codeql_1.getCodeQL(config.codeQLCmd);
                 const results = await codeql.packDownload(packsWithVersion);
                 logger.info(`Downloaded packs: ${results.packs
                     .map((r) => `${r.name}@${r.version || "latest"}`)
                     .join(", ")}`);
+                logger.endGroup();
             }
+            logger.startGroup(`Running queries for ${language}`);
             const querySuitePaths = [];
             if (queries["builtin"].length > 0) {
                 const startTimeBuiltIn = new Date().getTime();
@@ -222,7 +224,7 @@ async function injectLinesOfCode(sarifFile, language, locPromise) {
 }
 function printLinesOfCodeSummary(logger, language, lineCounts) {
     if (language in lineCounts) {
-        logger.info(`Counted ${lineCounts[language]} lines of code for ${language} as a baseline.`);
+        logger.info(`Counted a baseline of ${lineCounts[language]} lines of code for ${language}.`);
     }
 }
 //# sourceMappingURL=analyze.js.map

lib/analyze.test.js

@@ -119,9 +119,17 @@ ava_1.default("status report fields and search path setting", async (t) => {
             };
             const builtinStatusReport = await analyze_1.runQueries(tmpDir, memoryFlag, addSnippetsFlag, threadsFlag, undefined, config, logging_1.getRunnerLogger(true));
             const hasPacks = language in packs;
-            t.deepEqual(Object.keys(builtinStatusReport).length, hasPacks ? 2 : 1);
-            t.true(`analyze_builtin_queries_${language}_duration_ms` in builtinStatusReport);
-            t.true(`interpret_results_${language}_duration_ms` in builtinStatusReport);
+            const statusReportKeys = Object.keys(builtinStatusReport).sort();
+            if (hasPacks) {
+                t.deepEqual(statusReportKeys.length, 3, statusReportKeys.toString());
+                t.deepEqual(statusReportKeys[0], `analyze_builtin_queries_${language}_duration_ms`);
+                t.deepEqual(statusReportKeys[1], `analyze_custom_queries_${language}_duration_ms`);
+                t.deepEqual(statusReportKeys[2], `interpret_results_${language}_duration_ms`);
+            }
+            else {
+                t.deepEqual(statusReportKeys[0], `analyze_builtin_queries_${language}_duration_ms`);
+                t.deepEqual(statusReportKeys[1], `interpret_results_${language}_duration_ms`);
+            }
             config.queries[language] = {
                 builtin: [],
                 custom: [

lib/config-utils.test.js

@@ -763,7 +763,7 @@ function invalidPackNameMacro(t, name) {
     parsePacksErrorMacro(t, { [languages_1.Language.cpp]: [name] }, [languages_1.Language.cpp], new RegExp(`The configuration file "/a/b" is invalid: property "packs" "${name}" is not a valid pack`));
 }
 invalidPackNameMacro.title = (_, arg) => `Invalid pack string: ${arg}`;
-ava_1.default("no packs", parsePacksMacro, undefined, [], {});
+ava_1.default("no packs", parsePacksMacro, {}, [], {});
 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 },