Merge branch 'main' into add_env_to_config

lib/config-utils.js

@@ -13,6 +13,7 @@ const yaml = __importStar(require("js-yaml"));
 const path = __importStar(require("path"));
 const api = __importStar(require("./api-client"));
 const externalQueries = __importStar(require("./external-queries"));
+const languages_1 = require("./languages");
 const util = __importStar(require("./util"));
 // Property names from the user-supplied config file.
 const NAME_PROPERTY = 'name';
@@ -21,13 +22,6 @@ const QUERIES_PROPERTY = 'queries';
 const QUERIES_USES_PROPERTY = 'uses';
 const PATHS_IGNORE_PROPERTY = 'paths-ignore';
 const PATHS_PROPERTY = 'paths';
-// All the languages supported by CodeQL
-const ALL_LANGUAGES = ['csharp', 'cpp', 'go', 'java', 'javascript', 'python'];
-// Some alternate names for languages
-const LANGUAGE_ALIASES = {
-    'c': 'cpp',
-    'typescript': 'javascript',
-};
 /**
  * A list of queries from https://github.com/github/codeql that
  * we don't want to run. Disabling them here is a quicker alternative to
@@ -298,17 +292,6 @@ exports.getUnknownLanguagesError = getUnknownLanguagesError;
  */
 async function getLanguagesInRepo() {
     var _a;
-    // Translate between GitHub's API names for languages and ours
-    const codeqlLanguages = {
-        'C': 'cpp',
-        'C++': 'cpp',
-        'C#': 'csharp',
-        'Go': 'go',
-        'Java': 'java',
-        'JavaScript': 'javascript',
-        'TypeScript': 'javascript',
-        'Python': 'python',
-    };
     let repo_nwo = (_a = process.env['GITHUB_REPOSITORY']) === null || _a === void 0 ? void 0 : _a.split("/");
     if (repo_nwo) {
         let owner = repo_nwo[0];
@@ -324,9 +307,10 @@ async function getLanguagesInRepo() {
         // Since sets in javascript maintain insertion order, using a set here and then splatting it
         // into an array gives us an array of languages ordered by popularity
         let languages = new Set();
-        for (let lang in response.data) {
-            if (lang in codeqlLanguages) {
-                languages.add(codeqlLanguages[lang]);
+        for (let lang of Object.keys(response.data)) {
+            let parsedLang = languages_1.parseLanguage(lang);
+            if (parsedLang !== undefined) {
+                languages.add(parsedLang);
             }
         }
         return [...languages];
@@ -363,27 +347,21 @@ async function getLanguages() {
         throw new Error(getNoLanguagesError());
     }
     // Make sure they are supported
-    const checkedLanguages = [];
+    const parsedLanguages = [];
     const unknownLanguages = [];
     for (let language of languages) {
-        // Normalise to lower case
-        language = language.toLowerCase();
-        // Resolve any known aliases
-        if (language in LANGUAGE_ALIASES) {
-            language = LANGUAGE_ALIASES[language];
-        }
-        const checkedLanguage = ALL_LANGUAGES.find(l => l === language);
-        if (checkedLanguage === undefined) {
+        const parsedLanguage = languages_1.parseLanguage(language);
+        if (parsedLanguage === undefined) {
             unknownLanguages.push(language);
         }
-        else if (checkedLanguages.indexOf(checkedLanguage) === -1) {
-            checkedLanguages.push(checkedLanguage);
+        else if (parsedLanguages.indexOf(parsedLanguage) === -1) {
+            parsedLanguages.push(parsedLanguage);
         }
     }
     if (unknownLanguages.length > 0) {
         throw new Error(getUnknownLanguagesError(unknownLanguages));
     }
-    return checkedLanguages;
+    return parsedLanguages;
 }
 /**
  * Get the default config for when the user has not supplied one.