Move bqrs-cli-types.ts to /common

robertbrignull · robertbrignull · commit f228ec9645bb · 2023-06-21T08:50:35.000+01:00
diff --git a/extensions/ql-vscode/src/codeql-cli/cli.ts b/extensions/ql-vscode/src/codeql-cli/cli.ts
@@ -11,7 +11,7 @@ import tk from "tree-kill";
 import { promisify } from "util";
 import { CancellationToken, Disposable, Uri } from "vscode";
 
-import { BQRSInfo, DecodedBqrsChunk } from "../pure/bqrs-cli-types";
+import { BQRSInfo, DecodedBqrsChunk } from "../common/bqrs-cli-types";
 import { allowCanaryQueryServer, CliConfig } from "../config";
 import {
   DistributionProvider,
diff --git a/extensions/ql-vscode/src/common/bqrs-cli-types.ts b/extensions/ql-vscode/src/common/bqrs-cli-types.ts
diff --git a/extensions/ql-vscode/src/compare/compare-view.ts b/extensions/ql-vscode/src/compare/compare-view.ts
@@ -14,7 +14,7 @@ import {
   transformBqrsResultSet,
   RawResultSet,
   BQRSInfo,
-} from "../pure/bqrs-cli-types";
+} from "../common/bqrs-cli-types";
 import resultsDiff from "./resultsDiff";
 import { CompletedLocalQueryInfo } from "../query-results";
 import { assertNever, getErrorMessage } from "../pure/helpers-pure";
diff --git a/extensions/ql-vscode/src/compare/resultsDiff.ts b/extensions/ql-vscode/src/compare/resultsDiff.ts
@@ -1,4 +1,4 @@
-import { RawResultSet } from "../pure/bqrs-cli-types";
+import { RawResultSet } from "../common/bqrs-cli-types";
 import { QueryCompareResult } from "../pure/interface-types";
 
 /**
diff --git a/extensions/ql-vscode/src/data-extensions-editor/bqrs.ts b/extensions/ql-vscode/src/data-extensions-editor/bqrs.ts
@@ -1,4 +1,4 @@
-import { DecodedBqrsChunk } from "../pure/bqrs-cli-types";
+import { DecodedBqrsChunk } from "../common/bqrs-cli-types";
 import { Call, ExternalApiUsage } from "./external-api-usage";
 
 export function decodeBqrsToExternalApiUsages(
diff --git a/extensions/ql-vscode/src/data-extensions-editor/data-extensions-editor-view.ts b/extensions/ql-vscode/src/data-extensions-editor/data-extensions-editor-view.ts
@@ -29,7 +29,7 @@ import { asError, assertNever, getErrorMessage } from "../pure/helpers-pure";
 import { generateFlowModel } from "./generate-flow-model";
 import { promptImportGithubDatabase } from "../databases/database-fetcher";
 import { App } from "../common/app";
-import { ResolvableLocationValue } from "../pure/bqrs-cli-types";
+import { ResolvableLocationValue } from "../common/bqrs-cli-types";
 import { showResolvableLocation } from "../databases/local-databases/locations";
 import { decodeBqrsToExternalApiUsages } from "./bqrs";
 import { redactableError } from "../pure/errors";
diff --git a/extensions/ql-vscode/src/data-extensions-editor/external-api-usage.ts b/extensions/ql-vscode/src/data-extensions-editor/external-api-usage.ts
@@ -1,4 +1,4 @@
-import { ResolvableLocationValue } from "../pure/bqrs-cli-types";
+import { ResolvableLocationValue } from "../common/bqrs-cli-types";
 
 export type Call = {
   label: string;
diff --git a/extensions/ql-vscode/src/databases/local-databases/locations.ts b/extensions/ql-vscode/src/databases/local-databases/locations.ts
@@ -14,7 +14,7 @@ import {
   ResolvableLocationValue,
   UrlValue,
   WholeFileLocation,
-} from "../../pure/bqrs-cli-types";
+} from "../../common/bqrs-cli-types";
 import {
   isLineColumnLoc,
   tryGetResolvableLocation,
diff --git a/extensions/ql-vscode/src/language-support/ast-viewer/ast-builder.ts b/extensions/ql-vscode/src/language-support/ast-viewer/ast-builder.ts
@@ -3,7 +3,7 @@ import {
   DecodedBqrsChunk,
   BqrsId,
   EntityValue,
-} from "../../pure/bqrs-cli-types";
+} from "../../common/bqrs-cli-types";
 import { DatabaseItem } from "../../databases/local-databases";
 import { ChildAstItem, AstItem } from "./ast-viewer";
 import { Uri } from "vscode";
diff --git a/extensions/ql-vscode/src/language-support/ast-viewer/ast-viewer.ts b/extensions/ql-vscode/src/language-support/ast-viewer/ast-viewer.ts
@@ -16,7 +16,7 @@ import {
 import { basename } from "path";
 
 import { DatabaseItem } from "../../databases/local-databases";
-import { UrlValue, BqrsId } from "../../pure/bqrs-cli-types";
+import { UrlValue, BqrsId } from "../../common/bqrs-cli-types";
 import { showLocation } from "../../databases/local-databases/locations";
 import {
   isStringLoc,
diff --git a/extensions/ql-vscode/src/language-support/contextual/file-range-from-uri.ts b/extensions/ql-vscode/src/language-support/contextual/file-range-from-uri.ts
@@ -1,6 +1,6 @@
 import * as vscode from "vscode";
 
-import { UrlValue, LineColumnLocation } from "../../pure/bqrs-cli-types";
+import { UrlValue, LineColumnLocation } from "../../common/bqrs-cli-types";
 import { isEmptyPath } from "../../pure/bqrs-utils";
 import { DatabaseItem } from "../../databases/local-databases";
 
diff --git a/extensions/ql-vscode/src/language-support/contextual/location-finder.ts b/extensions/ql-vscode/src/language-support/contextual/location-finder.ts
@@ -7,7 +7,7 @@ import {
   EntityValue,
   getResultSetSchema,
   ResultSetSchema,
-} from "../../pure/bqrs-cli-types";
+} from "../../common/bqrs-cli-types";
 import { CodeQLCliServer } from "../../codeql-cli/cli";
 import { DatabaseManager, DatabaseItem } from "../../databases/local-databases";
 import { ProgressCallback } from "../../common/vscode/progress";
diff --git a/extensions/ql-vscode/src/local-queries/results-view.ts b/extensions/ql-vscode/src/local-queries/results-view.ts
@@ -64,7 +64,7 @@ import {
   RawResultSet,
   transformBqrsResultSet,
   ResultSetSchema,
-} from "../pure/bqrs-cli-types";
+} from "../common/bqrs-cli-types";
 import {
   AbstractWebview,
   WebviewPanelConfig,
diff --git a/extensions/ql-vscode/src/pure/bqrs-utils.ts b/extensions/ql-vscode/src/pure/bqrs-utils.ts
@@ -3,7 +3,7 @@ import {
   ResolvableLocationValue,
   LineColumnLocation,
   WholeFileLocation,
-} from "./bqrs-cli-types";
+} from "../common/bqrs-cli-types";
 import { createRemoteFileRef } from "./location-link-utils";
 
 /**
diff --git a/extensions/ql-vscode/src/pure/interface-types.ts b/extensions/ql-vscode/src/pure/interface-types.ts
@@ -5,7 +5,7 @@ import {
   ResultSetSchema,
   Column,
   ResolvableLocationValue,
-} from "./bqrs-cli-types";
+} from "../common/bqrs-cli-types";
 import {
   VariantAnalysis,
   VariantAnalysisScannedRepositoryResult,
diff --git a/extensions/ql-vscode/src/pure/sarif-utils.ts b/extensions/ql-vscode/src/pure/sarif-utils.ts
@@ -1,6 +1,6 @@
 import * as Sarif from "sarif";
 import type { HighlightedRegion } from "../variant-analysis/shared/analysis-result";
-import { ResolvableLocationValue } from "./bqrs-cli-types";
+import { ResolvableLocationValue } from "../common/bqrs-cli-types";
 
 export interface SarifLink {
   dest: number;
diff --git a/extensions/ql-vscode/src/run-queries-shared.ts b/extensions/ql-vscode/src/run-queries-shared.ts
@@ -27,7 +27,7 @@ import { nanoid } from "nanoid";
 import { CodeQLCliServer } from "./codeql-cli/cli";
 import { SELECT_QUERY_NAME } from "./language-support";
 import { DatabaseManager } from "./databases/local-databases";
-import { DecodedBqrsChunk, EntityValue } from "./pure/bqrs-cli-types";
+import { DecodedBqrsChunk, EntityValue } from "./common/bqrs-cli-types";
 import { BaseLogger, extLogger } from "./common";
 import { generateSummarySymbolsFile } from "./log-insights/summary-parser";
 import { getErrorMessage } from "./pure/helpers-pure";
diff --git a/extensions/ql-vscode/src/variant-analysis/bqrs-processing.ts b/extensions/ql-vscode/src/variant-analysis/bqrs-processing.ts
@@ -1,6 +1,6 @@
 import { CodeQLCliServer } from "../codeql-cli/cli";
 import { Logger } from "../common";
-import { transformBqrsResultSet } from "../pure/bqrs-cli-types";
+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";
diff --git a/extensions/ql-vscode/src/variant-analysis/markdown-generation.ts b/extensions/ql-vscode/src/variant-analysis/markdown-generation.ts
@@ -1,4 +1,4 @@
-import { CellValue } from "../pure/bqrs-cli-types";
+import { CellValue } from "../common/bqrs-cli-types";
 import { tryGetRemoteLocation } from "../pure/bqrs-utils";
 import { createRemoteFileRef } from "../pure/location-link-utils";
 import { parseHighlightedLine, shouldHighlightLine } from "../pure/sarif-utils";
diff --git a/extensions/ql-vscode/src/variant-analysis/shared/analysis-result.ts b/extensions/ql-vscode/src/variant-analysis/shared/analysis-result.ts
@@ -1,4 +1,4 @@
-import { RawResultSet, ResultSetSchema } from "../../pure/bqrs-cli-types";
+import { RawResultSet, ResultSetSchema } from "../../common/bqrs-cli-types";
 
 export interface AnalysisRawResults {
   schema: ResultSetSchema;
diff --git a/extensions/ql-vscode/src/view/compare/CompareTable.tsx b/extensions/ql-vscode/src/view/compare/CompareTable.tsx
@@ -3,7 +3,7 @@ import * as React from "react";
 import { SetComparisonsMessage } from "../../pure/interface-types";
 import RawTableHeader from "../results/RawTableHeader";
 import { className } from "../results/result-table-utils";
-import { ResultRow } from "../../pure/bqrs-cli-types";
+import { ResultRow } from "../../common/bqrs-cli-types";
 import RawTableRow from "../results/RawTableRow";
 import { vscode } from "../vscode-api";
 import { sendTelemetry } from "../common/telemetry";
diff --git a/extensions/ql-vscode/src/view/results/RawTableHeader.tsx b/extensions/ql-vscode/src/view/results/RawTableHeader.tsx
@@ -3,7 +3,7 @@ import * as React from "react";
 import { vscode } from "../vscode-api";
 import { RawResultsSortState, SortDirection } from "../../pure/interface-types";
 import { nextSortDirection } from "./result-table-utils";
-import { Column } from "../../pure/bqrs-cli-types";
+import { Column } from "../../common/bqrs-cli-types";
 
 interface Props {
   readonly columns: readonly Column[];
diff --git a/extensions/ql-vscode/src/view/results/RawTableRow.tsx b/extensions/ql-vscode/src/view/results/RawTableRow.tsx
@@ -1,5 +1,5 @@
 import * as React from "react";
-import { ResultRow } from "../../pure/bqrs-cli-types";
+import { ResultRow } from "../../common/bqrs-cli-types";
 import { selectedRowClassName, zebraStripe } from "./result-table-utils";
 import RawTableValue from "./RawTableValue";
 import { ScrollIntoViewHelper } from "./scroll-into-view-helper";
diff --git a/extensions/ql-vscode/src/view/results/RawTableValue.tsx b/extensions/ql-vscode/src/view/results/RawTableValue.tsx
@@ -1,7 +1,7 @@
 import * as React from "react";
 
 import { renderLocation } from "./result-table-utils";
-import { CellValue } from "../../pure/bqrs-cli-types";
+import { CellValue } from "../../common/bqrs-cli-types";
 
 interface Props {
   value: CellValue;
diff --git a/extensions/ql-vscode/src/view/results/__tests__/results.spec.tsx b/extensions/ql-vscode/src/view/results/__tests__/results.spec.tsx
@@ -8,7 +8,7 @@ import {
 } from "../../../pure/interface-types";
 import * as fs from "fs-extra";
 import { resolve } from "path";
-import { ColumnKindCode } from "../../../pure/bqrs-cli-types";
+import { ColumnKindCode } from "../../../common/bqrs-cli-types";
 import { postMessage } from "../../common/post-message";
 
 const exampleSarif = fs.readJSONSync(
diff --git a/extensions/ql-vscode/src/view/results/raw-results-table.tsx b/extensions/ql-vscode/src/view/results/raw-results-table.tsx
@@ -14,7 +14,7 @@ import {
 } from "../../pure/interface-types";
 import RawTableHeader from "./RawTableHeader";
 import RawTableRow from "./RawTableRow";
-import { ResultRow } from "../../pure/bqrs-cli-types";
+import { ResultRow } from "../../common/bqrs-cli-types";
 import { onNavigation } from "./results";
 import { tryGetResolvableLocation } from "../../pure/bqrs-utils";
 import { ScrollIntoViewHelper } from "./scroll-into-view-helper";
diff --git a/extensions/ql-vscode/src/view/results/result-table-utils.tsx b/extensions/ql-vscode/src/view/results/result-table-utils.tsx
@@ -1,5 +1,5 @@
 import * as React from "react";
-import { UrlValue, ResolvableLocationValue } from "../../pure/bqrs-cli-types";
+import { UrlValue, ResolvableLocationValue } from "../../common/bqrs-cli-types";
 import { isStringLoc, tryGetResolvableLocation } from "../../pure/bqrs-utils";
 import {
   RawResultsSortState,
diff --git a/extensions/ql-vscode/src/view/variant-analysis/RawResultsTable.tsx b/extensions/ql-vscode/src/view/variant-analysis/RawResultsTable.tsx
@@ -6,7 +6,7 @@ import {
   CellValue,
   RawResultSet,
   ResultSetSchema,
-} from "../../pure/bqrs-cli-types";
+} from "../../common/bqrs-cli-types";
 import { tryGetRemoteLocation } from "../../pure/bqrs-utils";
 import TextButton from "../common/TextButton";
 import { convertNonPrintableChars } from "../../pure/text-utils";
diff --git a/extensions/ql-vscode/test/unit-tests/data-extensions-editor/bqrs.test.ts b/extensions/ql-vscode/test/unit-tests/data-extensions-editor/bqrs.test.ts
@@ -1,5 +1,5 @@
 import { decodeBqrsToExternalApiUsages } from "../../../src/data-extensions-editor/bqrs";
-import { DecodedBqrsChunk } from "../../../src/pure/bqrs-cli-types";
+import { DecodedBqrsChunk } from "../../../src/common/bqrs-cli-types";
 
 describe("decodeBqrsToExternalApiUsages", () => {
   const chunk: DecodedBqrsChunk = {
diff --git a/extensions/ql-vscode/test/vscode-tests/cli-integration/legacy-query.test.ts b/extensions/ql-vscode/test/vscode-tests/cli-integration/legacy-query.test.ts
@@ -6,7 +6,7 @@ import { CancellationTokenSource } from "vscode-jsonrpc";
 import * as messages from "../../../src/pure/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/pure/bqrs-cli-types";
+import { CellValue } from "../../../src/common/bqrs-cli-types";
 import { describeWithCodeQL } from "../cli";
 import { QueryServerClient } from "../../../src/query-server/legacy/query-server-client";
 import { extLogger, ProgressReporter } from "../../../src/common";
diff --git a/extensions/ql-vscode/test/vscode-tests/cli-integration/new-query.test.ts b/extensions/ql-vscode/test/vscode-tests/cli-integration/new-query.test.ts
@@ -4,7 +4,7 @@ import { CancellationTokenSource } from "vscode-jsonrpc";
 import * as messages from "../../../src/pure/new-messages";
 import * as qsClient from "../../../src/query-server/query-server-client";
 import * as cli from "../../../src/codeql-cli/cli";
-import { CellValue } from "../../../src/pure/bqrs-cli-types";
+import { CellValue } from "../../../src/common/bqrs-cli-types";
 import { describeWithCodeQL } from "../cli";
 import { QueryServerClient } from "../../../src/query-server/query-server-client";
 import { extLogger, ProgressReporter } from "../../../src/common";
diff --git a/extensions/ql-vscode/test/vscode-tests/no-workspace/language-support/contextual/file-range-from-uri.test.ts b/extensions/ql-vscode/test/vscode-tests/no-workspace/language-support/contextual/file-range-from-uri.test.ts
@@ -4,7 +4,7 @@ import { DatabaseItem } from "../../../../../src/databases/local-databases";
 import {
   WholeFileLocation,
   LineColumnLocation,
-} from "../../../../../src/pure/bqrs-cli-types";
+} from "../../../../../src/common/bqrs-cli-types";
 import { mockDatabaseItem } from "../../../utils/mocking.helpers";
 import { fileRangeFromURI } from "../../../../../src/language-support";
 
diff --git a/extensions/ql-vscode/test/vscode-tests/no-workspace/run-queries.test.ts b/extensions/ql-vscode/test/vscode-tests/no-workspace/run-queries.test.ts
@@ -22,7 +22,7 @@ import {
 } from "../../../src/query-server/legacy";
 import { DatabaseItem } from "../../../src/databases/local-databases";
 import { DeepPartial, mockedObject } from "../utils/mocking.helpers";
-import { BqrsKind } from "../../../src/pure/bqrs-cli-types";
+import { BqrsKind } from "../../../src/common/bqrs-cli-types";
 
 describe("run-queries", () => {
   let isCanarySpy: jest.SpiedFunction<typeof config.isCanary>;

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { RawResultSet } from "../pure/bqrs-cli-types";`
	`1`	`+import { RawResultSet } from "../common/bqrs-cli-types";`
`2`	`2`	`import { QueryCompareResult } from "../pure/interface-types";`
`3`	`3`
`4`	`4`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { DecodedBqrsChunk } from "../pure/bqrs-cli-types";`
	`1`	`+import { DecodedBqrsChunk } from "../common/bqrs-cli-types";`
`2`	`2`	`import { Call, ExternalApiUsage } from "./external-api-usage";`
`3`	`3`
`4`	`4`	`export function decodeBqrsToExternalApiUsages(`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { ResolvableLocationValue } from "../pure/bqrs-cli-types";`
	`1`	`+import { ResolvableLocationValue } from "../common/bqrs-cli-types";`
`2`	`2`
`3`	`3`	`export type Call = {`
`4`	`4`	`label: string;`