Move types/query-language to common/query-language

And fix imports
This commit is contained in:
Elena Tanasoiu
2023-02-16 10:49:52 +00:00
parent 8b8912bc40
commit b635d914d0
19 changed files with 18 additions and 18 deletions

View File

@@ -28,7 +28,7 @@ import { CompilationMessage } from "./pure/legacy-messages";
import { sarifParser } from "./sarif-parser";
import { walkDirectory } from "./helpers";
import { App } from "./common/app";
import { QueryLanguage } from "./types/query-language";
import { QueryLanguage } from "./common/query-language";
/**
* The version of the SARIF format that we are using.

View File

@@ -24,7 +24,7 @@ import { QueryMetadata } from "./pure/interface-types";
import { telemetryListener } from "./telemetry";
import { RedactableError } from "./pure/errors";
import { getQlPackPath } from "./pure/ql";
import { dbSchemeToLanguage } from "./types/query-language";
import { dbSchemeToLanguage } from "./common/query-language";
// Shared temporary folder for the extension.
export const tmpDir = dirSync({

View File

@@ -27,7 +27,7 @@ import { pathsEqual } from "./pure/files";
import { redactableError } from "./pure/errors";
import { isCodespacesTemplate } from "./config";
import { QlPackGenerator } from "./qlpack-generator";
import { QueryLanguage } from "./types/query-language";
import { QueryLanguage } from "./common/query-language";
/**
* databases.ts

View File

@@ -9,7 +9,7 @@ import { ProgressCallback, UserCancellationException } from "./commandRunner";
import { extLogger } from "./common";
import { asError, getErrorStack } from "./pure/helpers-pure";
import { redactableError } from "./pure/errors";
import { PACKS_BY_QUERY_LANGUAGE } from "./types/query-language";
import { PACKS_BY_QUERY_LANGUAGE } from "./common/query-language";
/**
* Prompts user to choose packs to download, and downloads them.

View File

@@ -3,7 +3,7 @@ import { dump } from "js-yaml";
import { join } from "path";
import { Uri, workspace } from "vscode";
import { CodeQLCliServer } from "./cli";
import { QueryLanguage } from "./types/query-language";
import { QueryLanguage } from "./common/query-language";
export class QlPackGenerator {
private readonly qlpackName: string;

View File

@@ -1,4 +1,4 @@
import { QueryLanguage } from "../../types/query-language";
import { QueryLanguage } from "../../common/query-language";
import { Repository, RepositoryWithMetadata } from "./repository";
export interface VariantAnalysisSubmissionRequest {

View File

@@ -1,6 +1,6 @@
import { Repository, RepositoryWithMetadata } from "./repository";
import { AnalysisAlert, AnalysisRawResults } from "./analysis-result";
import { QueryLanguage } from "../../types/query-language";
import { QueryLanguage } from "../../common/query-language";
export interface VariantAnalysis {
id: number;

View File

@@ -5,7 +5,7 @@ import {
VariantAnalysisSkippedRepositories,
VariantAnalysisStatus,
} from "../../../../src/variant-analysis/gh-api/variant-analysis";
import { QueryLanguage } from "../../../../src/types/query-language";
import { QueryLanguage } from "../../../../src/common/query-language";
import { createMockScannedRepos } from "./scanned-repositories";
import { createMockSkippedRepos } from "./skipped-repositories";
import { createMockRepository } from "./repository";

View File

@@ -1,6 +1,6 @@
import { faker } from "@faker-js/faker";
import { VariantAnalysisSubmission } from "../../../../src/variant-analysis/shared/variant-analysis";
import { QueryLanguage } from "../../../../src/types/query-language";
import { QueryLanguage } from "../../../../src/common/query-language";
export function createMockSubmission(): VariantAnalysisSubmission {
return {

View File

@@ -8,7 +8,7 @@ import {
import { createMockScannedRepos } from "./scanned-repositories";
import { createMockSkippedRepos } from "./skipped-repositories";
import { createMockRepository } from "./repository";
import { QueryLanguage } from "../../../../src/types/query-language";
import { QueryLanguage } from "../../../../src/common/query-languagee";
export function createMockVariantAnalysis({
status = VariantAnalysisStatus.InProgress,

View File

@@ -16,7 +16,7 @@ import {
createLocalTree,
createRemoteTree,
} from "../../../src/databases/db-tree-creator";
import { QueryLanguage } from "../../../src/types/query-language";
import { QueryLanguage } from "../../../src/common/query-languagee";
import { createDbConfig } from "../../factories/db-config-factories";
describe("db tree creator", () => {

View File

@@ -8,7 +8,7 @@ import {
} from "../../src/variant-analysis/shared/variant-analysis";
import { createMockScannedRepo } from "../factories/variant-analysis/shared/scanned-repositories";
import { createMockVariantAnalysis } from "../factories/variant-analysis/shared/variant-analysis";
import { QueryLanguage } from "../../src/types/query-language";
import { QueryLanguage } from "../../src/common/query-language";
describe("parseVariantAnalysisQueryLanguage", () => {
it("parses a valid language", () => {

View File

@@ -10,7 +10,7 @@ import {
VariantAnalysisScannedRepository,
VariantAnalysisScannedRepositoryResult,
} from "../../../src/variant-analysis/shared/variant-analysis";
import { QueryLanguage } from "../../../src/types/query-language";
import { QueryLanguage } from "../../../src/common/query-language";
import {
AnalysisAlert,
AnalysisRawResults,

View File

@@ -17,7 +17,7 @@ import { createMockSkippedRepos } from "../../factories/variant-analysis/gh-api/
import { createMockApiResponse } from "../../factories/variant-analysis/gh-api/variant-analysis-api-response";
import { createMockSubmission } from "../../factories/variant-analysis/shared/variant-analysis-submission";
import { createMockVariantAnalysisRepoTask } from "../../factories/variant-analysis/gh-api/variant-analysis-repo-task";
import { QueryLanguage } from "../../../src/types/query-language";
import { QueryLanguage } from "../../../src/common/query-language";
describe(processVariantAnalysis.name, () => {
const scannedRepos = createMockScannedRepos();

View File

@@ -14,7 +14,7 @@ import { ExtensionApp } from "../../../../src/common/vscode/vscode-app";
import { createMockExtensionContext } from "../../../factories/extension-context";
import { createDbConfig } from "../../../factories/db-config-factories";
import { setRemoteControllerRepo } from "../../../../src/config";
import { QueryLanguage } from "../../../../src/types/query-language";
import { QueryLanguage } from "../../../../src/common/query-languagee";
describe("db panel rendering nodes", () => {
const workspaceStoragePath = join(__dirname, "test-workspace-storage");

View File

@@ -1,7 +1,7 @@
import { join } from "path";
import { existsSync } from "fs";
import { QlPackGenerator } from "../../../src/qlpack-generator";
import { QueryLanguage } from "../../../src/types/query-language";
import { QueryLanguage } from "../../../src/common/query-languagee";
import { CodeQLCliServer } from "../../../src/cli";
import { Uri, workspace } from "vscode";
import { getErrorMessage } from "../../../src/pure/helpers-pure";

View File

@@ -30,7 +30,7 @@ import {
walkDirectory,
} from "../../../src/helpers";
import { reportStreamProgress } from "../../../src/commandRunner";
import { QueryLanguage } from "../../../src/types/query-language";
import { QueryLanguage } from "../../../src/common/query-languagee";
describe("helpers", () => {
describe("Invocation rate limiter", () => {

View File

@@ -12,7 +12,7 @@ import { Uri } from "vscode";
import { DatabaseUI } from "../../../src/local-databases-ui";
import { testDisposeHandler } from "../test-dispose-handler";
import { createMockApp } from "../../__mocks__/appMock";
import { QueryLanguage } from "../../../src/types/query-language";
import { QueryLanguage } from "../../../src/common/query-languagee";
describe("local-databases-ui", () => {
describe("fixDbUri", () => {