Extract getGeneratedSuitePath()

cklin · cklin · commit 0be5c8de929f · 2025-08-05T13:57:11.000-07:00
diff --git a/src/analyze.ts b/src/analyze.ts
@@ -656,14 +656,7 @@ export async function runQueries(
 
       const queries: string[] = [];
       if (config.augmentationProperties.qualityQueriesInput !== undefined) {
-        queries.push(
-          path.join(
-            util.getCodeQLDatabasePath(config, language),
-            "temp",
-            "config-queries.qls",
-          ),
-        );
-
+        queries.push(util.getGeneratedSuitePath(config, language));
         for (const qualityQuery of config.augmentationProperties
           .qualityQueriesInput) {
           queries.push(resolveQuerySuiteAlias(language, qualityQuery.uses));
diff --git a/src/init.ts b/src/init.ts
@@ -113,12 +113,7 @@ export async function checkPacksForOverlayCompatibility(
   }
 
   for (const language of config.languages) {
-    const suitePath = path.join(
-      config.dbLocation,
-      language,
-      "temp",
-      "config-queries.qls",
-    );
+    const suitePath = util.getGeneratedSuitePath(config, language);
     const packDirs = await codeql.resolveQueriesStartingPacks([suitePath]);
     if (
       packDirs.some(
diff --git a/src/util.ts b/src/util.ts
@@ -513,6 +513,18 @@ export function getCodeQLDatabasePath(config: Config, language: Language) {
   return path.resolve(config.dbLocation, language);
 }
 
+/**
+ * Get the path where the generated query suite for the given language lives.
+ */
+export function getGeneratedSuitePath(config: Config, language: Language) {
+  return path.resolve(
+    config.dbLocation,
+    language,
+    "temp",
+    "config-queries.qls",
+  );
+}
+
 /**
  * Parses user input of a github.com or GHES URL to a canonical form.
  * Removes any API prefix or suffix if one is present.
