Merge pull request #2387 from github/charisk/move-some-common-files

Move some common files into /common

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

@@ -25,7 +25,7 @@ import {
 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 { sarifParser } from "../common/sarif-parser";
 import { walkDirectory } from "../helpers";
 import { App } from "../common/app";
 import { QueryLanguage } from "../common/query-language";

extensions/ql-vscode/src/common/sarif-parser.ts

@@ -1,7 +1,7 @@
 import * as Sarif from "sarif";
 import { createReadStream } from "fs-extra";
 import { connectTo } from "stream-json/Assembler";
-import { getErrorMessage } from "./pure/helpers-pure";
+import { getErrorMessage } from "../pure/helpers-pure";
 import { withParser } from "stream-json/filters/Pick";
 
 const DUMMY_TOOL: Sarif.Tool = { driver: { name: "" } };

extensions/ql-vscode/src/log-insights/log-scanner.ts

@@ -1,5 +1,5 @@
 import { SummaryEvent } from "./log-summary";
-import { readJsonlFile } from "./jsonl-reader";
+import { readJsonlFile } from "../common/jsonl-reader";
 
 /**
  * Callback interface used to report diagnostics from a log scanner.

extensions/ql-vscode/src/pure/log-summary-parser.ts

@@ -1,4 +1,4 @@
-import { readJsonlFile } from "../log-insights/jsonl-reader";
+import { readJsonlFile } from "../common/jsonl-reader";
 
 // TODO(angelapwen): Only load in necessary information and
 // location in bytes for this log to save memory.

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

@@ -22,7 +22,7 @@ import {
   QueryWithResults,
 } from "./run-queries-shared";
 import { formatLegacyMessage } from "./query-server/legacy";
-import { sarifParser } from "./sarif-parser";
+import { sarifParser } from "./common/sarif-parser";
 
 /**
  * query-results.ts

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

@@ -5,7 +5,7 @@ import { join } from "path";
 
 import { Logger } from "../common";
 import { AnalysisAlert, AnalysisRawResults } from "./shared/analysis-result";
-import { sarifParser } from "../sarif-parser";
+import { sarifParser } from "../common/sarif-parser";
 import { extractAnalysisAlerts } from "./sarif-processing";
 import { CodeQLCliServer } from "../codeql-cli/cli";
 import { extractRawResults } from "./bqrs-processing";

extensions/ql-vscode/test/vscode-tests/no-workspace/common/sarif-parser.test.ts

@@ -1,9 +1,9 @@
 import { join } from "path";
 
-import { sarifParser } from "../../../src/sarif-parser";
+import { sarifParser } from "../../../../src/common/sarif-parser";
 
 describe("sarif parser", () => {
-  const sarifDir = join(__dirname, "data/sarif");
+  const sarifDir = join(__dirname, "../data/sarif");
   it("should parse a valid SARIF file", async () => {
     const result = await sarifParser(join(sarifDir, "validSarif.sarif"));
     expect(result.version).toBeDefined();