Merge branch 'main' into copilot/fix-2

Author: GeekMasher

.github/CODEOWNERS

@@ -0,0 +1 @@
+* @GeekMasher

.gitignore

@@ -3,3 +3,6 @@ node_modules
 .vscode-test
 *.vsix
 .DS_Store
+
+# Temporary test files
+test_*.js

README.md

@@ -17,6 +17,9 @@
 
 Seamlessly integrate GitHub's powerful CodeQL scanning engine directly into your VS Code workflow. Detect vulnerabilities, find security flaws, and improve code quality without leaving your editor.
 
+> [!NOTE]
+> This is **not** an offical GitHub project
+
 ## ✨ Key Features
 
 - **🛡️ Instant Security Analysis**: Scan your code for vulnerabilities directly from VSCode

package.json

@@ -157,6 +157,12 @@
                     "description": "Path to the CodeQL CLI executable",
                     "scope": "application"
                 },
+                "codeql-scanner.codeqlQueryPackPath": {
+                    "type": "string",
+                    "default": "",
+                    "description": "Path to where the CodeQL query packs are stored",
+                    "scope": "application"
+                },
                 "codeql-scanner.autoDetectGitHubExtension": {
                     "type": "boolean",
                     "default": true,
@@ -295,4 +301,4 @@
         "axios": "^1.3.4",
         "js-yaml": "^4.1.0"
     }
-}
+}

src/services/codeqlService.ts

@@ -137,6 +137,10 @@ export class CodeQLService {
       );
     }
 
+    // Ensure languages are always mapped to CodeQL languages, even if manually configured
+    // This prevents issues where users might manually configure "typescript" instead of "javascript"
+    languages = this.mapLanguagesToCodeQL(languages);
+
     this.logger.info(
       "CodeQLService",
       `Detected languages: [${languages.join(", ")}]`
@@ -736,7 +740,7 @@ export class CodeQLService {
         addedLanguages.add(lang);
         continue;
       }
-
+      //TODO: If language detected is typescript, map it to javascript
       // Check if it's an alias for a CodeQL language
       for (const [codeqlLang, aliases] of Object.entries(this.languages)) {
         if (aliases.includes(lang) && !addedLanguages.has(codeqlLang)) {
@@ -806,9 +810,8 @@ export class CodeQLService {
         }
 
         progress.report({
-          message: `Waiting for analysis (${
-            recentAnalysis?.status || "pending"
-          })...`,
+          message: `Waiting for analysis (${recentAnalysis?.status || "pending"
+            })...`,
         });
       } catch (error) {
         // Continue waiting even if there's an error
@@ -1331,8 +1334,13 @@ export class CodeQLService {
   }
 
   private findQueryPack(language: string): string | undefined {
+    const config = vscode.workspace.getConfiguration("codeql-scanner")
     const codeqlDir = this.getCodeQLDirectory();
-    const queryPackPath = path.join(codeqlDir, "packages");
+    const queryPackPath = config.get<string>(
+      "codeqlQueryPackPath",
+      path.join(codeqlDir, "packages")
+    );
+    // const queryPackPath = path.join(codeqlDir, "packages");
 
     // List all directories in the packages folder
     if (!fs.existsSync(queryPackPath)) {
@@ -1469,7 +1477,7 @@ export class CodeQLService {
       else if (parseLevel >= 5.0) return "medium";
       else if (parseLevel >= 3.0) return "low";
       else return "info";
-    } catch (error) {}
+    } catch (error) { }
 
     // Check if the level is a float
     switch (level?.toLowerCase()) {