Move cli.ts to /codeql-cli/cli.ts

Author: charisk

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

@@ -1,5 +1,5 @@
 import * as semver from "semver";
-import { runCodeQlCliCommand } from "./cli";
+import { runCodeQlCliCommand } from "./codeql-cli/cli";
 import { Logger } from "./common";
 import { getErrorMessage } from "./pure/helpers-pure";
 

extensions/ql-vscode/src/cli.ts …tensions/ql-vscode/src/codeql-cli/cli.tsextensions/ql-vscode/src/cli.ts renamed to extensions/ql-vscode/src/codeql-cli/cli.ts extensions/ql-vscode/src/cli.ts renamed to extensions/ql-vscode/src/codeql-cli/cli.ts

@@ -11,24 +11,24 @@ import tk from "tree-kill";
 import { promisify } from "util";
 import { CancellationToken, Disposable, Uri } from "vscode";
 
-import { BQRSInfo, DecodedBqrsChunk } from "./pure/bqrs-cli-types";
-import { allowCanaryQueryServer, CliConfig } from "./config";
+import { BQRSInfo, DecodedBqrsChunk } from "../pure/bqrs-cli-types";
+import { allowCanaryQueryServer, CliConfig } from "../config";
 import {
   DistributionProvider,
   FindDistributionResultKind,
-} from "./distribution";
+} from "../distribution";
 import {
   assertNever,
   getErrorMessage,
   getErrorStack,
-} from "./pure/helpers-pure";
-import { QueryMetadata, SortDirection } from "./pure/interface-types";
-import { BaseLogger, Logger, ProgressReporter } from "./common";
-import { CompilationMessage } from "./pure/legacy-messages";
-import { sarifParser } from "./sarif-parser";
-import { walkDirectory } from "./helpers";
-import { App } from "./common/app";
-import { QueryLanguage } from "./common/query-language";
+} from "../pure/helpers-pure";
+import { QueryMetadata, SortDirection } from "../pure/interface-types";
+import { BaseLogger, Logger, ProgressReporter } from "../common";
+import { CompilationMessage } from "../pure/legacy-messages";
+import { sarifParser } from "../sarif-parser";
+import { walkDirectory } from "../helpers";
+import { App } from "../common/app";
+import { QueryLanguage } from "../common/query-language";
 
 /**
  * The version of the SARIF format that we are using.

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

@@ -6,7 +6,7 @@ import {
   QueryCompareResult,
 } from "../pure/interface-types";
 import { Logger } from "../common";
-import { CodeQLCliServer } from "../cli";
+import { CodeQLCliServer } from "../codeql-cli/cli";
 import { DatabaseManager } from "../databases/local-databases";
 import { jumpToLocation } from "../interface-utils";
 import {

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

@@ -1,7 +1,7 @@
 import { ExtensionContext } from "vscode";
 import { DataExtensionsEditorView } from "./data-extensions-editor-view";
 import { DataExtensionsEditorCommands } from "../common/commands";
-import { CliVersionConstraint, CodeQLCliServer } from "../cli";
+import { CliVersionConstraint, CodeQLCliServer } from "../codeql-cli/cli";
 import { QueryRunner } from "../query-server";
 import { DatabaseManager } from "../databases/local-databases";
 import { ensureDir } from "fs-extra";

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

@@ -22,7 +22,7 @@ import { extLogger } from "../common";
 import { outputFile, pathExists, readFile } from "fs-extra";
 import { load as loadYaml } from "js-yaml";
 import { DatabaseItem, DatabaseManager } from "../databases/local-databases";
-import { CodeQLCliServer } from "../cli";
+import { CodeQLCliServer } from "../codeql-cli/cli";
 import { asError, assertNever, getErrorMessage } from "../pure/helpers-pure";
 import { generateFlowModel } from "./generate-flow-model";
 import { promptImportGithubDatabase } from "../databases/database-fetcher";

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

@@ -3,7 +3,7 @@ import { outputFile, pathExists, readFile } from "fs-extra";
 import { dump as dumpYaml, load as loadYaml } from "js-yaml";
 import { minimatch } from "minimatch";
 import { CancellationToken, window } from "vscode";
-import { CodeQLCliServer } from "../cli";
+import { CodeQLCliServer } from "../codeql-cli/cli";
 import {
   getOnDiskWorkspaceFolders,
   getOnDiskWorkspaceFoldersObjects,

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

@@ -8,7 +8,7 @@ import {
 } from "../helpers";
 import { TeeLogger } from "../common";
 import { CancellationToken } from "vscode";
-import { CodeQLCliServer } from "../cli";
+import { CodeQLCliServer } from "../codeql-cli/cli";
 import { DatabaseItem } from "../databases/local-databases";
 import { ProgressCallback } from "../progress";
 import { fetchExternalApiQueries } from "./queries";

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

@@ -2,7 +2,7 @@ import { CancellationToken } from "vscode";
 import { DatabaseItem } from "../databases/local-databases";
 import { join } from "path";
 import { QueryRunner } from "../query-server";
-import { CodeQLCliServer } from "../cli";
+import { CodeQLCliServer } from "../codeql-cli/cli";
 import { TeeLogger } from "../common";
 import { extensiblePredicateDefinitions } from "./predicates";
 import { ProgressCallback } from "../progress";

extensions/ql-vscode/src/databases/database-fetcher.ts

@@ -2,7 +2,7 @@ import fetch, { Response } from "node-fetch";
 import { zip } from "zip-a-folder";
 import { Open } from "unzipper";
 import { Uri, CancellationToken, window, InputBoxOptions } from "vscode";
-import { CodeQLCliServer } from "../cli";
+import { CodeQLCliServer } from "../codeql-cli/cli";
 import {
   ensureDir,
   realpath as fs_realpath,

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

@@ -2,7 +2,7 @@ import { pathExists, stat, remove } from "fs-extra";
 import { glob } from "glob";
 import { join, basename, resolve, relative, dirname, extname } from "path";
 import * as vscode from "vscode";
-import * as cli from "../cli";
+import * as cli from "../codeql-cli/cli";
 import { ExtensionContext } from "vscode";
 import {
   showAndLogWarningMessage,