diff --git a/extensions/ql-vscode/src/data-extensions-editor/data-extensions-editor-view.ts b/extensions/ql-vscode/src/data-extensions-editor/data-extensions-editor-view.ts index 2fcb5c0f0..e1b14e846 100644 --- a/extensions/ql-vscode/src/data-extensions-editor/data-extensions-editor-view.ts +++ b/extensions/ql-vscode/src/data-extensions-editor/data-extensions-editor-view.ts @@ -22,7 +22,7 @@ import { import { DatabaseItem, DatabaseManager } from "../databases/local-databases"; import { CodeQLCliServer } from "../codeql-cli/cli"; import { asError, assertNever, getErrorMessage } from "../common/helpers-pure"; -import { generateFlowModel } from "./flow-model-queries"; +import { runFlowModelQueries } from "./flow-model-queries"; import { promptImportGithubDatabase } from "../databases/database-fetcher"; import { App } from "../common/app"; import { showResolvableLocation } from "../databases/local-databases/locations"; @@ -389,7 +389,7 @@ export class DataExtensionsEditorView extends AbstractWebview< }); try { - await generateFlowModel({ + await runFlowModelQueries({ cliServer: this.cliServer, queryRunner: this.queryRunner, queryStorageDir: this.queryStorageDir, diff --git a/extensions/ql-vscode/src/data-extensions-editor/flow-model-queries.ts b/extensions/ql-vscode/src/data-extensions-editor/flow-model-queries.ts index e6dbd2566..a5a758e3e 100644 --- a/extensions/ql-vscode/src/data-extensions-editor/flow-model-queries.ts +++ b/extensions/ql-vscode/src/data-extensions-editor/flow-model-queries.ts @@ -27,18 +27,21 @@ type FlowModelOptions = { onResults: (results: ModeledMethod[]) => void | Promise; }; -export async function generateFlowModel({ +export async function runFlowModelQueries({ onResults, ...options }: FlowModelOptions) { - const queries = await resolveQueries(options.cliServer, options.databaseItem); + const queries = await resolveFlowQueries( + options.cliServer, + options.databaseItem, + ); const queriesByBasename: Record = {}; for (const query of queries) { queriesByBasename[basename(query)] = query; } - const summaryResults = await getModeledMethodsFromFlow( + const summaryResults = await runSingleFlowQuery( "summary", queriesByBasename["CaptureSummaryModels.ql"], 0, @@ -48,7 +51,7 @@ export async function generateFlowModel({ await onResults(summaryResults); } - const sinkResults = await getModeledMethodsFromFlow( + const sinkResults = await runSingleFlowQuery( "sink", queriesByBasename["CaptureSinkModels.ql"], 1, @@ -58,7 +61,7 @@ export async function generateFlowModel({ await onResults(sinkResults); } - const sourceResults = await getModeledMethodsFromFlow( + const sourceResults = await runSingleFlowQuery( "source", queriesByBasename["CaptureSourceModels.ql"], 2, @@ -68,7 +71,7 @@ export async function generateFlowModel({ await onResults(sourceResults); } - const neutralResults = await getModeledMethodsFromFlow( + const neutralResults = await runSingleFlowQuery( "neutral", queriesByBasename["CaptureNeutralModels.ql"], 3, @@ -79,7 +82,7 @@ export async function generateFlowModel({ } } -async function resolveQueries( +async function resolveFlowQueries( cliServer: CodeQLCliServer, databaseItem: DatabaseItem, ): Promise { @@ -116,7 +119,7 @@ async function resolveQueries( ); } -async function getModeledMethodsFromFlow( +async function runSingleFlowQuery( type: Exclude, queryPath: string | undefined, queryStep: number,