Rename Language enum and use generic Language where possible

2026-01-06 22:50:17 +08:00 · 2025-05-30 16:47:02 +01:00
parent e303175b83
commit 932be8feda
48 changed files with 246 additions and 239 deletions
--- a/src/analyze-action.ts
+++ b/src/analyze-action.ts
@@ -25,7 +25,7 @@ import { uploadDependencyCaches } from "./dependency-caching";
 import { getDiffInformedAnalysisBranches } from "./diff-informed-analysis-utils";
 import { EnvVar } from "./environment";
 import { Features } from "./feature-flags";
-import { Language } from "./languages";
+import { KnownLanguage } from "./languages";
 import { getActionsLogger, Logger } from "./logging";
 import { getRepositoryNwo } from "./repository";
 import * as statusReport from "./status-report";
@@ -95,7 +95,10 @@ async function sendStatusReport(
        ...report,
        trap_cache_upload_duration_ms: Math.round(trapCacheUploadTime || 0),
        trap_cache_upload_size_bytes: Math.round(
-          await getTotalCacheSize(Object.values(config.trapCaches), logger),
+          await getTotalCacheSize(
+            Object.values(config.trapCaches).filter((x) => x !== undefined),
+            logger,
+          ),
        ),
      };
      await statusReport.sendStatusReport(trapCacheUploadStatusReport);
@@ -118,8 +121,11 @@ function hasBadExpectErrorInput(): boolean {
 * indicating whether Go extraction has extracted at least one file.
 */
 function doesGoExtractionOutputExist(config: Config): boolean {
-  const golangDbDirectory = util.getCodeQLDatabasePath(config, Language.go);
-  const trapDirectory = path.join(golangDbDirectory, "trap", Language.go);
+  const golangDbDirectory = util.getCodeQLDatabasePath(
+    config,
+    KnownLanguage.go,
+  );
+  const trapDirectory = path.join(golangDbDirectory, "trap", KnownLanguage.go);
  return (
    fs.existsSync(trapDirectory) &&
    fs
@@ -151,7 +157,7 @@ function doesGoExtractionOutputExist(config: Config): boolean {
 * whether any extraction output already exists for Go.
 */
 async function runAutobuildIfLegacyGoWorkflow(config: Config, logger: Logger) {
-  if (!config.languages.includes(Language.go)) {
+  if (!config.languages.includes(KnownLanguage.go)) {
    return;
  }
  if (config.buildMode) {
@@ -164,7 +170,7 @@ async function runAutobuildIfLegacyGoWorkflow(config: Config, logger: Logger) {
    logger.debug("Won't run Go autobuild since it has already been run.");
    return;
  }
-  if (dbIsFinalized(config, Language.go, logger)) {
+  if (dbIsFinalized(config, KnownLanguage.go, logger)) {
    logger.debug(
      "Won't run Go autobuild since there is already a finalized database for Go.",
    );
@@ -187,7 +193,7 @@ async function runAutobuildIfLegacyGoWorkflow(config: Config, logger: Logger) {
  logger.debug(
    "Running Go autobuild because extraction output (TRAP files) for Go code has not been found.",
  );
-  await runAutobuild(config, Language.go, logger);
+  await runAutobuild(config, KnownLanguage.go, logger);
 }

 async function run() {
--- a/src/analyze.test.ts
+++ b/src/analyze.test.ts
@@ -8,7 +8,7 @@ import * as actionsUtil from "./actions-util";
 import { exportedForTesting, runQueries } from "./analyze";
 import { setCodeQL } from "./codeql";
 import { Feature } from "./feature-flags";
-import { Language } from "./languages";
+import { KnownLanguage } from "./languages";
 import { getRunnerLogger } from "./logging";
 import {
  setupTests,
@@ -36,7 +36,7 @@ test("status report fields", async (t) => {
    const threadsFlag = "";
    sinon.stub(uploadLib, "validateSarifFileSchema");

-    for (const language of Object.values(Language)) {
+    for (const language of Object.values(KnownLanguage)) {
      setCodeQL({
        databaseRunQueries: async () => {},
        packDownload: async () => ({ packs: [] }),
--- a/src/analyze.ts
+++ b/src/analyze.ts
@@ -20,7 +20,7 @@ import {
 } from "./diff-informed-analysis-utils";
 import { EnvVar } from "./environment";
 import { FeatureEnablement, Feature } from "./feature-flags";
-import { Language } from "./languages";
+import { KnownLanguage, Language } from "./languages";
 import { Logger, withGroupAsync } from "./logging";
 import { getRepositoryNwoFromEnv } from "./repository";
 import { DatabaseCreationTimings, EventReport } from "./status-report";
@@ -163,12 +163,12 @@ export async function runExtraction(

    if (await shouldExtractLanguage(codeql, config, language)) {
      logger.startGroup(`Extracting ${language}`);
-      if (language === Language.python) {
+      if (language === String(KnownLanguage.python)) {
        await setupPythonExtractor(logger);
      }
      if (config.buildMode) {
        if (
-          language === Language.cpp &&
+          language === String(KnownLanguage.cpp) &&
          config.buildMode === BuildMode.Autobuild
        ) {
          await setupCppAutobuild(codeql, logger);
@@ -178,7 +178,10 @@ export async function runExtraction(
        // database scratch directory by default. For dependency caching purposes, we want
        // a stable path that caches can be restored into and that we can cache at the
        // end of the workflow (i.e. that does not get removed when the scratch directory is).
-        if (language === Language.java && config.buildMode === BuildMode.None) {
+        if (
+          language === String(KnownLanguage.java) &&
+          config.buildMode === BuildMode.None
+        ) {
          process.env["CODEQL_EXTRACTOR_JAVA_OPTION_BUILDLESS_DEPENDENCY_DIR"] =
            getJavaTempDependencyDir();
        }
@@ -759,7 +762,7 @@ export async function warnIfGoInstalledAfterInit(

      addDiagnostic(
        config,
-        Language.go,
+        KnownLanguage.go,
        makeDiagnostic(
          "go/workflow/go-installed-after-codeql-init",
          "Go was installed after the `codeql-action/init` Action was run",
--- a/src/autobuild.ts
+++ b/src/autobuild.ts
@@ -7,7 +7,7 @@ import * as configUtils from "./config-utils";
 import { DocUrl } from "./doc-url";
 import { EnvVar } from "./environment";
 import { Feature, featureConfig, Features } from "./feature-flags";
-import { Language } from "./languages";
+import { KnownLanguage, Language } from "./languages";
 import { Logger } from "./logging";
 import { getRepositoryNwo } from "./repository";
 import { asyncFilter, BuildMode } from "./util";
@@ -72,7 +72,7 @@ export async function determineAutobuildLanguages(
   * version of the CodeQL Action.
   */
  const autobuildLanguagesWithoutGo = autobuildLanguages.filter(
-    (l) => l !== Language.go,
+    (l) => l !== String(KnownLanguage.go),
  );

  const languages: Language[] = [];
@@ -84,7 +84,7 @@ export async function determineAutobuildLanguages(
  // If Go is requested, run the Go autobuilder last to ensure it doesn't
  // interfere with the other autobuilder.
  if (autobuildLanguages.length !== autobuildLanguagesWithoutGo.length) {
-    languages.push(Language.go);
+    languages.push(KnownLanguage.go);
  }

  logger.debug(`Will autobuild ${languages.join(" and ")}.`);
@@ -156,7 +156,7 @@ export async function runAutobuild(
 ) {
  logger.startGroup(`Attempting to automatically build ${language} code`);
  const codeQL = await getCodeQL(config.codeQLCmd);
-  if (language === Language.cpp) {
+  if (language === String(KnownLanguage.cpp)) {
    await setupCppAutobuild(codeQL, logger);
  }
  if (config.buildMode) {
@@ -164,7 +164,7 @@ export async function runAutobuild(
  } else {
    await codeQL.runAutobuild(config, language);
  }
-  if (language === Language.go) {
+  if (language === String(KnownLanguage.go)) {
    core.exportVariable(EnvVar.DID_AUTOBUILD_GOLANG, "true");
  }
  logger.endGroup();
--- a/src/codeql.test.ts
+++ b/src/codeql.test.ts
@@ -18,7 +18,7 @@ import { AugmentationProperties, Config } from "./config-utils";
 import * as defaults from "./defaults.json";
 import { DocUrl } from "./doc-url";
 import { FeatureEnablement } from "./feature-flags";
-import { Language } from "./languages";
+import { KnownLanguage } from "./languages";
 import { getRunnerLogger } from "./logging";
 import { OverlayDatabaseMode } from "./overlay-database-utils";
 import { ToolsSource } from "./setup-codeql";
@@ -47,7 +47,7 @@ test.beforeEach(() => {
  initializeEnvironment("1.2.3");

  stubConfig = createTestConfig({
-    languages: [Language.cpp],
+    languages: [KnownLanguage.cpp],
  });
 });

@@ -116,7 +116,7 @@ async function stubCodeql(): Promise<codeql.CodeQL> {
  sinon.stub(codeqlObject, "getVersion").resolves(makeVersionInfo("2.17.6"));
  sinon
    .stub(codeqlObject, "isTracedLanguage")
-    .withArgs(Language.cpp)
+    .withArgs(KnownLanguage.cpp)
    .resolves(true);
  return codeqlObject;
 }
@@ -907,7 +907,7 @@ test("runTool summarizes autobuilder errors", async (t) => {
  sinon.stub(io, "which").resolves("");

  await t.throwsAsync(
-    async () => await codeqlObject.runAutobuild(stubConfig, Language.java),
+    async () => await codeqlObject.runAutobuild(stubConfig, KnownLanguage.java),
    {
      instanceOf: util.ConfigurationError,
      message:
@@ -933,7 +933,7 @@ test("runTool truncates long autobuilder errors", async (t) => {
  sinon.stub(io, "which").resolves("");

  await t.throwsAsync(
-    async () => await codeqlObject.runAutobuild(stubConfig, Language.java),
+    async () => await codeqlObject.runAutobuild(stubConfig, KnownLanguage.java),
    {
      instanceOf: util.ConfigurationError,
      message:
--- a/src/config-utils.test.ts
+++ b/src/config-utils.test.ts
@@ -16,7 +16,7 @@ import {
 } from "./codeql";
 import * as configUtils from "./config-utils";
 import { Feature } from "./feature-flags";
-import { Language } from "./languages";
+import { KnownLanguage, Language } from "./languages";
 import { getRunnerLogger } from "./logging";
 import { parseRepositoryNwo } from "./repository";
 import {
@@ -353,7 +353,7 @@ test("load non-empty input", async (t) => {

    // And the config we expect it to parse to
    const expectedConfig: configUtils.Config = {
-      languages: [Language.javascript],
+      languages: [KnownLanguage.javascript],
      buildMode: BuildMode.None,
      originalUserInput: {
        name: "my config",
@@ -700,7 +700,7 @@ const invalidPackNameMacro = test.macro({
    parsePacksErrorMacro.exec(
      t,
      name,
-      [Language.cpp],
+      [KnownLanguage.cpp],
      new RegExp(`^"${name}" is not a valid pack$`),
    ),
  title: (_providedTitle: string | undefined, arg: string | undefined) =>
@@ -708,23 +708,23 @@ const invalidPackNameMacro = test.macro({
 });

 test("no packs", parsePacksMacro, "", [], undefined);
-test("two packs", parsePacksMacro, "a/b,c/d@1.2.3", [Language.cpp], {
-  [Language.cpp]: ["a/b", "c/d@1.2.3"],
+test("two packs", parsePacksMacro, "a/b,c/d@1.2.3", [KnownLanguage.cpp], {
+  [KnownLanguage.cpp]: ["a/b", "c/d@1.2.3"],
 });
 test(
  "two packs with spaces",
  parsePacksMacro,
  " a/b , c/d@1.2.3 ",
-  [Language.cpp],
+  [KnownLanguage.cpp],
  {
-    [Language.cpp]: ["a/b", "c/d@1.2.3"],
+    [KnownLanguage.cpp]: ["a/b", "c/d@1.2.3"],
  },
 );
 test(
  "two packs with language",
  parsePacksErrorMacro,
  "a/b,c/d@1.2.3",
-  [Language.cpp, Language.java],
+  [KnownLanguage.cpp, KnownLanguage.java],
  new RegExp(
    "Cannot specify a 'packs' input in a multi-language analysis. " +
      "Use a codeql-config.yml file instead and specify packs by language.",
@@ -752,9 +752,9 @@ test(
    // (globbing is not done)
    "c/d@1.2.3:+*)_(",
  ].join(","),
-  [Language.cpp],
+  [KnownLanguage.cpp],
  {
-    [Language.cpp]: [
+    [KnownLanguage.cpp]: [
      "c/d@1.0",
      "c/d@~1.0.0",
      "c/d@~1.0.0:a/b",
@@ -866,7 +866,7 @@ test(
  "All empty",
  undefined,
  undefined,
-  [Language.javascript],
+  [KnownLanguage.javascript],
  {
    queriesInputCombines: false,
    queriesInput: undefined,
@@ -881,7 +881,7 @@ test(
  "With queries",
  undefined,
  " a, b , c, d",
-  [Language.javascript],
+  [KnownLanguage.javascript],
  {
    queriesInputCombines: false,
    queriesInput: [{ uses: "a" }, { uses: "b" }, { uses: "c" }, { uses: "d" }],
@@ -896,7 +896,7 @@ test(
  "With queries combining",
  undefined,
  "   +   a, b , c, d ",
-  [Language.javascript],
+  [KnownLanguage.javascript],
  {
    queriesInputCombines: true,
    queriesInput: [{ uses: "a" }, { uses: "b" }, { uses: "c" }, { uses: "d" }],
@@ -911,7 +911,7 @@ test(
  "With packs",
  "   codeql/a , codeql/b   , codeql/c  , codeql/d  ",
  undefined,
-  [Language.javascript],
+  [KnownLanguage.javascript],
  {
    queriesInputCombines: false,
    queriesInput: undefined,
@@ -926,7 +926,7 @@ test(
  "With packs combining",
  "   +   codeql/a, codeql/b, codeql/c, codeql/d",
  undefined,
-  [Language.javascript],
+  [KnownLanguage.javascript],
  {
    queriesInputCombines: false,
    queriesInput: undefined,
@@ -966,7 +966,7 @@ test(
  "Plus (+) with nothing else (queries)",
  undefined,
  "   +   ",
-  [Language.javascript],
+  [KnownLanguage.javascript],
  /The workflow property "queries" is invalid/,
 );

@@ -975,7 +975,7 @@ test(
  "Plus (+) with nothing else (packs)",
  "   +   ",
  undefined,
-  [Language.javascript],
+  [KnownLanguage.javascript],
  /The workflow property "packs" is invalid/,
 );

@@ -984,7 +984,7 @@ test(
  "Packs input with multiple languages",
  "   +  a/b, c/d ",
  undefined,
-  [Language.javascript, Language.java],
+  [KnownLanguage.javascript, KnownLanguage.java],
  /Cannot specify a 'packs' input in a multi-language analysis/,
 );

@@ -1002,7 +1002,7 @@ test(
  "Invalid packs",
  " a-pack-without-a-scope ",
  undefined,
-  [Language.javascript],
+  [KnownLanguage.javascript],
  /"a-pack-without-a-scope" is not a valid pack/,
 );

@@ -1101,10 +1101,10 @@ const mockRepositoryNwo = parseRepositoryNwo("owner/repo");
      betterResolveLanguages: () =>
        Promise.resolve({
          aliases: {
-            "c#": Language.csharp,
-            c: Language.cpp,
-            kotlin: Language.java,
-            typescript: Language.javascript,
+            "c#": KnownLanguage.csharp,
+            c: KnownLanguage.cpp,
+            kotlin: KnownLanguage.java,
+            typescript: KnownLanguage.javascript,
          },
          extractors: {
            cpp: [stubExtractorEntry],
@@ -1146,12 +1146,12 @@ const mockRepositoryNwo = parseRepositoryNwo("owner/repo");
 for (const { displayName, language, feature } of [
  {
    displayName: "Java",
-    language: Language.java,
+    language: KnownLanguage.java,
    feature: Feature.DisableJavaBuildlessEnabled,
  },
  {
    displayName: "C#",
-    language: Language.csharp,
+    language: KnownLanguage.csharp,
    feature: Feature.DisableCsharpBuildless,
  },
 ]) {
@@ -1171,7 +1171,7 @@ for (const { displayName, language, feature } of [
    const messages: LoggedMessage[] = [];
    const buildMode = await configUtils.parseBuildModeInput(
      "none",
-      [Language.python],
+      [KnownLanguage.python],
      createFeatures([feature]),
      getRecordingLogger(messages),
    );
--- a/src/config-utils.ts
+++ b/src/config-utils.ts
@@ -10,7 +10,7 @@ import { CachingKind, getCachingKind } from "./caching-utils";
 import { CodeQL, getSupportedLanguageMap } from "./codeql";
 import { shouldPerformDiffInformedAnalysis } from "./diff-informed-analysis-utils";
 import { Feature, FeatureEnablement } from "./feature-flags";
-import { Language } from "./languages";
+import { KnownLanguage, Language } from "./languages";
 import { Logger } from "./logging";
 import { RepositoryNwo } from "./repository";
 import { downloadTrapCaches } from "./trap-caching";
@@ -313,7 +313,7 @@ export async function getLanguages(
  );

  const languageMap = await getSupportedLanguageMap(codeql);
-  const languagesSet = new Set<string>();
+  const languagesSet = new Set<Language>();
  const unknownLanguages: string[] = [];

  // Make sure they are supported
@@ -344,8 +344,7 @@ export async function getLanguages(
    logger.info(`Languages from configuration: ${languages.join(", ")}`);
  }

-  // TODO: use a typealias for Language and rename Language to KnownLanguage
-  return languages as Language[];
+  return languages;
 }

 /**
@@ -1127,7 +1126,7 @@ export async function parseBuildModeInput(
  }

  if (
-    languages.includes(Language.csharp) &&
+    languages.includes(KnownLanguage.csharp) &&
    (await features.getValue(Feature.DisableCsharpBuildless))
  ) {
    logger.warning(
@@ -1137,7 +1136,7 @@ export async function parseBuildModeInput(
  }

  if (
-    languages.includes(Language.java) &&
+    languages.includes(KnownLanguage.java) &&
    (await features.getValue(Feature.DisableJavaBuildlessEnabled))
  ) {
    logger.warning(
--- a/src/database-upload.test.ts
+++ b/src/database-upload.test.ts
@@ -11,7 +11,7 @@ import { setCodeQL } from "./codeql";
 import { Config } from "./config-utils";
 import { uploadDatabases } from "./database-upload";
 import * as gitUtils from "./git-utils";
-import { Language } from "./languages";
+import { KnownLanguage } from "./languages";
 import { RepositoryNwo } from "./repository";
 import {
  createTestConfig,
@@ -42,7 +42,7 @@ const testApiDetails: GitHubApiDetails = {

 function getTestConfig(tmpDir: string): Config {
  return createTestConfig({
-    languages: [Language.javascript],
+    languages: [KnownLanguage.javascript],
    dbLocation: tmpDir,
  });
 }
--- a/src/init-action.ts
+++ b/src/init-action.ts
@@ -41,7 +41,7 @@ import {
  initConfig,
  runInit,
 } from "./init";
-import { Language } from "./languages";
+import { KnownLanguage } from "./languages";
 import { getActionsLogger, Logger } from "./logging";
 import { OverlayDatabaseMode } from "./overlay-database-utils";
 import { getRepositoryNwo } from "./repository";
@@ -232,7 +232,10 @@ async function sendCompletedStatusReport(
      packs: JSON.stringify(packs),
      trap_cache_languages: Object.keys(config.trapCaches).join(","),
      trap_cache_download_size_bytes: Math.round(
-        await getTotalCacheSize(Object.values(config.trapCaches), logger),
+        await getTotalCacheSize(
+          Object.values(config.trapCaches).filter((x) => x !== undefined),
+          logger,
+        ),
      ),
      trap_cache_download_duration_ms: Math.round(config.trapCacheDownloadTime),
      query_filters: JSON.stringify(
@@ -442,7 +445,7 @@ async function run() {
    }

    if (
-      config.languages.includes(Language.swift) &&
+      config.languages.includes(KnownLanguage.swift) &&
      process.platform === "linux"
    ) {
      logger.warning(
@@ -451,7 +454,7 @@ async function run() {
    }

    if (
-      config.languages.includes(Language.go) &&
+      config.languages.includes(KnownLanguage.go) &&
      process.platform === "linux"
    ) {
      try {
@@ -509,7 +512,7 @@ async function run() {
        if (e instanceof FileCmdNotFoundError) {
          addDiagnostic(
            config,
-            Language.go,
+            KnownLanguage.go,
            makeDiagnostic(
              "go/workflow/file-program-unavailable",
              "The `file` program is required on Linux, but does not appear to be installed",
@@ -559,7 +562,7 @@ async function run() {
      core.exportVariable(kotlinLimitVar, "2.1.20");
    }

-    if (config.languages.includes(Language.cpp)) {
+    if (config.languages.includes(KnownLanguage.cpp)) {
      const envVar = "CODEQL_EXTRACTOR_CPP_TRAP_CACHING";
      if (process.env[envVar]) {
        logger.info(
@@ -578,7 +581,7 @@ async function run() {
    }

    // Set CODEQL_EXTRACTOR_CPP_BUILD_MODE_NONE
-    if (config.languages.includes(Language.cpp)) {
+    if (config.languages.includes(KnownLanguage.cpp)) {
      const bmnVar = "CODEQL_EXTRACTOR_CPP_BUILD_MODE_NONE";
      const value =
        process.env[bmnVar] ||
@@ -588,7 +591,7 @@ async function run() {
    }

    // Set CODEQL_ENABLE_EXPERIMENTAL_FEATURES for rust
-    if (config.languages.includes(Language.rust)) {
+    if (config.languages.includes(KnownLanguage.rust)) {
      const feat = Feature.RustAnalysis;
      const minVer = featureConfig[feat].minimumVersion as string;
      const envVar = "CODEQL_ENABLE_EXPERIMENTAL_FEATURES";
--- a/src/init.ts
+++ b/src/init.ts
@@ -11,7 +11,7 @@ import { CodeQL, setupCodeQL } from "./codeql";
 import * as configUtils from "./config-utils";
 import { CodeQLDefaultVersionInfo, FeatureEnablement } from "./feature-flags";
 import { getGitRoot } from "./git-utils";
-import { Language } from "./languages";
+import { KnownLanguage, Language } from "./languages";
 import { Logger, withGroupAsync } from "./logging";
 import {
  CODEQL_OVERLAY_MINIMUM_VERSION,
@@ -162,7 +162,7 @@ export async function checkInstallPython311(
  codeql: CodeQL,
 ) {
  if (
-    languages.includes(Language.python) &&
+    languages.includes(KnownLanguage.python) &&
    process.platform === "win32" &&
    !(await codeql.getVersion()).features?.supportsPython312
  ) {
--- a/src/languages.ts
+++ b/src/languages.ts
@@ -1,10 +1,12 @@
 /**
 * A CodeQL language.
 *
- * To facilitate adding new languages, this is _not_ an exhaustive list of
- * languages supported by CodeQL.
+ * To facilitate adding new languages, this is a typedef rather than an
+ * exhaustive list of languages supported by CodeQL.
 */
-export enum Language {
+export type Language = string;
+
+export enum KnownLanguage {
  csharp = "csharp",
  cpp = "cpp",
  go = "go",
--- a/src/start-proxy.test.ts
+++ b/src/start-proxy.test.ts
@@ -1,6 +1,6 @@
 import test from "ava";

-import { Language } from "./languages";
+import { KnownLanguage } from "./languages";
 import { getRunnerLogger } from "./logging";
 import * as startProxyExports from "./start-proxy";
 import { parseLanguage } from "./start-proxy";
@@ -118,24 +118,24 @@ test("getCredentials throws an error when non-printable characters are used", as

 test("parseLanguage", async (t) => {
  // Exact matches
-  t.deepEqual(parseLanguage("csharp"), Language.csharp);
-  t.deepEqual(parseLanguage("cpp"), Language.cpp);
-  t.deepEqual(parseLanguage("go"), Language.go);
-  t.deepEqual(parseLanguage("java"), Language.java);
-  t.deepEqual(parseLanguage("javascript"), Language.javascript);
-  t.deepEqual(parseLanguage("python"), Language.python);
-  t.deepEqual(parseLanguage("rust"), Language.rust);
+  t.deepEqual(parseLanguage("csharp"), KnownLanguage.csharp);
+  t.deepEqual(parseLanguage("cpp"), KnownLanguage.cpp);
+  t.deepEqual(parseLanguage("go"), KnownLanguage.go);
+  t.deepEqual(parseLanguage("java"), KnownLanguage.java);
+  t.deepEqual(parseLanguage("javascript"), KnownLanguage.javascript);
+  t.deepEqual(parseLanguage("python"), KnownLanguage.python);
+  t.deepEqual(parseLanguage("rust"), KnownLanguage.rust);

  // Aliases
-  t.deepEqual(parseLanguage("c"), Language.cpp);
-  t.deepEqual(parseLanguage("c++"), Language.cpp);
-  t.deepEqual(parseLanguage("c#"), Language.csharp);
-  t.deepEqual(parseLanguage("kotlin"), Language.java);
-  t.deepEqual(parseLanguage("typescript"), Language.javascript);
+  t.deepEqual(parseLanguage("c"), KnownLanguage.cpp);
+  t.deepEqual(parseLanguage("c++"), KnownLanguage.cpp);
+  t.deepEqual(parseLanguage("c#"), KnownLanguage.csharp);
+  t.deepEqual(parseLanguage("kotlin"), KnownLanguage.java);
+  t.deepEqual(parseLanguage("typescript"), KnownLanguage.javascript);

  // spaces and case-insensitivity
-  t.deepEqual(parseLanguage("  \t\nCsHaRp\t\t"), Language.csharp);
-  t.deepEqual(parseLanguage("  \t\nkOtLin\t\t"), Language.java);
+  t.deepEqual(parseLanguage("  \t\nCsHaRp\t\t"), KnownLanguage.csharp);
+  t.deepEqual(parseLanguage("  \t\nkOtLin\t\t"), KnownLanguage.java);

  // Not matches
  t.deepEqual(parseLanguage("foo"), undefined);
--- a/src/start-proxy.ts
+++ b/src/start-proxy.ts
@@ -1,4 +1,4 @@
-import { Language } from "./languages";
+import { KnownLanguage } from "./languages";
 import { Logger } from "./logging";
 import { ConfigurationError } from "./util";

@@ -20,14 +20,14 @@ export type Credential = {
 * Action since this Action does not use CodeQL, so we're accepting some hardcoding
 * for this Action.
 */
-const LANGUAGE_ALIASES: { [lang: string]: Language } = {
-  c: Language.cpp,
-  "c++": Language.cpp,
-  "c#": Language.csharp,
-  kotlin: Language.java,
-  typescript: Language.javascript,
-  "javascript-typescript": Language.javascript,
-  "java-kotlin": Language.java,
+const LANGUAGE_ALIASES: { [lang: string]: KnownLanguage } = {
+  c: KnownLanguage.cpp,
+  "c++": KnownLanguage.cpp,
+  "c#": KnownLanguage.csharp,
+  kotlin: KnownLanguage.java,
+  typescript: KnownLanguage.javascript,
+  "javascript-typescript": KnownLanguage.javascript,
+  "java-kotlin": KnownLanguage.java,
 };

 /**
@@ -36,13 +36,13 @@ const LANGUAGE_ALIASES: { [lang: string]: Language } = {
 * Exported for testing, do not use this outside of the start-proxy Action
 * (see the `LANGUAGE_ALIASES` docstring for more info).
 */
-export function parseLanguage(language: string): Language | undefined {
+export function parseLanguage(language: string): KnownLanguage | undefined {
  // Normalize to lower case
  language = language.trim().toLowerCase();

  // See if it's an exact match
-  if (language in Language) {
-    return language as Language;
+  if (language in KnownLanguage) {
+    return language as KnownLanguage;
  }

  // Check language aliases, but return the original language name,
@@ -54,7 +54,7 @@ export function parseLanguage(language: string): Language | undefined {
  return undefined;
 }

-const LANGUAGE_TO_REGISTRY_TYPE: Partial<Record<Language, string>> = {
+const LANGUAGE_TO_REGISTRY_TYPE: Partial<Record<KnownLanguage, string>> = {
  java: "maven_repository",
  csharp: "nuget_feed",
  javascript: "npm_registry",
--- a/src/status-report.test.ts
+++ b/src/status-report.test.ts
@@ -3,7 +3,7 @@ import * as sinon from "sinon";

 import * as actionsUtil from "./actions-util";
 import { EnvVar } from "./environment";
-import { Language } from "./languages";
+import { KnownLanguage } from "./languages";
 import { getRunnerLogger } from "./logging";
 import {
  ActionName,
@@ -47,7 +47,7 @@ test("createStatusReportBase", async (t) => {
      new Date("May 19, 2023 05:19:00"),
      createTestConfig({
        buildMode: BuildMode.None,
-        languages: [Language.java, Language.swift],
+        languages: [KnownLanguage.java, KnownLanguage.swift],
      }),
      { numAvailableBytes: 100, numTotalBytes: 500 },
      getRunnerLogger(false),
--- a/src/tracer-config.test.ts
+++ b/src/tracer-config.test.ts
@@ -6,7 +6,7 @@ import * as sinon from "sinon";

 import { CodeQL, getCodeQLForTesting } from "./codeql";
 import * as configUtils from "./config-utils";
-import { Language } from "./languages";
+import { KnownLanguage } from "./languages";
 import { createTestConfig, makeVersionInfo, setupTests } from "./testing-utils";
 import { ToolsFeature } from "./tools-features";
 import { getCombinedTracerConfig } from "./tracer-config";
@@ -16,7 +16,7 @@ setupTests(test);

 function getTestConfig(tempDir: string): configUtils.Config {
  return createTestConfig({
-    languages: [Language.java],
+    languages: [KnownLanguage.java],
    tempDir,
    dbLocation: path.resolve(tempDir, "codeql_databases"),
  });
@@ -36,7 +36,7 @@ async function stubCodeql(
    );
  sinon
    .stub(codeqlObject, "isTracedLanguage")
-    .withArgs(Language.java)
+    .withArgs(KnownLanguage.java)
    .resolves(true);
  return codeqlObject;
 }
@@ -45,7 +45,7 @@ test("getCombinedTracerConfig - return undefined when no languages are traced la
  await util.withTmpDir(async (tmpDir) => {
    const config = getTestConfig(tmpDir);
    // No traced languages
-    config.languages = [Language.javascript, Language.python];
+    config.languages = [KnownLanguage.javascript, KnownLanguage.python];
    t.deepEqual(
      await getCombinedTracerConfig(await stubCodeql(), config),
      undefined,
--- a/src/trap-caching.test.ts
+++ b/src/trap-caching.test.ts
@@ -15,7 +15,7 @@ import {
 import * as configUtils from "./config-utils";
 import { Feature } from "./feature-flags";
 import * as gitUtils from "./git-utils";
-import { Language } from "./languages";
+import { KnownLanguage } from "./languages";
 import { getRunnerLogger } from "./logging";
 import {
  createFeatures,
@@ -41,7 +41,7 @@ const stubCodeql = setCodeQL({
  async betterResolveLanguages() {
    return {
      extractors: {
-        [Language.javascript]: [
+        [KnownLanguage.javascript]: [
          {
            extractor_root: "some_root",
            extractor_options: {
@@ -65,7 +65,7 @@ const stubCodeql = setCodeQL({
            },
          },
        ],
-        [Language.cpp]: [
+        [KnownLanguage.cpp]: [
          {
            extractor_root: "other_root",
          },
@@ -76,7 +76,7 @@ const stubCodeql = setCodeQL({
 });

 const testConfigWithoutTmpDir = createTestConfig({
-  languages: [Language.javascript, Language.cpp],
+  languages: [KnownLanguage.javascript, KnownLanguage.cpp],
  trapCaches: {
    javascript: "/some/cache/dir",
  },
@@ -84,7 +84,7 @@ const testConfigWithoutTmpDir = createTestConfig({

 function getTestConfigWithTempDir(tempDir: string): configUtils.Config {
  return createTestConfig({
-    languages: [Language.javascript, Language.ruby],
+    languages: [KnownLanguage.javascript, KnownLanguage.ruby],
    tempDir,
    dbLocation: path.resolve(tempDir, "codeql_databases"),
    trapCaches: {
@@ -100,7 +100,7 @@ test("check flags for JS, analyzing default branch", async (t) => {
    sinon.stub(gitUtils, "isAnalyzingDefaultBranch").resolves(true);
    const result = await getTrapCachingExtractorConfigArgsForLang(
      config,
-      Language.javascript,
+      KnownLanguage.javascript,
    );
    t.deepEqual(result, [
      `-O=javascript.trap.cache.dir=${path.resolve(tmpDir, "jsCache")}`,
@@ -131,10 +131,10 @@ test("get languages that support TRAP caching", async (t) => {
  const logger = getRecordingLogger(loggedMessages);
  const languagesSupportingCaching = await getLanguagesSupportingCaching(
    stubCodeql,
-    [Language.javascript, Language.cpp],
+    [KnownLanguage.javascript, KnownLanguage.cpp],
    logger,
  );
-  t.deepEqual(languagesSupportingCaching, [Language.javascript]);
+  t.deepEqual(languagesSupportingCaching, [KnownLanguage.javascript]);
 });

 test("upload cache key contains right fields", async (t) => {
@@ -178,7 +178,7 @@ test("download cache looks for the right key and creates dir", async (t) => {
    );
    await downloadTrapCaches(
      stubCodeql,
-      [Language.javascript, Language.cpp],
+      [KnownLanguage.javascript, KnownLanguage.cpp],
      logger,
    );
    t.assert(