Adds interface-types and result-keys to pure

Will ensure that these files never have vscode dependencies.

Author: aeisenberg

extensions/ql-vscode/src/cli.ts

@@ -15,7 +15,7 @@ import { BQRSInfo, DecodedBqrsChunk } from './pure/bqrs-cli-types';
 import { CliConfig } from './config';
 import { DistributionProvider, FindDistributionResultKind } from './distribution';
 import { assertNever } from './pure/helpers-pure';
-import { QueryMetadata, SortDirection } from './interface-types';
+import { QueryMetadata, SortDirection } from './pure/interface-types';
 import { Logger, ProgressReporter } from './logging';
 
 /**
@@ -702,7 +702,7 @@ export class CodeQLCliServer implements Disposable {
 
   private async refreshVersion() {
     const distribution = await this.distributionProvider.getDistribution();
-    switch(distribution.kind) {
+    switch (distribution.kind) {
       case FindDistributionResultKind.CompatibleDistribution:
       // eslint-disable-next-line no-fallthrough
       case FindDistributionResultKind.IncompatibleDistribution:

extensions/ql-vscode/src/compare/compare-interface.ts

@@ -14,7 +14,7 @@ import {
   FromCompareViewMessage,
   ToCompareViewMessage,
   QueryCompareResult,
-} from '../interface-types';
+} from '../pure/interface-types';
 import { Logger } from '../logging';
 import { CodeQLCliServer } from '../cli';
 import { DatabaseManager } from '../databases';

extensions/ql-vscode/src/compare/resultsDiff.ts

@@ -1,5 +1,5 @@
 import { RawResultSet } from '../pure/bqrs-cli-types';
-import { QueryCompareResult } from '../interface-types';
+import { QueryCompareResult } from '../pure/interface-types';
 
 /**
  * Compare the rows of two queries. Use deep equality to determine if

extensions/ql-vscode/src/compare/view/Compare.tsx

@@ -5,7 +5,7 @@ import * as Rdom from 'react-dom';
 import {
   ToCompareViewMessage,
   SetComparisonsMessage,
-} from '../../interface-types';
+} from '../../pure/interface-types';
 import CompareSelector from './CompareSelector';
 import { vscode } from '../../view/vscode-api';
 import CompareTable from './CompareTable';

extensions/ql-vscode/src/compare/view/CompareTable.tsx

@@ -1,6 +1,6 @@
 import * as React from 'react';
 
-import { SetComparisonsMessage } from '../../interface-types';
+import { SetComparisonsMessage } from '../../pure/interface-types';
 import RawTableHeader from '../../view/RawTableHeader';
 import { className } from '../../view/result-table-utils';
 import { ResultRow } from '../../pure/bqrs-cli-types';

extensions/ql-vscode/src/interface-utils.ts

@@ -17,7 +17,7 @@ import {
   isLineColumnLoc
 } from './pure/bqrs-utils';
 import { DatabaseItem, DatabaseManager } from './databases';
-import { ViewSourceFileMsg } from './interface-types';
+import { ViewSourceFileMsg } from './pure/interface-types';
 import { Logger } from './logging';
 import {
   LineColumnLocation,

extensions/ql-vscode/src/interface.ts

@@ -30,7 +30,7 @@ import {
   INTERPRETED_RESULTS_PAGE_SIZE,
   ALERTS_TABLE_NAME,
   RawResultsSortState,
-} from './interface-types';
+} from './pure/interface-types';
 import { Logger } from './logging';
 import { commandRunner } from './helpers';
 import * as messages from './pure/messages';
@@ -46,7 +46,7 @@ import {
   shownLocationLineDecoration,
   jumpToLocation,
 } from './interface-utils';
-import { getDefaultResultSetName, ParsedResultSets } from './interface-types';
+import { getDefaultResultSetName, ParsedResultSets } from './pure/interface-types';
 import { RawResultSet, transformBqrsResultSet, ResultSetSchema } from './pure/bqrs-cli-types';
 
 /**

…ensions/ql-vscode/src/interface-types.ts …ns/ql-vscode/src/pure/interface-types.tsextensions/ql-vscode/src/interface-types.ts renamed to extensions/ql-vscode/src/pure/interface-types.ts extensions/ql-vscode/src/interface-types.ts renamed to extensions/ql-vscode/src/pure/interface-types.ts

@@ -1,5 +1,5 @@
 import * as sarif from 'sarif';
-import { RawResultSet, ResultRow, ResultSetSchema, Column, ResolvableLocationValue } from './pure/bqrs-cli-types';
+import { RawResultSet, ResultRow, ResultSetSchema, Column, ResolvableLocationValue } from './bqrs-cli-types';
 
 /**
  * This module contains types and code that are shared between

extensions/ql-vscode/src/result-keys.ts …nsions/ql-vscode/src/pure/result-keys.tsextensions/ql-vscode/src/result-keys.ts renamed to extensions/ql-vscode/src/pure/result-keys.ts extensions/ql-vscode/src/result-keys.ts renamed to extensions/ql-vscode/src/pure/result-keys.ts

@@ -6,7 +6,7 @@ import * as cli from './cli';
 import * as sarif from 'sarif';
 import * as fs from 'fs-extra';
 import * as path from 'path';
-import { RawResultsSortState, SortedResultSetInfo, DatabaseInfo, QueryMetadata, InterpretedResultsSortState, ResultsPaths } from './interface-types';
+import { RawResultsSortState, SortedResultSetInfo, DatabaseInfo, QueryMetadata, InterpretedResultsSortState, ResultsPaths } from './pure/interface-types';
 import { QueryHistoryConfig } from './config';
 import { QueryHistoryItemOptions } from './query-history';
 
@@ -96,8 +96,8 @@ export class CompletedQuery implements QueryWithResults {
   }
 
   getLabel(): string {
-      return this.options?.label
-        || this.config.format;
+    return this.options?.label
+      || this.config.format;
   }
 
   get didRunSuccessfully(): boolean {