Merge pull request #2532 from github/robertbrignull/move-pure-2

Move files from /pure to the /common directory (part 2 of 3)

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

@@ -23,7 +23,7 @@ import {
   getErrorStack,
 } from "../common/helpers-pure";
 import { walkDirectory } from "../common/files";
-import { QueryMetadata, SortDirection } from "../pure/interface-types";
+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";

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

@@ -1,5 +1,5 @@
 import { CodeQLCliServer } from "./cli";
-import { QueryMetadata } from "../pure/interface-types";
+import { QueryMetadata } from "../common/interface-types";
 import { extLogger } from "../common/logging/vscode";
 
 /**

extensions/ql-vscode/src/common/bqrs-utils.ts

@@ -4,7 +4,7 @@ import {
   LineColumnLocation,
   WholeFileLocation,
 } from "./bqrs-cli-types";
-import { createRemoteFileRef } from "../pure/location-link-utils";
+import { createRemoteFileRef } from "../common/location-link-utils";
 
 /**
  * The CodeQL filesystem libraries use this pattern in `getURL()` predicates

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

@@ -14,7 +14,7 @@ import {
 import {
   RepositoriesFilterSortState,
   RepositoriesFilterSortStateWithIds,
-} from "./variant-analysis-filter-sort";
+} from "../pure/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/compare/compare-view.ts

@@ -4,7 +4,7 @@ import {
   FromCompareViewMessage,
   ToCompareViewMessage,
   QueryCompareResult,
-} from "../pure/interface-types";
+} from "../common/interface-types";
 import { Logger, showAndLogExceptionWithTelemetry } from "../common/logging";
 import { extLogger } from "../common/logging/vscode";
 import { CodeQLCliServer } from "../codeql-cli/cli";

extensions/ql-vscode/src/compare/resultsDiff.ts

@@ -1,5 +1,5 @@
 import { RawResultSet } from "../common/bqrs-cli-types";
-import { QueryCompareResult } from "../pure/interface-types";
+import { QueryCompareResult } from "../common/interface-types";
 
 /**
  * Compare the rows of two queries. Use deep equality to determine if

extensions/ql-vscode/src/config.ts

@@ -8,7 +8,7 @@ import {
 } from "vscode";
 import { DistributionManager } from "./codeql-cli/distribution";
 import { extLogger } from "./common/logging/vscode";
-import { ONE_DAY_IN_MS } from "./pure/time";
+import { ONE_DAY_IN_MS } from "./common/time";
 import {
   FilterKey,
   SortKey,

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

@@ -14,7 +14,7 @@ import {
 import {
   FromDataExtensionsEditorMessage,
   ToDataExtensionsEditorMessage,
-} from "../pure/interface-types";
+} from "../common/interface-types";
 import { ProgressUpdate } from "../common/vscode/progress";
 import { QueryRunner } from "../query-server";
 import {

extensions/ql-vscode/src/data-extensions-editor/extension-pack-picker.ts

@@ -10,7 +10,7 @@ import {
 } from "../common/vscode/workspace-folders";
 import { ProgressCallback } from "../common/vscode/progress";
 import { DatabaseItem } from "../databases/local-databases";
-import { getQlPackPath, QLPACK_FILENAMES } from "../pure/ql";
+import { getQlPackPath, QLPACK_FILENAMES } from "../common/ql";
 import { getErrorMessage } from "../common/helpers-pure";
 import { ExtensionPack, ExtensionPackModelFile } from "./shared/extension-pack";
 import { NotificationLogger, showAndLogErrorMessage } from "../common/logging";

extensions/ql-vscode/src/databases/config/db-config-validator.ts

@@ -2,7 +2,7 @@ import { readJsonSync } from "fs-extra";
 import { resolve } from "path";
 import Ajv, { ValidateFunction } from "ajv";
 import { clearLocalDbConfig, DbConfig } from "./db-config";
-import { findDuplicateStrings } from "../../pure/text-utils";
+import { findDuplicateStrings } from "../../common/text-utils";
 import {
   DbConfigValidationError,
   DbConfigValidationErrorKind,

extensions/ql-vscode/src/databases/qlpack.ts

@@ -3,7 +3,7 @@ import { glob } from "glob";
 import { basename } from "path";
 import { load } from "js-yaml";
 import { readFile } from "fs-extra";
-import { getQlPackPath } from "../pure/ql";
+import { getQlPackPath } from "../common/ql";
 import { CodeQLCliServer, QlpacksInfo } from "../codeql-cli/cli";
 import { extLogger } from "../common/logging/vscode";
 import { getOnDiskWorkspaceFolders } from "../common/vscode/workspace-folders";

extensions/ql-vscode/src/language-support/contextual/query-resolver.ts

@@ -26,7 +26,7 @@ import { CancellationToken } from "vscode";
 import { ProgressCallback } from "../../common/vscode/progress";
 import { CoreCompletedQuery, QueryRunner } from "../../query-server";
 import { redactableError } from "../../common/errors";
-import { QLPACK_FILENAMES } from "../../pure/ql";
+import { QLPACK_FILENAMES } from "../../common/ql";
 import { telemetryListener } from "../../common/vscode/telemetry";
 
 export async function qlpackOfDatabase(

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

@@ -13,7 +13,7 @@ import {
   UserCancellationException,
 } from "../common/vscode/progress";
 import { getErrorMessage } from "../common/helpers-pure";
-import { FALLBACK_QLPACK_FILENAME, getQlPackPath } from "../pure/ql";
+import { FALLBACK_QLPACK_FILENAME, getQlPackPath } from "../common/ql";
 import { App } from "../common/app";
 
 const QUICK_QUERIES_DIR_NAME = "quick-queries";

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

@@ -39,7 +39,7 @@ import {
   NavigationDirection,
   getDefaultResultSetName,
   ParsedResultSets,
-} from "../pure/interface-types";
+} from "../common/interface-types";
 import { extLogger } from "../common/logging/vscode";
 import { Logger, showAndLogExceptionWithTelemetry } from "../common/logging";
 import {
@@ -52,7 +52,7 @@ import { QueryEvaluationInfo } from "../run-queries-shared";
 import {
   parseSarifLocation,
   parseSarifPlainTextMessage,
-} from "../pure/sarif-utils";
+} from "../common/sarif-utils";
 import { WebviewReveal, fileUriToWebviewUri } from "./webview";
 import {
   tryResolveLocation,

extensions/ql-vscode/src/queries-panel/query-pack-discovery.ts

@@ -2,7 +2,7 @@ import { basename, dirname } from "path";
 import { CodeQLCliServer, QuerySetup } from "../codeql-cli/cli";
 import { Event } from "vscode";
 import { QueryLanguage, dbSchemeToLanguage } from "../common/query-language";
-import { FALLBACK_QLPACK_FILENAME, QLPACK_FILENAMES } from "../pure/ql";
+import { FALLBACK_QLPACK_FILENAME, QLPACK_FILENAMES } from "../common/ql";
 import { FilePathDiscovery } from "../common/vscode/file-path-discovery";
 import { getErrorMessage } from "../common/helpers-pure";
 import { extLogger } from "../common/logging/vscode";

extensions/ql-vscode/src/query-history/history-item-label-provider.ts

@@ -9,7 +9,7 @@ import {
 } from "./query-history-info";
 import { VariantAnalysisHistoryItem } from "./variant-analysis-history-item";
 import { assertNever } from "../common/helpers-pure";
-import { pluralize } from "../pure/word";
+import { pluralize } from "../common/word";
 import { humanizeQueryStatus } from "../query-status";
 
 interface InterpolateReplacements {

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

@@ -1,7 +1,7 @@
 import { VariantAnalysisHistoryItem } from "./variant-analysis-history-item";
 import { LocalQueryInfo } from "../query-results";
 import { assertNever } from "../common/helpers-pure";
-import { pluralize } from "../pure/word";
+import { pluralize } from "../common/word";
 import {
   hasRepoScanCompleted,
   getActionsWorkflowRunUrl as getVariantAnalysisActionsWorkflowRunUrl,

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

@@ -19,7 +19,7 @@ import {
 } from "../common/vscode/dialog";
 import { URLSearchParams } from "url";
 import { DisposableObject } from "../common/disposable-object";
-import { ONE_HOUR_IN_MS, TWO_HOURS_IN_MS } from "../pure/time";
+import { ONE_HOUR_IN_MS, TWO_HOURS_IN_MS } from "../common/time";
 import { assertNever, getErrorMessage } from "../common/helpers-pure";
 import { CompletedLocalQueryInfo, LocalQueryInfo } from "../query-results";
 import {

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

@@ -16,7 +16,7 @@ import {
   RawResultsSortState,
   SortDirection,
   SortedResultSetInfo,
-} from "../../pure/interface-types";
+} from "../../common/interface-types";
 
 export function mapLocalQueryInfoToDto(
   query: LocalQueryInfo,

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

@@ -19,7 +19,7 @@ import {
   RawResultsSortState,
   SortDirection,
   SortedResultSetInfo,
-} from "../../pure/interface-types";
+} from "../../common/interface-types";
 
 export function mapLocalQueryItemToDomainModel(
   localQuery: QueryHistoryLocalQueryDto,

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

@@ -14,7 +14,7 @@ import {
   SarifInterpretationData,
   GraphInterpretationData,
   DatabaseInfo,
-} from "./pure/interface-types";
+} from "./common/interface-types";
 import { QueryStatus } from "./query-status";
 import {
   EvaluatorLogPaths,

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

@@ -11,7 +11,7 @@ import {
 } from "../../databases/local-databases";
 import { tmpDir } from "../../tmp-dir";
 import { ProgressCallback } from "../../common/vscode/progress";
-import { QueryMetadata } from "../../pure/interface-types";
+import { QueryMetadata } from "../../common/interface-types";
 import { extLogger } from "../../common/logging/vscode";
 import {
   Logger,

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

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

extensions/ql-vscode/src/variant-analysis/bqrs-processing.ts

@@ -3,7 +3,7 @@ import { Logger } from "../common/logging";
 import { transformBqrsResultSet } from "../common/bqrs-cli-types";
 import { AnalysisRawResults } from "./shared/analysis-result";
 import { MAX_RAW_RESULTS } from "./shared/result-limits";
-import { SELECT_TABLE_NAME } from "../pure/interface-types";
+import { SELECT_TABLE_NAME } from "../common/interface-types";
 
 export async function extractRawResults(
   cliServer: CodeQLCliServer,

extensions/ql-vscode/src/variant-analysis/data-flow-paths-view.ts

@@ -8,7 +8,7 @@ import { telemetryListener } from "../common/vscode/telemetry";
 import {
   FromDataFlowPathsMessage,
   ToDataFlowPathsMessage,
-} from "../pure/interface-types";
+} from "../common/interface-types";
 import { DataFlowPaths } from "./shared/data-flow-paths";
 import { redactableError } from "../common/errors";
 import { extLogger } from "../common/logging/vscode";

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

@@ -15,7 +15,7 @@ import {
   MarkdownFile,
   RepositorySummary,
 } from "./markdown-generation";
-import { pluralize } from "../pure/word";
+import { pluralize } from "../common/word";
 import { VariantAnalysisManager } from "./variant-analysis-manager";
 import {
   VariantAnalysis,

extensions/ql-vscode/src/variant-analysis/markdown-generation.ts

@@ -1,8 +1,11 @@
 import { CellValue } from "../common/bqrs-cli-types";
 import { tryGetRemoteLocation } from "../common/bqrs-utils";
-import { createRemoteFileRef } from "../pure/location-link-utils";
+import { createRemoteFileRef } from "../common/location-link-utils";
-import { parseHighlightedLine, shouldHighlightLine } from "../pure/sarif-utils";
+import {
-import { convertNonPrintableChars } from "../pure/text-utils";
+  parseHighlightedLine,
+  shouldHighlightLine,
+} from "../common/sarif-utils";
+import { convertNonPrintableChars } from "../common/text-utils";
 import type {
   AnalysisAlert,
   AnalysisRawResults,

extensions/ql-vscode/src/variant-analysis/run-remote-query.ts

@@ -18,7 +18,7 @@ import {
   UserCancellationException,
 } from "../common/vscode/progress";
 import { RequestError } from "@octokit/types/dist-types";
-import { QueryMetadata } from "../pure/interface-types";
+import { QueryMetadata } from "../common/interface-types";
 import { getErrorMessage, REPO_REGEX } from "../common/helpers-pure";
 import { getRepositoryFromNwo } from "./gh-api/gh-api-client";
 import {
@@ -33,7 +33,7 @@ import {
   FALLBACK_QLPACK_FILENAME,
   QLPACK_FILENAMES,
   QLPACK_LOCK_FILENAMES,
-} from "../pure/ql";
+} from "../common/ql";
 import { QueryLanguage } from "../common/query-language";
 import { tryGetQueryMetadata } from "../codeql-cli/query-metadata";
 import { askForLanguage, findLanguage } from "../codeql-cli/query-language";

extensions/ql-vscode/src/variant-analysis/sarif-processing.ts

@@ -3,7 +3,7 @@ import {
   parseHighlightedLine,
   parseSarifPlainTextMessage,
   parseSarifRegion,
-} from "../pure/sarif-utils";
+} from "../common/sarif-utils";
 
 import {
   AnalysisAlert,

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

@@ -11,7 +11,7 @@ import {
 import { VariantAnalysis as ApiVariantAnalysis } from "./gh-api/variant-analysis";
 import { processUpdatedVariantAnalysis } from "./variant-analysis-processor";
 import { DisposableObject } from "../common/disposable-object";
-import { sleep } from "../pure/time";
+import { sleep } from "../common/time";
 import { getErrorMessage } from "../common/helpers-pure";
 import { App } from "../common/app";
 import { showAndLogWarningMessage } from "../common/logging";

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

@@ -16,7 +16,7 @@ import {
 } from "./shared/variant-analysis";
 import { DisposableObject, DisposeHandler } from "../common/disposable-object";
 import { EventEmitter } from "vscode";
-import { unzipFile } from "../pure/zip";
+import { unzipFile } from "../common/zip";
 import { readRepoTask, writeRepoTask } from "./repo-tasks-store";
 
 type CacheKey = `${number}/${string}`;

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

@@ -1,6 +1,6 @@
 import { ExtensionContext, WebviewPanel, WebviewPanelSerializer } from "vscode";
 import { VariantAnalysisView } from "./variant-analysis-view";
-import { VariantAnalysisState } from "../pure/interface-types";
+import { VariantAnalysisState } from "../common/interface-types";
 import { VariantAnalysisViewManager } from "./variant-analysis-view-manager";
 import { App } from "../common/app";
 

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

@@ -10,7 +10,7 @@ import {
 import {
   FromVariantAnalysisMessage,
   ToVariantAnalysisMessage,
-} from "../pure/interface-types";
+} from "../common/interface-types";
 import { assertNever } from "../common/helpers-pure";
 import {
   VariantAnalysis,

extensions/ql-vscode/src/view/common/FileCodeSnippet/CodeSnippetCode.tsx

@@ -5,7 +5,7 @@ import { HighlightedRegion } from "../../../variant-analysis/shared/analysis-res
 import {
   parseHighlightedLine,
   shouldHighlightLine,
-} from "../../../pure/sarif-utils";
+} from "../../../common/sarif-utils";
 
 const replaceSpaceAndTabChar = (text: string) =>
   text.replaceAll(" ", "\u00a0").replaceAll("\t", "\u00a0\u00a0\u00a0\u00a0");

extensions/ql-vscode/src/view/common/FileCodeSnippet/CodeSnippetMessage.tsx

@@ -6,7 +6,7 @@ import {
   AnalysisMessage,
   ResultSeverity,
 } from "../../../variant-analysis/shared/analysis-result";
-import { createRemoteFileRef } from "../../../pure/location-link-utils";
+import { createRemoteFileRef } from "../../../common/location-link-utils";
 import { VerticalSpace } from "../VerticalSpace";
 import { sendTelemetry } from "../telemetry";
 

extensions/ql-vscode/src/view/common/FileCodeSnippet/FileCodeSnippet.tsx

@@ -9,7 +9,7 @@ import {
   HighlightedRegion,
   ResultSeverity,
 } from "../../../variant-analysis/shared/analysis-result";
-import { createRemoteFileRef } from "../../../pure/location-link-utils";
+import { createRemoteFileRef } from "../../../common/location-link-utils";
 import { CodeSnippetMessage } from "./CodeSnippetMessage";
 import { CodeSnippetLine } from "./CodeSnippetLine";
 import { sendTelemetry } from "../telemetry";

extensions/ql-vscode/src/view/common/LastUpdated.tsx

@@ -3,7 +3,7 @@ import { useMemo } from "react";
 import styled from "styled-components";
 
 import { parseDate } from "../../common/date";
-import { humanizeRelativeTime } from "../../pure/time";
+import { humanizeRelativeTime } from "../../common/time";
 
 import { Codicon } from "./icon";
 

extensions/ql-vscode/src/view/compare/Compare.tsx

@@ -4,7 +4,7 @@ import { useState, useEffect } from "react";
 import {
   ToCompareViewMessage,
   SetComparisonsMessage,
-} from "../../pure/interface-types";
+} from "../../common/interface-types";
 import CompareSelector from "./CompareSelector";
 import { vscode } from "../vscode-api";
 import CompareTable from "./CompareTable";

extensions/ql-vscode/src/view/compare/CompareTable.tsx

@@ -1,6 +1,6 @@
 import * as React from "react";
 
-import { SetComparisonsMessage } from "../../pure/interface-types";
+import { SetComparisonsMessage } from "../../common/interface-types";
 import RawTableHeader from "../results/RawTableHeader";
 import { className } from "../results/result-table-utils";
 import { ResultRow } from "../../common/bqrs-cli-types";

extensions/ql-vscode/src/view/data-extensions-editor/DataExtensionsEditor.tsx

@@ -3,7 +3,7 @@ import { useCallback, useEffect, useMemo, useState } from "react";
 import {
   ShowProgressMessage,
   ToDataExtensionsEditorMessage,
-} from "../../pure/interface-types";
+} from "../../common/interface-types";
 import { VSCodeButton } from "@vscode/webview-ui-toolkit/react";
 import styled from "styled-components";
 import { ExternalApiUsage } from "../../data-extensions-editor/external-api-usage";

extensions/ql-vscode/src/view/data-extensions-editor/LibraryRow.tsx

@@ -3,7 +3,7 @@ import { useCallback, useMemo, useState } from "react";
 import styled from "styled-components";
 import { ExternalApiUsage } from "../../data-extensions-editor/external-api-usage";
 import { ModeledMethod } from "../../data-extensions-editor/modeled-method";
-import { pluralize } from "../../pure/word";
+import { pluralize } from "../../common/word";
 import { ModeledMethodDataGrid } from "./ModeledMethodDataGrid";
 import { calculateModeledPercentage } from "./modeled";
 import { decimalFormatter, percentFormatter } from "./formatters";

extensions/ql-vscode/src/view/data-flow-paths/DataFlowPathsView.tsx

@@ -1,6 +1,6 @@
 import * as React from "react";
 import { useEffect, useState } from "react";
-import { ToDataFlowPathsMessage } from "../../pure/interface-types";
+import { ToDataFlowPathsMessage } from "../../common/interface-types";
 import { DataFlowPaths as DataFlowPathsDomainModel } from "../../variant-analysis/shared/data-flow-paths";
 import { DataFlowPaths } from "./DataFlowPaths";
 

extensions/ql-vscode/src/view/results/RawTableHeader.tsx

@@ -1,7 +1,10 @@
 import * as React from "react";
 
 import { vscode } from "../vscode-api";
-import { RawResultsSortState, SortDirection } from "../../pure/interface-types";
+import {
+  RawResultsSortState,
+  SortDirection,
+} from "../../common/interface-types";
 import { nextSortDirection } from "./result-table-utils";
 import { Column } from "../../common/bqrs-cli-types";
 

extensions/ql-vscode/src/view/results/__tests__/results.spec.tsx

@@ -5,7 +5,7 @@ import {
   Interpretation,
   IntoResultsViewMsg,
   SortDirection,
-} from "../../../pure/interface-types";
+} from "../../../common/interface-types";
 import * as fs from "fs-extra";
 import { resolve } from "path";
 import { ColumnKindCode } from "../../../common/bqrs-cli-types";

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

@@ -21,12 +21,12 @@ import {
   InterpretedResultsSortColumn,
   SortDirection,
   InterpretedResultsSortState,
-} from "../../pure/interface-types";
+} from "../../common/interface-types";
 import {
   parseSarifPlainTextMessage,
   parseSarifLocation,
   isNoLocation,
-} from "../../pure/sarif-utils";
+} from "../../common/sarif-utils";
 import { vscode } from "../vscode-api";
 import { isWholeFileLoc, isLineColumnLoc } from "../../common/bqrs-utils";
 import { ScrollIntoViewHelper } from "./scroll-into-view-helper";

extensions/ql-vscode/src/view/results/graph.tsx

@@ -4,7 +4,7 @@ import { ResultTableProps, jumpToLocation } from "./result-table-utils";
 import {
   InterpretedResultSet,
   GraphInterpretationData,
-} from "../../pure/interface-types";
+} from "../../common/interface-types";
 import { graphviz, GraphvizOptions } from "d3-graphviz";
 import { tryGetLocationFromString } from "../../common/bqrs-utils";
 export type GraphProps = ResultTableProps & {

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

@@ -11,7 +11,7 @@ import {
   NavigateMsg,
   NavigationDirection,
   RawTableResultSet,
-} from "../../pure/interface-types";
+} from "../../common/interface-types";
 import RawTableHeader from "./RawTableHeader";
 import RawTableRow from "./RawTableRow";
 import { ResultRow } from "../../common/bqrs-cli-types";

extensions/ql-vscode/src/view/results/result-table-utils.tsx

@@ -6,10 +6,10 @@ import {
   QueryMetadata,
   SortDirection,
   ResultSet,
-} from "../../pure/interface-types";
+} from "../../common/interface-types";
 import { assertNever } from "../../common/helpers-pure";
 import { vscode } from "../vscode-api";
-import { convertNonPrintableChars } from "../../pure/text-utils";
+import { convertNonPrintableChars } from "../../common/text-utils";
 import { sendTelemetry } from "../common/telemetry";
 
 export interface ResultTableProps {

extensions/ql-vscode/src/view/results/result-tables.tsx

@@ -13,7 +13,7 @@ import {
   getDefaultResultSetName,
   ParsedResultSets,
   IntoResultsViewMsg,
-} from "../../pure/interface-types";
+} from "../../common/interface-types";
 import { PathTable } from "./alert-table";
 import { Graph } from "./graph";
 import { RawTable } from "./raw-results-table";

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

@@ -13,7 +13,7 @@ import {
   ParsedResultSets,
   NavigateMsg,
   ResultSet,
-} from "../../pure/interface-types";
+} from "../../common/interface-types";
 import { EventHandlers as EventHandlerList } from "./event-handler-list";
 import { ResultTables } from "./result-tables";
 

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

@@ -9,7 +9,7 @@ import {
 } from "../../common/bqrs-cli-types";
 import { tryGetRemoteLocation } from "../../common/bqrs-utils";
 import TextButton from "../common/TextButton";
-import { convertNonPrintableChars } from "../../pure/text-utils";
+import { convertNonPrintableChars } from "../../common/text-utils";
 import { sendTelemetry, useTelemetryOnChange } from "../common/telemetry";
 
 const numOfResultsInContractedMode = 5;

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

@@ -8,7 +8,7 @@ import {
   VariantAnalysisScannedRepositoryDownloadStatus,
   VariantAnalysisScannedRepositoryState,
 } from "../../variant-analysis/shared/variant-analysis";
-import { formatDecimal } from "../../pure/number";
+import { formatDecimal } from "../../common/number";
 import {
   Codicon,
   ErrorIcon,

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

@@ -10,7 +10,7 @@ import {
 import { VariantAnalysisHeader } from "./VariantAnalysisHeader";
 import { VariantAnalysisOutcomePanels } from "./VariantAnalysisOutcomePanels";
 import { VariantAnalysisLoading } from "./VariantAnalysisLoading";
-import { ToVariantAnalysisMessage } from "../../pure/interface-types";
+import { ToVariantAnalysisMessage } from "../../common/interface-types";
 import { vscode } from "../vscode-api";
 import { defaultFilterSortState } from "../../pure/variant-analysis-filter-sort";
 import { sendTelemetry, useTelemetryOnChange } from "../common/telemetry";

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

@@ -7,7 +7,7 @@ import {
   VSCodePanelTab,
   VSCodePanelView,
 } from "@vscode/webview-ui-toolkit/react";
-import { formatDecimal } from "../../pure/number";
+import { formatDecimal } from "../../common/number";
 import {
   VariantAnalysis,
   VariantAnalysisScannedRepositoryResult,

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

@@ -1,6 +1,6 @@
 import * as React from "react";
 import { VariantAnalysisStatus } from "../../variant-analysis/shared/variant-analysis";
-import { formatDecimal } from "../../pure/number";
+import { formatDecimal } from "../../common/number";
 import {
   ErrorIcon,
   HorizontalSpace,

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

@@ -3,8 +3,8 @@ import { useMemo } from "react";
 import styled from "styled-components";
 import { VariantAnalysisStatus } from "../../variant-analysis/shared/variant-analysis";
 import { StatItem } from "./StatItem";
-import { formatDecimal } from "../../pure/number";
+import { formatDecimal } from "../../common/number";
-import { humanizeUnit } from "../../pure/time";
+import { humanizeUnit } from "../../common/time";
 import { VariantAnalysisRepositoriesStats } from "./VariantAnalysisRepositoriesStats";
 import { VariantAnalysisStatusStats } from "./VariantAnalysisStatusStats";
 

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

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

extensions/ql-vscode/src/view/vscode-api.ts

@@ -4,7 +4,7 @@ import {
   FromResultsViewMsg,
   FromVariantAnalysisMessage,
   VariantAnalysisState,
-} from "../pure/interface-types";
+} from "../common/interface-types";
 
 export interface VsCodeApi {
   /**

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

@@ -6,7 +6,7 @@ import {
 } from "../../../src/run-queries-shared";
 import { CancellationTokenSource } from "vscode";
 import { QueryResultType } from "../../../src/pure/legacy-messages";
-import { QueryMetadata } from "../../../src/pure/interface-types";
+import { QueryMetadata } from "../../../src/common/interface-types";
 
 export function createMockLocalQueryInfo({
   startTime = new Date(),

extensions/ql-vscode/test/unit-tests/pure/number.test.ts

@@ -1,4 +1,4 @@
-import { formatDecimal } from "../../../src/pure/number";
+import { formatDecimal } from "../../../src/common/number";
 
 describe("Number", () => {
   it("should return a formatted decimal", () => {

extensions/ql-vscode/test/unit-tests/pure/ql.test.ts

@@ -2,7 +2,7 @@ import { join } from "path";
 import { dirSync } from "tmp-promise";
 import { DirResult } from "tmp";
 import { writeFile } from "fs-extra";
-import { getQlPackPath } from "../../../src/pure/ql";
+import { getQlPackPath } from "../../../src/common/ql";
 
 describe("getQlPackPath", () => {
   let tmpDir: DirResult;

extensions/ql-vscode/test/unit-tests/pure/sarif-utils.test.ts

@@ -5,7 +5,7 @@ import {
   parseSarifLocation,
   parseSarifPlainTextMessage,
   unescapeSarifText,
-} from "../../../src/pure/sarif-utils";
+} from "../../../src/common/sarif-utils";
 
 describe("parsing sarif", () => {
   it("should be able to parse a simple message from the spec", async () => {

extensions/ql-vscode/test/unit-tests/pure/time.test.ts

@@ -1,4 +1,4 @@
-import { humanizeRelativeTime, humanizeUnit } from "../../../src/pure/time";
+import { humanizeRelativeTime, humanizeUnit } from "../../../src/common/time";
 
 describe("Time", () => {
   it("should return a humanized unit", () => {

extensions/ql-vscode/test/unit-tests/pure/word.test.ts

@@ -1,4 +1,4 @@
-import { pluralize } from "../../../src/pure/word";
+import { pluralize } from "../../../src/common/word";
 
 describe("word helpers", () => {
   describe("pluralize", () => {

extensions/ql-vscode/test/unit-tests/text-utils.test.ts

@@ -1,4 +1,4 @@
-import { findDuplicateStrings } from "../../src/pure/text-utils";
+import { findDuplicateStrings } from "../../src/common/text-utils";
 
 describe("findDuplicateStrings", () => {
   it("should find duplicates strings in an array of strings", () => {

extensions/ql-vscode/test/vscode-tests/minimal-workspace/queries-panel/query-discovery.test.ts

@@ -12,7 +12,7 @@ import {
 } from "../../../../src/common/file-tree-nodes";
 import { mkdirSync, writeFileSync } from "fs";
 import { QueryLanguage } from "../../../../src/common/query-language";
-import { sleep } from "../../../../src/pure/time";
+import { sleep } from "../../../../src/common/time";
 
 describe("Query pack discovery", () => {
   let tmpDir: string;

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

@@ -2,7 +2,7 @@ import { Uri, ViewColumn, WebviewPanel, window } from "vscode";
 import { basename } from "path";
 import { FileResult, fileSync } from "tmp";
 import { fileUriToWebviewUri } from "../../../../src/local-queries/webview";
-import { getDefaultResultSetName } from "../../../../src/pure/interface-types";
+import { getDefaultResultSetName } from "../../../../src/common/interface-types";
 
 describe("interface-utils", () => {
   describe("webview uri conversion", () => {

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

@@ -11,7 +11,7 @@ import {
   ONE_HOUR_IN_MS,
   THREE_HOURS_IN_MS,
   TWO_HOURS_IN_MS,
-} from "../../../../src/pure/time";
+} from "../../../../src/common/time";
 import { mockedObject } from "../../utils/mocking.helpers";
 
 describe("query history scrubber", () => {

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

@@ -9,7 +9,7 @@ import {
   InitialQueryInfo,
 } from "../../../../../src/query-results";
 import { QueryWithResults } from "../../../../../src/run-queries-shared";
-import { DatabaseInfo } from "../../../../../src/pure/interface-types";
+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";

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

@@ -17,7 +17,7 @@ import {
   DatabaseInfo,
   SortDirection,
   SortedResultSetInfo,
-} from "../../../src/pure/interface-types";
+} from "../../../src/common/interface-types";
 import { CodeQLCliServer, SourceInfo } from "../../../src/codeql-cli/cli";
 import { CancellationTokenSource, Uri } from "vscode";
 import { tmpDir } from "../../../src/tmp-dir";
@@ -29,7 +29,7 @@ import {
   EvaluationResult,
   QueryResultType,
 } from "../../../src/pure/legacy-messages";
-import { sleep } from "../../../src/pure/time";
+import { sleep } from "../../../src/common/time";
 import { mockedObject } from "../utils/mocking.helpers";
 
 describe("query-results", () => {