Merge branch 'main' into aibaars-additional-packs

github · May 21, 2021 · c3e0f88 · c3e0f88
2 parents 69cc355 + 1ad5a6c
commit c3e0f88
Show file tree

Hide file tree

Showing 9 changed files with 74 additions and 34 deletions.
diff --git a/lib/analyze.js b/lib/analyze.js
diff --git a/lib/analyze.js.map b/lib/analyze.js.map
diff --git a/lib/config-utils.js b/lib/config-utils.js
diff --git a/lib/config-utils.js.map b/lib/config-utils.js.map
diff --git a/lib/config-utils.test.js b/lib/config-utils.test.js
diff --git a/lib/config-utils.test.js.map b/lib/config-utils.test.js.map
diff --git a/src/analyze.ts b/src/analyze.ts
@@ -162,7 +162,10 @@ export async function runQueries(
     logger.startGroup(`Analyzing ${language}`);
 
     const queries = config.queries[language];
-    if (queries.builtin.length === 0 && queries.custom.length === 0) {
+    if (
+      queries === undefined ||
+      (queries.builtin.length === 0 && queries.custom.length === 0)
+    ) {
       throw new Error(
         `Unable to analyse ${language} as no queries were selected for this language`
       );

diff --git a/src/config-utils.test.ts b/src/config-utils.test.ts
@@ -68,7 +68,10 @@ test("load empty config", async (t) => {
     const codeQL = setCodeQL({
       async resolveQueries() {
         return {
-          byLanguage: {},
+          byLanguage: {
+            javascript: { queries: ["query1.ql"] },
+            python: { queries: ["query2.ql"] },
+          },
           noDeclaredLanguage: {},
           multipleDeclaredLanguages: {},
         };
@@ -116,7 +119,10 @@ test("loading config saves config", async (t) => {
     const codeQL = setCodeQL({
       async resolveQueries() {
         return {
-          byLanguage: {},
+          byLanguage: {
+            javascript: { queries: ["query1.ql"] },
+            python: { queries: ["query2.ql"] },
+          },
           noDeclaredLanguage: {},
           multipleDeclaredLanguages: {},
         };