Store query @kind when running a variant analysis (#2740)

extensions/ql-vscode/src/query-history/store/query-history-variant-analysis-domain-mapper.ts

@@ -55,6 +55,7 @@ function mapVariantAnalysisDtoToDto(
       filePath: variantAnalysis.query.filePath,
       language: mapQueryLanguageToDto(variantAnalysis.query.language),
       text: variantAnalysis.query.text,
+      kind: variantAnalysis.query.kind,
     },
     databases: {
       repositories: variantAnalysis.databases.repositories,

extensions/ql-vscode/src/query-history/store/query-history-variant-analysis-dto-mapper.ts

@@ -55,6 +55,7 @@ function mapVariantAnalysisToDomainModel(
       filePath: variantAnalysis.query.filePath,
       language: mapQueryLanguageToDomainModel(variantAnalysis.query.language),
       text: variantAnalysis.query.text,
+      kind: variantAnalysis.query.kind,
     },
     databases: {
       repositories: variantAnalysis.databases.repositories,

extensions/ql-vscode/src/query-history/store/query-history-variant-analysis-dto.ts

@@ -23,6 +23,7 @@ export interface VariantAnalysisDto {
     filePath: string;
     language: QueryLanguageDto;
     text: string;
+    kind?: string;
   };
   databases: {
     repositories?: string[];

extensions/ql-vscode/src/variant-analysis/shared/variant-analysis.ts

@@ -10,6 +10,7 @@ export interface VariantAnalysis {
     filePath: string;
     language: QueryLanguage;
     text: string;
+    kind?: string;
   };
   databases: {
     repositories?: string[];
@@ -138,6 +139,7 @@ export interface VariantAnalysisSubmission {
     filePath: string;
     language: QueryLanguage;
     text: string;
+    kind?: string;
 
     // Base64 encoded query pack.
     pack: string;

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

@@ -245,6 +245,7 @@ export class VariantAnalysisManager
         pack: base64Pack,
         language: variantAnalysisLanguage,
         text: queryText,
+        kind: queryMetadata?.kind,
       },
       databases: {
         repositories: repoSelection.repositories,

extensions/ql-vscode/src/variant-analysis/variant-analysis-processor.ts

@@ -32,6 +32,7 @@ export function processVariantAnalysis(
         filePath: submission.query.filePath,
         language: submission.query.language,
         text: submission.query.text,
+        kind: submission.query.kind,
       },
       databases: submission.databases,
       executionStartTime: submission.startTime,

extensions/ql-vscode/test/factories/variant-analysis/shared/variant-analysis-submission.ts

@@ -12,6 +12,7 @@ export function createMockSubmission(): VariantAnalysisSubmission {
       filePath: "query-file-path",
       language: QueryLanguage.Javascript,
       text: "query-text",
+      kind: "table",
       pack: "base64-encoded-string",
     },
     databases: {

extensions/ql-vscode/test/unit-tests/variant-analysis/variant-analysis-processor.test.ts

@@ -51,6 +51,7 @@ describe(processVariantAnalysis.name, () => {
         language: QueryLanguage.Javascript,
         name: "query-name",
         text: mockSubmission.query.text,
+        kind: "table",
       },
       databases: {
         repositories: ["1", "2", "3"],