Prototyping adding quality queries when running queries

Author: mbg

lib/analyze.js

@@ -624,6 +624,17 @@ export async function runQueries(
     try {
       const sarifFile = path.join(sarifFolder, `${language}.sarif`);
 
+      if (config.augmentationProperties.qualityQueriesInput !== undefined) {
+        queryFlags.unshift(`path:${config.tempDir}/config-queries.qls`);
+
+        for (const qualityQuery of config.augmentationProperties
+          .qualityQueriesInput) {
+          queryFlags.unshift(
+            resolveQuerySuiteAlias(language, qualityQuery.uses),
+          );
+        }
+      }
+
       // The work needed to generate the query suites
       // is done in the CLI. We just need to make a single
       // call to run all the queries for each language and

lib/analyze.js.map

@@ -1219,20 +1219,13 @@ async function generateCodeScanningConfig(
   const augmentedConfig = cloneObject(config.originalUserInput);
 
   // Inject the queries from the input
-  if (
-    config.augmentationProperties.queriesInput ||
-    config.augmentationProperties.qualityQueriesInput
-  ) {
-    const queryInputs = (
-      config.augmentationProperties.queriesInput || []
-    ).concat(config.augmentationProperties.qualityQueriesInput || []);
-
+  if (config.augmentationProperties.queriesInput) {
     if (config.augmentationProperties.queriesInputCombines) {
       augmentedConfig.queries = (augmentedConfig.queries || []).concat(
-        queryInputs,
+        config.augmentationProperties.queriesInput,
       );
     } else {
-      augmentedConfig.queries = queryInputs;
+      augmentedConfig.queries = config.augmentationProperties.queriesInput;
     }
   }
   if (augmentedConfig.queries?.length === 0) {