Merge pull request #2537 from github/robertbrignull/move-pure-3

Move files from /pure to the /common (and other) directories (part 3 of 3)

extensions/ql-vscode/src/codeql-cli/cli.ts

@@ -26,7 +26,7 @@ import { walkDirectory } from "../common/files";
 import { QueryMetadata, SortDirection } from "../common/interface-types";
 import { BaseLogger, Logger } from "../common/logging";
 import { ProgressReporter } from "../common/logging/vscode";
-import { CompilationMessage } from "../pure/legacy-messages";
+import { CompilationMessage } from "../query-server/legacy-messages";
 import { sarifParser } from "../common/sarif-parser";
 import { App } from "../common/app";
 import { QueryLanguage } from "../common/query-language";

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

@@ -4,7 +4,7 @@ import type { AstItem } from "../language-support";
 import type { DbTreeViewItem } from "../databases/ui/db-tree-view-item";
 import type { DatabaseItem } from "../databases/local-databases";
 import type { QueryHistoryInfo } from "../query-history/query-history-info";
-import type { RepositoriesFilterSortStateWithIds } from "../pure/variant-analysis-filter-sort";
+import type { RepositoriesFilterSortStateWithIds } from "../variant-analysis/shared/variant-analysis-filter-sort";
 import type { TestTreeNode } from "../query-testing/test-tree-node";
 import type {
   VariantAnalysis,

extensions/ql-vscode/src/common/interface-types.ts

@@ -14,7 +14,7 @@ import {
 import {
   RepositoriesFilterSortState,
   RepositoriesFilterSortStateWithIds,
-} from "../pure/variant-analysis-filter-sort";
+} from "../variant-analysis/shared/variant-analysis-filter-sort";
 import { ErrorLike } from "../common/errors";
 import { DataFlowPaths } from "../variant-analysis/shared/data-flow-paths";
 import { ExternalApiUsage } from "../data-extensions-editor/external-api-usage";

extensions/ql-vscode/src/config.ts

@@ -13,7 +13,7 @@ import {
   FilterKey,
   SortKey,
   defaultFilterSortState,
-} from "./pure/variant-analysis-filter-sort";
+} from "./variant-analysis/shared/variant-analysis-filter-sort";
 
 export const ALL_SETTINGS: Setting[] = [];
 

extensions/ql-vscode/src/data-extensions-editor/external-api-usage-query.ts

@@ -11,7 +11,7 @@ import { CodeQLCliServer } from "../codeql-cli/cli";
 import { DatabaseItem } from "../databases/local-databases";
 import { ProgressCallback } from "../common/vscode/progress";
 import { fetchExternalApiQueries } from "./queries";
-import { QueryResultType } from "../pure/new-messages";
+import { QueryResultType } from "../query-server/new-messages";
 import { join } from "path";
 import { redactableError } from "../common/errors";
 import { telemetryListener } from "../common/vscode/telemetry";

extensions/ql-vscode/src/data-extensions-editor/generate-flow-model.ts

@@ -13,7 +13,7 @@ import {
   ModeledMethodWithSignature,
 } from "./modeled-method";
 import { redactableError } from "../common/errors";
-import { QueryResultType } from "../pure/new-messages";
+import { QueryResultType } from "../query-server/new-messages";
 import { file } from "tmp-promise";
 import { writeFile } from "fs-extra";
 import { dump } from "js-yaml";

extensions/ql-vscode/src/debugger/debug-protocol.ts

@@ -1,5 +1,5 @@
 import { DebugProtocol } from "@vscode/debugprotocol";
-import { QueryResultType } from "../pure/new-messages";
+import { QueryResultType } from "../query-server/new-messages";
 import { QuickEvalContext } from "../run-queries-shared";
 
 // Events

extensions/ql-vscode/src/debugger/debug-session.ts

@@ -14,7 +14,7 @@ import { Disposable } from "vscode";
 import { CancellationTokenSource } from "vscode-jsonrpc";
 import { BaseLogger, LogOptions } from "../common/logging";
 import { queryServerLogger } from "../common/logging/vscode";
-import { QueryResultType } from "../pure/new-messages";
+import { QueryResultType } from "../query-server/new-messages";
 import { CoreQueryResults, CoreQueryRun, QueryRunner } from "../query-server";
 import * as CodeQLProtocol from "./debug-protocol";
 import { QuickEvalContext } from "../run-queries-shared";

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

@@ -20,7 +20,7 @@ import {
 import { CancellationToken, LocationLink, Uri } from "vscode";
 import { QueryOutputDir } from "../../run-queries-shared";
 import { QueryRunner } from "../../query-server";
-import { QueryResultType } from "../../pure/new-messages";
+import { QueryResultType } from "../../query-server/new-messages";
 import { fileRangeFromURI } from "./file-range-from-uri";
 
 export const SELECT_QUERY_NAME = "#select";

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

@@ -19,7 +19,7 @@ import {
 import { CompletedLocalQueryInfo, LocalQueryInfo } from "../query-results";
 import { WebviewReveal } from "./webview";
 import { CodeQLCliServer } from "../codeql-cli/cli";
-import { QueryResultType } from "../pure/new-messages";
+import { QueryResultType } from "../query-server/new-messages";
 import { redactableError } from "../common/errors";
 import { LocalQueries } from "./local-queries";
 import { tryGetQueryMetadata } from "../codeql-cli/query-metadata";

extensions/ql-vscode/src/query-evaluation-logging/eval-log-tree-builder.ts

@@ -1,5 +1,5 @@
 import { ChildEvalLogTreeItem, EvalLogTreeItem } from "./eval-log-viewer";
-import { EvalLogData as EvalLogData } from "../pure/log-summary-parser";
+import { EvalLogData as EvalLogData } from "../log-insights/log-summary-parser";
 
 /** Builds the tree data for the evaluator log viewer for a single query run. */
 export class EvalLogTreeBuilder {

extensions/ql-vscode/src/query-history/query-history-manager.ts

@@ -40,7 +40,10 @@ import { CliVersionConstraint } from "../codeql-cli/cli";
 import { HistoryItemLabelProvider } from "./history-item-label-provider";
 import { ResultsView, WebviewReveal } from "../local-queries";
 import { EvalLogTreeBuilder, EvalLogViewer } from "../query-evaluation-logging";
-import { EvalLogData, parseViewerData } from "../pure/log-summary-parser";
+import {
+  EvalLogData,
+  parseViewerData,
+} from "../log-insights/log-summary-parser";
 import { QueryWithResults } from "../run-queries-shared";
 import { QueryRunner } from "../query-server";
 import { VariantAnalysisManager } from "../variant-analysis/variant-analysis-manager";

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

@@ -1,7 +1,7 @@
 import { CancellationTokenSource, env } from "vscode";
 
-import * as messages from "./pure/messages-shared";
-import * as legacyMessages from "./pure/legacy-messages";
+import * as messages from "./query-server/messages-shared";
+import * as legacyMessages from "./query-server/legacy-messages";
 import * as cli from "./codeql-cli/cli";
 import { pathExists } from "fs-extra";
 import { basename } from "path";

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

@@ -7,7 +7,7 @@ import {
   Dataset,
   deregisterDatabases,
   registerDatabases,
-} from "../../pure/legacy-messages";
+} from "../legacy-messages";
 import {
   CoreQueryResults,
   CoreQueryTarget,

extensions/ql-vscode/src/query-server/legacy/query-server-client.ts

@@ -13,7 +13,7 @@ import {
   progress,
   ProgressMessage,
   WithProgressId,
-} from "../../pure/legacy-messages";
+} from "../legacy-messages";
 import { ProgressCallback, ProgressTask } from "../../common/vscode/progress";
 import { ServerProcess } from "../server-process";
 import { App } from "../../common/app";

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

@@ -18,15 +18,15 @@ import {
   showAndLogExceptionWithTelemetry,
   showAndLogWarningMessage,
 } from "../../common/logging";
-import * as messages from "../../pure/legacy-messages";
-import * as newMessages from "../../pure/new-messages";
+import * as messages from "../legacy-messages";
+import * as newMessages from "../new-messages";
 import * as qsClient from "./query-server-client";
 import { asError, getErrorMessage } from "../../common/helpers-pure";
 import { compileDatabaseUpgradeSequence } from "./upgrades";
 import { QueryEvaluationInfo, QueryOutputDir } from "../../run-queries-shared";
 import { redactableError } from "../../common/errors";
 import { CoreQueryResults, CoreQueryTarget } from "../query-runner";
-import { Position } from "../../pure/messages-shared";
+import { Position } from "../messages-shared";
 import { ensureDirSync } from "fs-extra";
 import { telemetryListener } from "../../common/vscode/telemetry";
 

extensions/ql-vscode/src/query-server/legacy/upgrades.ts

@@ -7,7 +7,7 @@ import {
 } from "../../common/vscode/progress";
 import { extLogger } from "../../common/logging/vscode";
 import { showAndLogExceptionWithTelemetry } from "../../common/logging";
-import * as messages from "../../pure/legacy-messages";
+import * as messages from "../legacy-messages";
 import * as qsClient from "./query-server-client";
 import * as tmp from "tmp-promise";
 import { dirname } from "path";

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

@@ -11,7 +11,7 @@ import {
   deregisterDatabases,
   registerDatabases,
   upgradeDatabase,
-} from "../pure/new-messages";
+} from "./new-messages";
 import { CoreQueryResults, CoreQueryTarget, QueryRunner } from "./query-runner";
 import { QueryServerClient } from "./query-server-client";
 import { compileAndRunQueryAgainstDatabaseCore } from "./run-queries";

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

@@ -3,7 +3,7 @@ import { CodeQLCliServer } from "../codeql-cli/cli";
 import { ProgressCallback } from "../common/vscode/progress";
 import { DatabaseItem } from "../databases/local-databases";
 import { QueryOutputDir } from "../run-queries-shared";
-import { Position, QueryResultType } from "../pure/new-messages";
+import { Position, QueryResultType } from "./new-messages";
 import { BaseLogger, Logger } from "../common/logging";
 import { basename, join } from "path";
 import { nanoid } from "nanoid";

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

@@ -7,11 +7,7 @@ import * as cli from "../codeql-cli/cli";
 import { QueryServerConfig } from "../config";
 import { Logger, showAndLogErrorMessage } from "../common/logging";
 import { extLogger, ProgressReporter } from "../common/logging/vscode";
-import {
-  progress,
-  ProgressMessage,
-  WithProgressId,
-} from "../pure/new-messages";
+import { progress, ProgressMessage, WithProgressId } from "./new-messages";
 import {
   ProgressCallback,
   ProgressTask,

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

@@ -1,6 +1,6 @@
 import { CancellationToken } from "vscode";
 import { ProgressCallback } from "../common/vscode/progress";
-import * as messages from "../pure/new-messages";
+import * as messages from "./new-messages";
 import { QueryOutputDir } from "../run-queries-shared";
 import * as qsClient from "./query-server-client";
 import { CoreQueryResults, CoreQueryTarget } from "./query-runner";

extensions/ql-vscode/src/run-queries-shared.ts

@@ -1,5 +1,5 @@
-import * as messages from "./pure/messages-shared";
-import * as legacyMessages from "./pure/legacy-messages";
+import * as messages from "./query-server/messages-shared";
+import * as legacyMessages from "./query-server/legacy-messages";
 import { DatabaseInfo, QueryMetadata } from "./common/interface-types";
 import { join, parse, dirname, basename } from "path";
 import {

extensions/ql-vscode/src/stories/variant-analysis/RepositoriesFilter.stories.tsx

@@ -4,7 +4,7 @@ import { useState } from "react";
 import { ComponentMeta } from "@storybook/react";
 
 import { RepositoriesFilter as RepositoriesFilterComponent } from "../../view/variant-analysis/RepositoriesFilter";
-import { FilterKey } from "../../pure/variant-analysis-filter-sort";
+import { FilterKey } from "../../variant-analysis/shared/variant-analysis-filter-sort";
 
 export default {
   title: "Variant Analysis/Repositories Filter",

extensions/ql-vscode/src/stories/variant-analysis/RepositoriesSearchSortRow.stories.tsx

@@ -4,7 +4,7 @@ import { useState } from "react";
 import { ComponentMeta } from "@storybook/react";
 
 import { RepositoriesSearchSortRow as RepositoriesSearchSortRowComponent } from "../../view/variant-analysis/RepositoriesSearchSortRow";
-import { defaultFilterSortState } from "../../pure/variant-analysis-filter-sort";
+import { defaultFilterSortState } from "../../variant-analysis/shared/variant-analysis-filter-sort";
 
 export default {
   title: "Variant Analysis/Repositories Search and Sort Row",

extensions/ql-vscode/src/stories/variant-analysis/RepositoriesSort.stories.tsx

@@ -4,7 +4,7 @@ import { useState } from "react";
 import { ComponentMeta } from "@storybook/react";
 
 import { RepositoriesSort as RepositoriesSortComponent } from "../../view/variant-analysis/RepositoriesSort";
-import { SortKey } from "../../pure/variant-analysis-filter-sort";
+import { SortKey } from "../../variant-analysis/shared/variant-analysis-filter-sort";
 
 export default {
   title: "Variant Analysis/Repositories Sort",

extensions/ql-vscode/src/stories/variant-analysis/VariantAnalysisOutcomePanels.stories.tsx

@@ -15,7 +15,7 @@ import { createMockRepositoryWithMetadata } from "../../../test/factories/varian
 import {
   defaultFilterSortState,
   RepositoriesFilterSortState,
-} from "../../pure/variant-analysis-filter-sort";
+} from "../../variant-analysis/shared/variant-analysis-filter-sort";
 
 export default {
   title: "Variant Analysis/Variant Analysis Outcome Panels",

extensions/ql-vscode/src/variant-analysis/export-results.ts

@@ -26,7 +26,7 @@ import {
 import {
   filterAndSortRepositoriesWithResults,
   RepositoriesFilterSortStateWithIds,
-} from "../pure/variant-analysis-filter-sort";
+} from "./shared/variant-analysis-filter-sort";
 import { Credentials } from "../common/authentication";
 import { AppCommandManager } from "../common/commands";
 

extensions/ql-vscode/src/variant-analysis/shared/variant-analysis-filter-sort.ts

@@ -1,9 +1,6 @@
-import {
-  Repository,
-  RepositoryWithMetadata,
-} from "../variant-analysis/shared/repository";
-import { parseDate } from "../common/date";
-import { assertNever } from "../common/helpers-pure";
+import { Repository, RepositoryWithMetadata } from "./repository";
+import { parseDate } from "../../common/date";
+import { assertNever } from "../../common/helpers-pure";
 
 export enum FilterKey {
   All = "all",

extensions/ql-vscode/src/variant-analysis/variant-analysis-manager.ts

@@ -57,7 +57,7 @@ import {
   defaultFilterSortState,
   filterAndSortRepositoriesWithResults,
   RepositoriesFilterSortStateWithIds,
-} from "../pure/variant-analysis-filter-sort";
+} from "./shared/variant-analysis-filter-sort";
 import { URLSearchParams } from "url";
 import { DbManager } from "../databases/db-manager";
 import { App } from "../common/app";

extensions/ql-vscode/src/variant-analysis/variant-analysis-view-manager.ts

@@ -3,7 +3,7 @@ import {
   VariantAnalysisScannedRepositoryState,
 } from "./shared/variant-analysis";
 import { AppCommandManager } from "../common/commands";
-import { RepositoriesFilterSortStateWithIds } from "../pure/variant-analysis-filter-sort";
+import { RepositoriesFilterSortStateWithIds } from "./shared/variant-analysis-filter-sort";
 
 export interface VariantAnalysisViewInterface {
   variantAnalysisId: number;

extensions/ql-vscode/src/view/results/alert-table.tsx

@@ -1,7 +1,7 @@
 import { basename } from "path";
 import * as React from "react";
 import * as Sarif from "sarif";
-import * as Keys from "../../pure/result-keys";
+import * as Keys from "./result-keys";
 import { chevronDown, chevronRight, info, listUnordered } from "./octicons";
 import {
   className,

extensions/ql-vscode/src/view/variant-analysis/RepositoriesFilter.tsx

@@ -3,7 +3,7 @@ import { useCallback } from "react";
 import styled from "styled-components";
 import { VSCodeDropdown, VSCodeOption } from "@vscode/webview-ui-toolkit/react";
 import { Codicon } from "../common";
-import { FilterKey } from "../../pure/variant-analysis-filter-sort";
+import { FilterKey } from "../../variant-analysis/shared/variant-analysis-filter-sort";
 
 const Dropdown = styled(VSCodeDropdown)`
   width: 100%;

extensions/ql-vscode/src/view/variant-analysis/RepositoriesSearchSortRow.tsx

@@ -5,7 +5,7 @@ import {
   FilterKey,
   RepositoriesFilterSortState,
   SortKey,
-} from "../../pure/variant-analysis-filter-sort";
+} from "../../variant-analysis/shared/variant-analysis-filter-sort";
 import { RepositoriesSearch } from "./RepositoriesSearch";
 import { RepositoriesSort } from "./RepositoriesSort";
 import { RepositoriesFilter } from "./RepositoriesFilter";

extensions/ql-vscode/src/view/variant-analysis/RepositoriesSort.tsx

@@ -2,7 +2,7 @@ import * as React from "react";
 import { useCallback } from "react";
 import styled from "styled-components";
 import { VSCodeDropdown, VSCodeOption } from "@vscode/webview-ui-toolkit/react";
-import { SortKey } from "../../pure/variant-analysis-filter-sort";
+import { SortKey } from "../../variant-analysis/shared/variant-analysis-filter-sort";
 import { Codicon } from "../common";
 
 const Dropdown = styled(VSCodeDropdown)`

extensions/ql-vscode/src/view/variant-analysis/VariantAnalysis.tsx

@@ -12,7 +12,7 @@ import { VariantAnalysisOutcomePanels } from "./VariantAnalysisOutcomePanels";
 import { VariantAnalysisLoading } from "./VariantAnalysisLoading";
 import { ToVariantAnalysisMessage } from "../../common/interface-types";
 import { vscode } from "../vscode-api";
-import { defaultFilterSortState } from "../../pure/variant-analysis-filter-sort";
+import { defaultFilterSortState } from "../../variant-analysis/shared/variant-analysis-filter-sort";
 import { sendTelemetry, useTelemetryOnChange } from "../common/telemetry";
 
 export type VariantAnalysisProps = {

extensions/ql-vscode/src/view/variant-analysis/VariantAnalysisAnalyzedRepos.tsx

@@ -10,7 +10,7 @@ import {
 import {
   filterAndSortRepositoriesWithResultsByName,
   RepositoriesFilterSortState,
-} from "../../pure/variant-analysis-filter-sort";
+} from "../../variant-analysis/shared/variant-analysis-filter-sort";
 
 const Container = styled.div`
   display: flex;

extensions/ql-vscode/src/view/variant-analysis/VariantAnalysisHeader.tsx

@@ -19,7 +19,7 @@ import {
   defaultFilterSortState,
   filterAndSortRepositoriesWithResults,
   RepositoriesFilterSortState,
-} from "../../pure/variant-analysis-filter-sort";
+} from "../../variant-analysis/shared/variant-analysis-filter-sort";
 
 export type VariantAnalysisHeaderProps = {
   variantAnalysis: VariantAnalysis;

extensions/ql-vscode/src/view/variant-analysis/VariantAnalysisOutcomePanels.tsx

@@ -17,7 +17,7 @@ import {
 import { VariantAnalysisAnalyzedRepos } from "./VariantAnalysisAnalyzedRepos";
 import { Alert } from "../common";
 import { VariantAnalysisSkippedRepositoriesTab } from "./VariantAnalysisSkippedRepositoriesTab";
-import { RepositoriesFilterSortState } from "../../pure/variant-analysis-filter-sort";
+import { RepositoriesFilterSortState } from "../../variant-analysis/shared/variant-analysis-filter-sort";
 import { RepositoriesSearchSortRow } from "./RepositoriesSearchSortRow";
 import { FailureReasonAlert } from "./FailureReasonAlert";
 

extensions/ql-vscode/src/view/variant-analysis/VariantAnalysisSkippedRepositoriesTab.tsx

@@ -8,7 +8,7 @@ import {
   compareRepository,
   matchesFilter,
   RepositoriesFilterSortState,
-} from "../../pure/variant-analysis-filter-sort";
+} from "../../variant-analysis/shared/variant-analysis-filter-sort";
 
 export type VariantAnalysisSkippedRepositoriesTabProps = {
   alertTitle: string;

extensions/ql-vscode/src/view/variant-analysis/__tests__/VariantAnalysis.spec.tsx

@@ -7,7 +7,10 @@ import {
 import { VariantAnalysis, VariantAnalysisProps } from "../VariantAnalysis";
 import { createMockVariantAnalysis } from "../../../../test/factories/variant-analysis/shared/variant-analysis";
 import { ToVariantAnalysisMessage } from "../../../common/interface-types";
-import { FilterKey, SortKey } from "../../../pure/variant-analysis-filter-sort";
+import {
+  FilterKey,
+  SortKey,
+} from "../../../variant-analysis/shared/variant-analysis-filter-sort";
 import { postMessage } from "../../common/post-message";
 
 describe(VariantAnalysis.name, () => {

extensions/ql-vscode/src/view/variant-analysis/__tests__/VariantAnalysisAnalyzedRepos.spec.tsx

@@ -13,7 +13,7 @@ import {
 import { createMockVariantAnalysis } from "../../../../test/factories/variant-analysis/shared/variant-analysis";
 import { createMockRepositoryWithMetadata } from "../../../../test/factories/variant-analysis/shared/repository";
 import { createMockScannedRepo } from "../../../../test/factories/variant-analysis/shared/scanned-repositories";
-import { SortKey } from "../../../pure/variant-analysis-filter-sort";
+import { SortKey } from "../../../variant-analysis/shared/variant-analysis-filter-sort";
 import { permissiveFilterSortState } from "../../../../test/unit-tests/variant-analysis-filter-sort.test";
 
 describe(VariantAnalysisAnalyzedRepos.name, () => {

extensions/ql-vscode/src/view/variant-analysis/__tests__/VariantAnalysisOutcomePanels.spec.tsx

@@ -16,7 +16,7 @@ import {
   createMockScannedRepo,
   createMockScannedRepos,
 } from "../../../../test/factories/variant-analysis/shared/scanned-repositories";
-import { defaultFilterSortState } from "../../../pure/variant-analysis-filter-sort";
+import { defaultFilterSortState } from "../../../variant-analysis/shared/variant-analysis-filter-sort";
 
 describe(VariantAnalysisOutcomePanels.name, () => {
   const defaultVariantAnalysis = {

extensions/ql-vscode/src/view/variant-analysis/__tests__/VariantAnalysisSkippedRepositoriesTab.spec.tsx

@@ -4,7 +4,7 @@ import {
   VariantAnalysisSkippedRepositoriesTab,
   VariantAnalysisSkippedRepositoriesTabProps,
 } from "../VariantAnalysisSkippedRepositoriesTab";
-import { SortKey } from "../../../pure/variant-analysis-filter-sort";
+import { SortKey } from "../../../variant-analysis/shared/variant-analysis-filter-sort";
 import { permissiveFilterSortState } from "../../../../test/unit-tests/variant-analysis-filter-sort.test";
 
 describe(VariantAnalysisSkippedRepositoriesTab.name, () => {

extensions/ql-vscode/test/factories/query-history/local-query-history-item.ts

@@ -5,7 +5,7 @@ import {
   QueryWithResults,
 } from "../../../src/run-queries-shared";
 import { CancellationTokenSource } from "vscode";
-import { QueryResultType } from "../../../src/pure/legacy-messages";
+import { QueryResultType } from "../../../src/query-server/legacy-messages";
 import { QueryMetadata } from "../../../src/common/interface-types";
 
 export function createMockLocalQueryInfo({

extensions/ql-vscode/test/unit-tests/pure/log-summary-parser.test.ts

@@ -1,6 +1,6 @@
 import { join } from "path";
 
-import { parseViewerData } from "../../../src/pure/log-summary-parser";
+import { parseViewerData } from "../../../src/log-insights/log-summary-parser";
 
 describe("Evaluator log summary tests", () => {
   describe("for a valid summary text", () => {

extensions/ql-vscode/test/unit-tests/variant-analysis-filter-sort.test.ts

@@ -6,7 +6,7 @@ import {
   FilterKey,
   matchesFilter,
   SortKey,
-} from "../../src/pure/variant-analysis-filter-sort";
+} from "../../src/variant-analysis/shared/variant-analysis-filter-sort";
 
 /** A filterSortState that matches everything */
 export const permissiveFilterSortState = {

extensions/ql-vscode/test/vscode-tests/activated-extension/variant-analysis/variant-analysis-manager.test.ts

@@ -36,7 +36,7 @@ import {
 import { createTimestampFile } from "../../../../src/run-queries-shared";
 import { createMockVariantAnalysisRepoTask } from "../../../factories/variant-analysis/gh-api/variant-analysis-repo-task";
 import { VariantAnalysisRepoTask } from "../../../../src/variant-analysis/gh-api/variant-analysis";
-import { SortKey } from "../../../../src/pure/variant-analysis-filter-sort";
+import { SortKey } from "../../../../src/variant-analysis/shared/variant-analysis-filter-sort";
 import { DbManager } from "../../../../src/databases/db-manager";
 import { App } from "../../../../src/common/app";
 import { ExtensionApp } from "../../../../src/common/vscode/vscode-app";

extensions/ql-vscode/test/vscode-tests/cli-integration/debugger/debug-controller.ts

@@ -9,7 +9,7 @@ import {
 } from "vscode";
 import * as CodeQLProtocol from "../../../../src/debugger/debug-protocol";
 import { DisposableObject } from "../../../../src/common/disposable-object";
-import { QueryResultType } from "../../../../src/pure/legacy-messages";
+import { QueryResultType } from "../../../../src/query-server/legacy-messages";
 import { CoreCompletedQuery } from "../../../../src/query-server/query-runner";
 import { QueryOutputDir } from "../../../../src/run-queries-shared";
 import {

extensions/ql-vscode/test/vscode-tests/cli-integration/legacy-query.test.ts

@@ -3,7 +3,7 @@ import { join, basename } from "path";
 import { dirSync } from "tmp";
 import { pathToFileURL } from "url";
 import { CancellationTokenSource } from "vscode-jsonrpc";
-import * as messages from "../../../src/pure/legacy-messages";
+import * as messages from "../../../src/query-server/legacy-messages";
 import * as qsClient from "../../../src/query-server/legacy/query-server-client";
 import * as cli from "../../../src/codeql-cli/cli";
 import { CellValue } from "../../../src/common/bqrs-cli-types";

extensions/ql-vscode/test/vscode-tests/cli-integration/new-query.test.ts

@@ -1,7 +1,7 @@
 import { join, basename } from "path";
 import { dirSync } from "tmp";
 import { CancellationTokenSource } from "vscode-jsonrpc";
-import * as messages from "../../../src/pure/new-messages";
+import * as messages from "../../../src/query-server/new-messages";
 import * as qsClient from "../../../src/query-server/query-server-client";
 import * as cli from "../../../src/codeql-cli/cli";
 import { CellValue } from "../../../src/common/bqrs-cli-types";
@@ -11,7 +11,7 @@ import {
   extLogger,
   ProgressReporter,
 } from "../../../src/common/logging/vscode";
-import { QueryResultType } from "../../../src/pure/new-messages";
+import { QueryResultType } from "../../../src/query-server/new-messages";
 import { ensureTestDatabase, getActivatedExtension } from "../global.helper";
 import { createMockApp } from "../../__mocks__/appMock";
 

extensions/ql-vscode/test/vscode-tests/cli-integration/queries.test.ts

@@ -29,7 +29,7 @@ import {
 } from "../../../src/query-server/query-runner";
 import { SELECT_QUERY_NAME } from "../../../src/language-support";
 import { LocalQueries, QuickEvalType } from "../../../src/local-queries";
-import { QueryResultType } from "../../../src/pure/new-messages";
+import { QueryResultType } from "../../../src/query-server/new-messages";
 import { createVSCodeCommandManager } from "../../../src/common/vscode/commands";
 import {
   AllCommands,

extensions/ql-vscode/test/vscode-tests/no-workspace/data-extensions-editor/external-api-usage-query.test.ts

@@ -6,7 +6,7 @@ import { createMockLogger } from "../../../__mocks__/loggerMock";
 import type { Uri } from "vscode";
 import { DatabaseKind } from "../../../../src/databases/local-databases";
 import { file } from "tmp-promise";
-import { QueryResultType } from "../../../../src/pure/new-messages";
+import { QueryResultType } from "../../../../src/query-server/new-messages";
 import { readdir, readFile } from "fs-extra";
 import { load } from "js-yaml";
 import { dirname, join } from "path";

extensions/ql-vscode/test/vscode-tests/no-workspace/query-evaluation-logging/eval-log-tree-builder.test.ts

@@ -1,5 +1,5 @@
 import { EvalLogTreeBuilder } from "../../../../src/query-evaluation-logging";
-import { EvalLogData } from "../../../../src/pure/log-summary-parser";
+import { EvalLogData } from "../../../../src/log-insights/log-summary-parser";
 
 describe("EvalLogTreeBuilder", () => {
   it("should build the log tree roots", async () => {

extensions/ql-vscode/test/vscode-tests/no-workspace/query-history/store/query-history-store.test.ts

@@ -12,7 +12,7 @@ import { QueryWithResults } from "../../../../../src/run-queries-shared";
 import { DatabaseInfo } from "../../../../../src/common/interface-types";
 import { CancellationTokenSource, Uri } from "vscode";
 import { tmpDir } from "../../../../../src/tmp-dir";
-import { QueryResultType } from "../../../../../src/pure/legacy-messages";
+import { QueryResultType } from "../../../../../src/query-server/legacy-messages";
 import { QueryInProgress } from "../../../../../src/query-server/legacy";
 import { VariantAnalysisHistoryItem } from "../../../../../src/query-history/variant-analysis-history-item";
 import { QueryHistoryInfo } from "../../../../../src/query-history/query-history-info";

extensions/ql-vscode/test/vscode-tests/no-workspace/query-results.test.ts

@@ -28,7 +28,7 @@ import {
 import {
   EvaluationResult,
   QueryResultType,
-} from "../../../src/pure/legacy-messages";
+} from "../../../src/query-server/legacy-messages";
 import { sleep } from "../../../src/common/time";
 import { mockedObject } from "../utils/mocking.helpers";
 

extensions/ql-vscode/test/vscode-tests/no-workspace/run-queries.test.ts

@@ -7,7 +7,7 @@ import {
   compileQuery,
   registerDatabases,
   deregisterDatabases,
-} from "../../../src/pure/legacy-messages";
+} from "../../../src/query-server/legacy-messages";
 import * as config from "../../../src/config";
 import { tmpDir } from "../../../src/tmp-dir";
 import { CodeQLCliServer } from "../../../src/codeql-cli/cli";