Move sarif-parser.ts to /common/sarif-parser.ts

This commit is contained in:
Charis Kyriakou
2023-04-27 14:47:07 +00:00
parent f4a3115a6a
commit 616e2be99b
5 changed files with 6 additions and 6 deletions

View File

@@ -25,7 +25,7 @@ import {
import { QueryMetadata, SortDirection } from "../pure/interface-types"; import { QueryMetadata, SortDirection } from "../pure/interface-types";
import { BaseLogger, Logger, ProgressReporter } from "../common"; import { BaseLogger, Logger, ProgressReporter } from "../common";
import { CompilationMessage } from "../pure/legacy-messages"; import { CompilationMessage } from "../pure/legacy-messages";
import { sarifParser } from "../sarif-parser"; import { sarifParser } from "../common/sarif-parser";
import { walkDirectory } from "../helpers"; import { walkDirectory } from "../helpers";
import { App } from "../common/app"; import { App } from "../common/app";
import { QueryLanguage } from "../common/query-language"; import { QueryLanguage } from "../common/query-language";

View File

@@ -1,7 +1,7 @@
import * as Sarif from "sarif"; import * as Sarif from "sarif";
import { createReadStream } from "fs-extra"; import { createReadStream } from "fs-extra";
import { connectTo } from "stream-json/Assembler"; 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"; import { withParser } from "stream-json/filters/Pick";
const DUMMY_TOOL: Sarif.Tool = { driver: { name: "" } }; const DUMMY_TOOL: Sarif.Tool = { driver: { name: "" } };

View File

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

View File

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

View File

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