Add getStoredSupportedLanguageMap()

Author: cklin

.github/workflows/validate-resolved-languages.yml

@@ -61,6 +61,10 @@ jobs:
             echo "::error file=src/resolved-languages.json::The resolved-languages.json file is missing."
             exit 1
           fi
+          #
+          # Please update getStoredSupportedLanguageMap() when you update the
+          # following call to use --filter-to-languages-with-queries.
+          #
           "${CODEQL}" resolve languages --format=betterjson --extractor-include-aliases > resolved-languages.json
           if ! diff -u resolved-languages.json "${RESOLVED_LANGUAGES_FILE}"; then
             echo "::error file=src/resolved-languages.json::The saved resolved-languages.json file is out of date."

src/config-utils.ts

@@ -16,7 +16,7 @@ import {
 } from "./analyses";
 import * as api from "./api-client";
 import { CachingKind, getCachingKind } from "./caching-utils";
-import { type CodeQL } from "./codeql";
+import { type BetterResolveLanguagesOutput, type CodeQL } from "./codeql";
 import { shouldPerformDiffInformedAnalysis } from "./diff-informed-analysis-utils";
 import { Feature, FeatureEnablement } from "./feature-flags";
 import { getGitRoot, isAnalyzingDefaultBranch } from "./git-utils";
@@ -27,6 +27,7 @@ import {
   OverlayDatabaseMode,
 } from "./overlay-database-utils";
 import { RepositoryNwo } from "./repository";
+import * as resolvedLanguages from "./resolved-languages.json";
 import { downloadTrapCaches } from "./trap-caching";
 import {
   GitHubVersion,
@@ -331,6 +332,30 @@ export async function getSupportedLanguageMap(
       `The CodeQL CLI supports the following languages: ${Object.keys(resolveResult.extractors).join(", ")}`,
     );
   }
+  return buildSupportedLanguageMap(
+    resolveResult,
+    resolveSupportedLanguagesUsingCli,
+  );
+}
+
+// This function serves the same purpose as getSupportedLanguageMap(), but it
+// uses the stored resolved-languages.json file instead of calling out to the
+// CodeQL CLI.
+export function getStoredSupportedLanguageMap(): Record<string, string> {
+  return buildSupportedLanguageMap(
+    resolvedLanguages,
+    // resolveSupportedLanguagesUsingCli is false because we currently generate
+    // resolved-languages.json without the --filter-to-languages-with-queries
+    // flag (see .github/workflows/validate-resolved-languages.yml). Once that
+    // changes, we should set this to true.
+    false,
+  );
+}
+
+function buildSupportedLanguageMap(
+  resolveResult: BetterResolveLanguagesOutput,
+  resolveSupportedLanguagesUsingCli: boolean,
+): Record<string, string> {
   const supportedLanguages: Record<string, string> = {};
   // Populate canonical language names
   for (const extractor of Object.keys(resolveResult.extractors)) {