Merge branch 'main' into koesie10/markdown-lint-ci

Author: koesie10

CODEOWNERS

@@ -1,3 +1,4 @@
 **/* @github/codeql-vscode-reviewers
 **/variant-analysis/ @github/code-scanning-secexp-reviewers
 **/databases/ @github/code-scanning-secexp-reviewers
+**/data-extensions-editor/ @github/code-scanning-secexp-reviewers

extensions/ql-vscode/package-lock.json

@@ -703,6 +703,10 @@
         "title": "CodeQL: Go to QL Code",
         "enablement": "codeql.hasQLSource"
       },
+      {
+        "command": "codeQL.openDataExtensionsEditor",
+        "title": "CodeQL: Open Data Extensions Editor"
+      },
       {
         "command": "codeQL.mockGitHubApiServer.startRecording",
         "title": "CodeQL: Mock GitHub API Server: Start Scenario Recording"
@@ -1086,6 +1090,10 @@
           "command": "codeQL.viewCfgContextEditor",
           "when": "false"
         },
+        {
+          "command": "codeQL.openDataExtensionsEditor",
+          "when": "config.codeQL.canary && config.codeQL.dataExtensions.editor"
+        },
         {
           "command": "codeQLVariantAnalysisRepositories.openConfigFile",
           "when": "false"

extensions/ql-vscode/package.json

@@ -69,6 +69,8 @@ export type BaseCommands = {
 
   "codeQL.copyVersion": () => Promise<void>;
   "codeQL.restartQueryServer": () => Promise<void>;
+  "codeQL.restartQueryServerOnConfigChange": () => Promise<void>;
+  "codeQL.restartLegacyQueryServerOnConfigChange": () => Promise<void>;
 };
 
 // Commands used when working with queries in the editor
@@ -196,7 +198,10 @@ export type VariantAnalysisCommands = {
     variantAnalysisId: number,
     repositoryFullName: string,
   ) => Promise<VariantAnalysisScannedRepositoryResult>;
-  "codeQL.monitorVariantAnalysis": (
+  "codeQL.monitorNewVariantAnalysis": (
+    variantAnalysis: VariantAnalysis,
+  ) => Promise<void>;
+  "codeQL.monitorRehydratedVariantAnalysis": (
     variantAnalysis: VariantAnalysis,
   ) => Promise<void>;
   "codeQL.openVariantAnalysisLogs": (
@@ -241,6 +246,10 @@ export type PackagingCommands = {
   "codeQL.downloadPacks": () => Promise<void>;
 };
 
+export type DataExtensionsEditorCommands = {
+  "codeQL.openDataExtensionsEditor": () => Promise<void>;
+};
+
 export type EvalLogViewerCommands = {
   "codeQLEvalLogViewer.clear": () => Promise<void>;
 };
@@ -273,6 +282,7 @@ export type AllExtensionCommands = BaseCommands &
   AstCfgCommands &
   AstViewerCommands &
   PackagingCommands &
+  DataExtensionsEditorCommands &
   EvalLogViewerCommands &
   SummaryLanguageSupportCommands &
   Partial<TestUICommands> &

extensions/ql-vscode/src/common/commands.ts

@@ -0,0 +1,54 @@
+import { DecodedBqrsChunk } from "../pure/bqrs-cli-types";
+import { Call, ExternalApiUsage } from "./external-api-usage";
+
+export function decodeBqrsToExternalApiUsages(
+  chunk: DecodedBqrsChunk,
+): ExternalApiUsage[] {
+  const methodsByApiName = new Map<string, ExternalApiUsage>();
+
+  chunk?.tuples.forEach((tuple) => {
+    const signature = tuple[0] as string;
+    const supported = tuple[1] as boolean;
+    const usage = tuple[2] as Call;
+
+    const [packageWithType, methodDeclaration] = signature.split("#");
+
+    const packageName = packageWithType.substring(
+      0,
+      packageWithType.lastIndexOf("."),
+    );
+    const typeName = packageWithType.substring(
+      packageWithType.lastIndexOf(".") + 1,
+    );
+
+    const methodName = methodDeclaration.substring(
+      0,
+      methodDeclaration.indexOf("("),
+    );
+    const methodParameters = methodDeclaration.substring(
+      methodDeclaration.indexOf("("),
+    );
+
+    if (!methodsByApiName.has(signature)) {
+      methodsByApiName.set(signature, {
+        signature,
+        packageName,
+        typeName,
+        methodName,
+        methodParameters,
+        supported,
+        usages: [],
+      });
+    }
+
+    const method = methodsByApiName.get(signature)!;
+    method.usages.push(usage);
+  });
+
+  const externalApiUsages = Array.from(methodsByApiName.values());
+  externalApiUsages.sort((a, b) => {
+    // Sort by number of usages descending
+    return b.usages.length - a.usages.length;
+  });
+  return externalApiUsages;
+}

extensions/ql-vscode/src/data-extensions-editor/bqrs.ts

@@ -0,0 +1,70 @@
+import { ExtensionContext } from "vscode";
+import { DataExtensionsEditorView } from "./data-extensions-editor-view";
+import { DataExtensionsEditorCommands } from "../common/commands";
+import { CodeQLCliServer } from "../cli";
+import { QueryRunner } from "../queryRunner";
+import { DatabaseManager } from "../local-databases";
+import { extLogger } from "../common";
+import { ensureDir } from "fs-extra";
+import { join } from "path";
+
+export class DataExtensionsEditorModule {
+  private readonly queryStorageDir: string;
+
+  private constructor(
+    private readonly ctx: ExtensionContext,
+    private readonly databaseManager: DatabaseManager,
+    private readonly cliServer: CodeQLCliServer,
+    private readonly queryRunner: QueryRunner,
+    baseQueryStorageDir: string,
+  ) {
+    this.queryStorageDir = join(
+      baseQueryStorageDir,
+      "data-extensions-editor-results",
+    );
+  }
+
+  public static async initialize(
+    ctx: ExtensionContext,
+    databaseManager: DatabaseManager,
+    cliServer: CodeQLCliServer,
+    queryRunner: QueryRunner,
+    queryStorageDir: string,
+  ): Promise<DataExtensionsEditorModule> {
+    const dataExtensionsEditorModule = new DataExtensionsEditorModule(
+      ctx,
+      databaseManager,
+      cliServer,
+      queryRunner,
+      queryStorageDir,
+    );
+
+    await dataExtensionsEditorModule.initialize();
+    return dataExtensionsEditorModule;
+  }
+
+  public getCommands(): DataExtensionsEditorCommands {
+    return {
+      "codeQL.openDataExtensionsEditor": async () => {
+        const db = this.databaseManager.currentDatabaseItem;
+        if (!db) {
+          void extLogger.log("No database selected");
+          return;
+        }
+
+        const view = new DataExtensionsEditorView(
+          this.ctx,
+          this.cliServer,
+          this.queryRunner,
+          this.queryStorageDir,
+          db,
+        );
+        await view.openView();
+      },
+    };
+  }
+
+  private async initialize(): Promise<void> {
+    await ensureDir(this.queryStorageDir);
+  }
+}