Refactored interpretBqrs

Author: mgsium

extensions/ql-vscode/src/cli.ts

@@ -20,6 +20,7 @@ import { assertNever } from './pure/helpers-pure';
 import { QueryMetadata, SortDirection } from './pure/interface-types';
 import { Logger, ProgressReporter } from './logging';
 import { CompilationMessage } from './pure/messages';
+import Chain = require('stream-chain');
 
 /**
  * The version of the SARIF format that we are using.
@@ -672,29 +673,22 @@ export class CodeQLCliServer implements Disposable {
 
   async interpretBqrs(metadata: QueryMetadata, resultsPath: string, interpretedResultsPath: string, sourceInfo?: SourceInfo): Promise<sarif.Log> {
     await this.runInterpretCommand(SARIF_FORMAT, metadata, resultsPath, interpretedResultsPath, sourceInfo);
-    
-    const pipeline = chain([
-      fs.createReadStream(interpretedResultsPath),
-      new Parser()
-    ]);
-    
-    const asm = Assembler.connectTo(pipeline);
-    asm.on('done', asm => console.log(asm.current));
+    let pipeline: Chain;
+
     try {
-      // output = fs.createReadStream('/Users/marcjaramillo/MLH/vscode-codeql-starter/jdk11-tainted-path.sarif').pipe(parsedSarif);
+      pipeline = chain([
+        fs.createReadStream(interpretedResultsPath),
+        new Parser()
+      ]);
     } catch (e) {
-      const rawMessage = e.stderr || e.message;
-      const errorMessage = rawMessage.startsWith('Cannot create a string')
-        ? `SARIF too large. ${rawMessage}`
-        : rawMessage;
-      throw new Error(`Reading output of interpretation failed: ${errorMessage}`);
+      throw new Error('Reading output of interpretation failed.');
     }
+
     try {
-      // output.on('data', data => {
-      //   console.log(data);
-      // });
-      // output.on('end', () => { console.log('done'); });
-      return {} as unknown as sarif.Log;
+      const asm = Assembler.connectTo(pipeline);
+      asm.on('done', (asm) => asm.current);
+      // need to return asm.current in place of {}
+      return {} as sarif.Log;
     } catch (err) {
       throw new Error(`Parsing output of interpretation failed: ${err.stderr || err}`);
     }