mrva/vscode-codeql
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #2193 from github/nora/query-history-data-model

Browse Source 
Move query-serialization
This commit is contained in:
Nora
2023-03-21 12:23:18 +01:00
committed by GitHub
parent f7b6d4c4a4 fa29bcc5fd
commit 82d03091d0
3 changed files with 21 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
extensions/ql-vscode/src/query-history/query-history-manager.ts
View File

@@ -48,7 +48,7 @@ import {
import { import {
deserializeQueryHistory, deserializeQueryHistory,
serializeQueryHistory, serializeQueryHistory,
} from "../query-serialization"; } from "./store/query-history-store";
import { pathExists } from "fs-extra"; import { pathExists } from "fs-extra";
import { CliVersionConstraint } from "../cli"; import { CliVersionConstraint } from "../cli";
import { HistoryItemLabelProvider } from "./history-item-label-provider"; import { HistoryItemLabelProvider } from "./history-item-label-provider";

14
extensions/ql-vscode/src/query-serialization.ts → extensions/ql-vscode/src/query-history/store/query-history-store.ts
View File

@@ -1,18 +1,18 @@
import { pathExists, readFile, remove, mkdir, writeFile } from "fs-extra"; import { pathExists, readFile, remove, mkdir, writeFile } from "fs-extra";
import { dirname } from "path"; import { dirname } from "path";
import { showAndLogExceptionWithTelemetry } from "./helpers"; import { showAndLogExceptionWithTelemetry } from "../../helpers";
import { import {
asError, asError,
asyncFilter, asyncFilter,
getErrorMessage, getErrorMessage,
getErrorStack, getErrorStack,
} from "./pure/helpers-pure"; } from "../../pure/helpers-pure";
import { CompletedQueryInfo, LocalQueryInfo } from "./query-results"; import { CompletedQueryInfo, LocalQueryInfo } from "../../query-results";
import { QueryHistoryInfo } from "./query-history/query-history-info"; import { QueryHistoryInfo } from "../query-history-info";
import { QueryEvaluationInfo } from "./run-queries-shared"; import { QueryEvaluationInfo } from "../../run-queries-shared";
import { QueryResultType } from "./pure/legacy-messages"; import { QueryResultType } from "../../pure/legacy-messages";
import { redactableError } from "./pure/errors"; import { redactableError } from "../../pure/errors";
export async function deserializeQueryHistory( export async function deserializeQueryHistory(
fsPath: string, fsPath: string,

23
extensions/ql-vscode/test/vscode-tests/no-workspace/query-serialization.test.ts → extensions/ql-vscode/test/vscode-tests/no-workspace/query-history/store/query-history-store.test.ts
View File

@@ -1,19 +1,22 @@
import { import {
deserializeQueryHistory, deserializeQueryHistory,
serializeQueryHistory, serializeQueryHistory,
} from "../../../src/query-serialization"; } from "../../../../../src/query-history/store/query-history-store";
import { join } from "path"; import { join } from "path";
import { writeFileSync, mkdirpSync, writeFile } from "fs-extra"; import { writeFileSync, mkdirpSync, writeFile } from "fs-extra";
import { LocalQueryInfo, InitialQueryInfo } from "../../../src/query-results"; import {
import { QueryWithResults } from "../../../src/run-queries-shared"; LocalQueryInfo,
import { DatabaseInfo } from "../../../src/pure/interface-types"; InitialQueryInfo,
} from "../../../../../src/query-results";
import { QueryWithResults } from "../../../../../src/run-queries-shared";
import { DatabaseInfo } from "../../../../../src/pure/interface-types";
import { CancellationTokenSource, Uri } from "vscode"; import { CancellationTokenSource, Uri } from "vscode";
import { tmpDir } from "../../../src/helpers"; import { tmpDir } from "../../../../../src/helpers";
import { QueryResultType } from "../../../src/pure/legacy-messages"; import { QueryResultType } from "../../../../../src/pure/legacy-messages";
import { QueryInProgress } from "../../../src/legacy-query-server/run-queries"; import { QueryInProgress } from "../../../../../src/legacy-query-server/run-queries";
import { VariantAnalysisHistoryItem } from "../../../src/query-history/variant-analysis-history-item"; import { VariantAnalysisHistoryItem } from "../../../../../src/query-history/variant-analysis-history-item";
import { QueryHistoryInfo } from "../../../src/query-history/query-history-info"; import { QueryHistoryInfo } from "../../../../../src/query-history/query-history-info";
import { createMockVariantAnalysisHistoryItem } from "../../factories/query-history/variant-analysis-history-item"; import { createMockVariantAnalysisHistoryItem } from "../../../../factories/query-history/variant-analysis-history-item";
import { nanoid } from "nanoid"; import { nanoid } from "nanoid";
describe("serialize and deserialize", () => { describe("serialize and deserialize", () => {