Remove import cycle for distribution manager

Author: koesie10

extensions/ql-vscode/src/debugger/debugger-ui.ts

@@ -11,10 +11,10 @@ import { DisposableObject } from "../common/disposable-object";
 import type { CoreQueryResults } from "../query-server";
 import {
   getQuickEvalContext,
-  QueryOutputDir,
   saveBeforeStart,
   validateQueryUri,
 } from "../run-queries-shared";
+import { QueryOutputDir } from "../local-queries/query-output-dir";
 import type { QLResolvedDebugConfiguration } from "./debug-configuration";
 import type {
   AnyProtocolMessage,

extensions/ql-vscode/src/language-support/ast-viewer/ast-builder.ts

@@ -7,7 +7,7 @@ import type {
 import type { DatabaseItem } from "../../databases/local-databases";
 import type { ChildAstItem, AstItem } from "./ast-viewer";
 import type { Uri } from "vscode";
-import type { QueryOutputDir } from "../../run-queries-shared";
+import type { QueryOutputDir } from "../../local-queries/query-output-dir";
 import { fileRangeFromURI } from "../contextual/file-range-from-uri";
 import { mapUrlValue } from "../../common/bqrs-raw-results-mapper";
 

extensions/ql-vscode/src/language-support/contextual/location-finder.ts

@@ -21,7 +21,7 @@ import {
 } from "./query-resolver";
 import type { CancellationToken, LocationLink } from "vscode";
 import { Uri } from "vscode";
-import type { QueryOutputDir } from "../../run-queries-shared";
+import type { QueryOutputDir } from "../../local-queries/query-output-dir";
 import type { QueryRunner } from "../../query-server";
 import { QueryResultType } from "../../query-server/messages";
 import { fileRangeFromURI } from "./file-range-from-uri";

extensions/ql-vscode/src/local-queries/local-queries.ts

@@ -29,7 +29,8 @@ import type {
   DatabaseItem,
   DatabaseManager,
 } from "../databases/local-databases";
-import type { QueryOutputDir, SelectedQuery } from "../run-queries-shared";
+import type { SelectedQuery } from "../run-queries-shared";
+import type { QueryOutputDir } from "./query-output-dir";
 import {
   createInitialQueryInfo,
   createTimestampFile,

extensions/ql-vscode/src/local-queries/local-query-run.ts

@@ -9,9 +9,9 @@ import type { QueryHistoryManager } from "../query-history/query-history-manager
 import type { DatabaseItem } from "../databases/local-databases";
 import type {
   EvaluatorLogPaths,
-  QueryOutputDir,
   QueryWithResults,
 } from "../run-queries-shared";
+import type { QueryOutputDir } from "./query-output-dir";
 import {
   generateEvalLogSummaries,
   logEndSummary,

extensions/ql-vscode/src/local-queries/query-output-dir.ts

@@ -0,0 +1,75 @@
+import { join } from "path";
+
+function findQueryLogFile(resultPath: string): string {
+  return join(resultPath, "query.log");
+}
+
+function findQueryEvalLogFile(resultPath: string): string {
+  return join(resultPath, "evaluator-log.jsonl");
+}
+
+function findQueryEvalLogSummaryFile(resultPath: string): string {
+  return join(resultPath, "evaluator-log.summary");
+}
+
+function findJsonQueryEvalLogSummaryFile(resultPath: string): string {
+  return join(resultPath, "evaluator-log.summary.jsonl");
+}
+
+function findQueryEvalLogSummarySymbolsFile(resultPath: string): string {
+  return join(resultPath, "evaluator-log.summary.symbols.json");
+}
+
+function findQueryEvalLogEndSummaryFile(resultPath: string): string {
+  return join(resultPath, "evaluator-log-end.summary");
+}
+
+/**
+ * Provides paths to the files that can be generated in the output directory for a query evaluation.
+ */
+export class QueryOutputDir {
+  constructor(public readonly querySaveDir: string) {}
+
+  get dilPath() {
+    return join(this.querySaveDir, "results.dil");
+  }
+
+  /**
+   * Get the path that the compiled query is if it exists. Note that it only exists when using the legacy query server.
+   */
+  get compileQueryPath() {
+    return join(this.querySaveDir, "compiledQuery.qlo");
+  }
+
+  get csvPath() {
+    return join(this.querySaveDir, "results.csv");
+  }
+
+  get logPath() {
+    return findQueryLogFile(this.querySaveDir);
+  }
+
+  get evalLogPath() {
+    return findQueryEvalLogFile(this.querySaveDir);
+  }
+
+  get evalLogSummaryPath() {
+    return findQueryEvalLogSummaryFile(this.querySaveDir);
+  }
+
+  get jsonEvalLogSummaryPath() {
+    return findJsonQueryEvalLogSummaryFile(this.querySaveDir);
+  }
+
+  get evalLogSummarySymbolsPath() {
+    return findQueryEvalLogSummarySymbolsFile(this.querySaveDir);
+  }
+
+  get evalLogEndSummaryPath() {
+    return findQueryEvalLogEndSummaryFile(this.querySaveDir);
+  }
+
+  get bqrsPath() {
+    return join(this.querySaveDir, "results.bqrs");
+  }
+}

extensions/ql-vscode/src/query-history/store/query-history-local-query-dto-mapper.ts

@@ -1,6 +1,8 @@
 import type { InitialQueryInfo } from "../../query-results";
 import { LocalQueryInfo, CompletedQueryInfo } from "../../query-results";
-import { QueryEvaluationInfo, QueryOutputDir } from "../../run-queries-shared";
+import { QueryEvaluationInfo } from "../../run-queries-shared";
+import { QueryOutputDir } from "../../local-queries/query-output-dir";
+import { SortDirectionDto } from "./query-history-local-query-dto";
 import type {
   CompletedQueryInfoDto,
   QueryEvaluationInfoDto,
@@ -10,7 +12,6 @@ import type {
   SortedResultSetInfoDto,
   RawResultsSortStateDto,
 } from "./query-history-local-query-dto";
-import { SortDirectionDto } from "./query-history-local-query-dto";
 import type {
   InterpretedResultsSortState,
   RawResultsSortState,

extensions/ql-vscode/src/query-results.ts

@@ -19,9 +19,9 @@ import { QueryStatus } from "./query-history/query-status";
 import type {
   EvaluatorLogPaths,
   QueryEvaluationInfo,
-  QueryOutputDir,
   QueryWithResults,
 } from "./run-queries-shared";
+import type { QueryOutputDir } from "./local-queries/query-output-dir";
 import { sarifParser } from "./common/sarif-parser";
 
 /**

extensions/ql-vscode/src/query-server/query-runner.ts

@@ -1,10 +1,10 @@
-import type { CancellationToken } from "vscode";
-import vscode from "vscode";
+import { window } from "vscode";
+import type { CancellationToken, MessageItem } from "vscode";
 import type { CodeQLCliServer } from "../codeql-cli/cli";
 import type { ProgressCallback } from "../common/vscode/progress";
 import { UserCancellationException } from "../common/vscode/progress";
-import type { DatabaseItem } from "../databases/local-databases";
-import { QueryOutputDir } from "../run-queries-shared";
+import type { DatabaseItem } from "../databases/local-databases/database-item";
+import { QueryOutputDir } from "../local-queries/query-output-dir";
 import type {
   ClearCacheParams,
   Position,
@@ -178,11 +178,11 @@ export class QueryRunner {
   ): Promise<void> {
     const yesItem = { title: "Yes", isCloseAffordance: false };
     const noItem = { title: "No", isCloseAffordance: true };
-    const dialogOptions: vscode.MessageItem[] = [yesItem, noItem];
+    const dialogOptions: MessageItem[] = [yesItem, noItem];
 
     const message = `Should the database ${dbItem.databaseUri.fsPath} be destructively upgraded?\n\nThis should not be necessary to run queries
     as we will non-destructively update it anyway.`;
-    const chosenItem = await vscode.window.showInformationMessage(
+    const chosenItem = await window.showInformationMessage(
       message,
       { modal: true },
       ...dialogOptions,

extensions/ql-vscode/src/query-server/run-queries.ts

@@ -2,7 +2,7 @@ import type { CancellationToken } from "vscode";
 import type { ProgressCallback } from "../common/vscode/progress";
 import type { RunQueryParams } from "./messages";
 import { runQuery } from "./messages";
-import type { QueryOutputDir } from "../run-queries-shared";
+import type { QueryOutputDir } from "../local-queries/query-output-dir";
 import type { QueryServerClient } from "./query-server-client";
 import type { CoreQueryResults, CoreQueryTarget } from "./query-runner";
 import type { BaseLogger } from "../common/logging";