Refactor: Remove duplicated BQRS types

This refactoring combines the types in `bqrs-types.ts` and
`bqrs-cli-types.ts`. Historically, the former was used for BQRS files
parsed by the extension and the latter for BQRS files parsed by the cli.
They describe the same file types, but using different property and type
names.

We have moved to parsing all BQRS files by the cli. This refactoring
removes the `bqrs-types.ts` file and replaces all BQRS references to
use types in `bqrs-cli-types.ts`.

Additionally, the `adapt.ts` file has been deleted since its purpose
was to convert between extension and cli BQRS types. Some one type and
one function from `adapt.ts` has been moved from `adapt.ts` to
`bqrs-types.ts`. It's possible that we want to do a further refactoring
to simply remove them both.

Author: aeisenberg

extensions/ql-vscode/src/adapt.ts

@@ -4,6 +4,7 @@ import { DatabaseItem } from './databases';
 import { UrlValue, BqrsId } from './bqrs-cli-types';
 import fileRangeFromURI from './contextual/fileRangeFromURI';
 import { showLocation } from './interface-utils';
+import { isStringLoc, isWholeFileLoc, isLineColumnLoc } from './bqrs-utils';
 
 export interface AstItem {
   id: BqrsId;
@@ -33,7 +34,7 @@ class AstViewerDataProvider implements vscode.TreeDataProvider<AstItem | RootAst
           await showLocation(fileRangeFromURI(location, db));
         }
       });
-    }
+  }
 
   refresh(): void {
     this._onDidChangeTreeData.fire();
@@ -48,9 +49,7 @@ class AstViewerDataProvider implements vscode.TreeDataProvider<AstItem | RootAst
   }
 
   getTreeItem(item: AstItem): vscode.TreeItem {
-    const line = typeof item.location === 'string'
-      ? item.location
-      : item.location?.startLine;
+    const line = this.extractLineInfo(item?.location);
 
     const state = item.children.length
       ? vscode.TreeItemCollapsibleState.Collapsed
@@ -67,6 +66,20 @@ class AstViewerDataProvider implements vscode.TreeDataProvider<AstItem | RootAst
     };
     return treeItem;
   }
+
+  private extractLineInfo(loc?: UrlValue) {
+    if (!loc) {
+      return '';
+    } else if (isStringLoc(loc)) {
+      return loc;
+    } else if (isWholeFileLoc(loc)) {
+      return loc.uri;
+    } else if (isLineColumnLoc(loc)) {
+      return loc.startLine;
+    } else {
+      return '';
+    }
+  }
 }
 
 export class AstViewer {

extensions/ql-vscode/src/astViewer.ts

@@ -67,18 +67,6 @@ export interface LineColumnLocation {
   startColumn: number;
   endLine: number;
   endColumn: number;
-  charOffset: never;
-  charLength: never;
-}
-
-export interface OffsetLengthLocation {
-  uri: string;
-  startLine: never;
-  startColumn: never;
-  endLine: never;
-  endColumn: never;
-  charOffset: number;
-  charLength: number;
 }
 
 export interface WholeFileLocation {
@@ -87,15 +75,28 @@ export interface WholeFileLocation {
   startColumn: never;
   endLine: never;
   endColumn: never;
-  charOffset: never;
-  charLength: never;
 }
 
-export type UrlValue = LineColumnLocation | OffsetLengthLocation | WholeFileLocation | string;
+export type UrlValue = LineColumnLocation | WholeFileLocation | string;
 
+export type ResolvableLocationValue = WholeFileLocation | LineColumnLocation;
 
 export type ColumnValue = EntityValue | number | string | boolean;
 
+export type ResultRow = ColumnValue[];
+
+export interface RawResultSet {
+  readonly schema: ResultSetSchema;
+  readonly rows: readonly ResultRow[];
+}
+
+export function adaptBqrs(schema: ResultSetSchema, page: DecodedBqrsChunk): RawResultSet {
+  return {
+    schema,
+    rows: Array.from(page.tuples),
+  };
+}
+
 export interface DecodedBqrsChunk {
   tuples: ColumnValue[][];
   next?: number;