Rename Options to AutoModelQueriesOptions

Author: koesie10

extensions/ql-vscode/src/data-extensions-editor/auto-model-codeml-queries.ts

@@ -18,19 +18,6 @@ import { interpretResultsSarif } from "../query-results";
 import { join } from "path";
 import { assertNever } from "../common/helpers-pure";
 
-type Options = {
-  cliServer: CodeQLCliServer;
-  queryRunner: QueryRunner;
-  databaseItem: DatabaseItem;
-  queryStorageDir: string;
-
-  progress: ProgressCallback;
-};
-
-export type AutoModelQueriesResult = {
-  candidates: Sarif.Log;
-};
-
 type AutoModelQueryOptions = {
   cliServer: CodeQLCliServer;
   queryRunner: QueryRunner;
@@ -158,10 +145,28 @@ async function runAutoModelQuery(
   return sarif;
 }
 
-export async function runAutoModelQueries(
-  mode: Mode,
-  { cliServer, queryRunner, databaseItem, queryStorageDir, progress }: Options,
-): Promise<AutoModelQueriesResult | undefined> {
+type AutoModelQueriesOptions = {
+  mode: Mode;
+  cliServer: CodeQLCliServer;
+  queryRunner: QueryRunner;
+  databaseItem: DatabaseItem;
+  queryStorageDir: string;
+
+  progress: ProgressCallback;
+};
+
+export type AutoModelQueriesResult = {
+  candidates: Sarif.Log;
+};
+
+export async function runAutoModelQueries({
+  mode,
+  cliServer,
+  queryRunner,
+  databaseItem,
+  queryStorageDir,
+  progress,
+}: AutoModelQueriesOptions): Promise<AutoModelQueriesResult | undefined> {
   // maxStep for this part is 1500
   const maxStep = 1500;
 

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

@@ -383,7 +383,8 @@ export class DataExtensionsEditorView extends AbstractWebview<
     let predictedModeledMethods: Record<string, ModeledMethod>;
 
     if (useLlmGenerationV2()) {
-      const usages = await runAutoModelQueries(this.mode, {
+      const usages = await runAutoModelQueries({
+        mode: this.mode,
         cliServer: this.cliServer,
         queryRunner: this.queryRunner,
         queryStorageDir: this.queryStorageDir,

extensions/ql-vscode/test/vscode-tests/no-workspace/data-extensions-editor/auto-model-codeml-queries.test.ts

@@ -73,6 +73,7 @@ describe("runAutoModelQueries", () => {
     };
 
     const options = {
+      mode: Mode.Application,
       cliServer: mockedObject<CodeQLCliServer>({
         resolveQlpacks: jest.fn().mockResolvedValue({
           "/a/b/c/my-extension-pack": {},
@@ -149,7 +150,7 @@ describe("runAutoModelQueries", () => {
       progress: jest.fn(),
     };
 
-    const result = await runAutoModelQueries(Mode.Application, options);
+    const result = await runAutoModelQueries(options);
     expect(result).not.toBeUndefined();
 
     expect(options.cliServer.resolveQlpacks).toHaveBeenCalledTimes(1);