Continue working on implementing JSON streaming

Author: marcnjaramillo

extensions/ql-vscode/src/cli.ts

@@ -2,8 +2,8 @@ import * as cpp from 'child-process-promise';
 import * as child_process from 'child_process';
 import * as fs from 'fs-extra';
 import * as path from 'path';
+import { parser } from 'stream-json';
 import { chain } from 'stream-chain';
-import { Parser } from 'stream-json';
 import Assembler = require('stream-json/Assembler');
 import * as sarif from 'sarif';
 import { SemVer } from 'semver';
@@ -20,6 +20,10 @@ 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');
+import { pick } from 'stream-json/filters/Pick';
+// import { filter } from 'stream-json/filters/Filter';
+
 
 /**
  * The version of the SARIF format that we are using.
@@ -672,29 +676,32 @@ 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));
-    try {
-      // output = fs.createReadStream('/Users/marcjaramillo/MLH/vscode-codeql-starter/jdk11-tainted-path.sarif').pipe(parsedSarif);
-    } 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}`);
-    }
+
     try {
-      // output.on('data', data => {
-      //   console.log(data);
-      // });
-      // output.on('end', () => { console.log('done'); });
-      return {} as unknown as sarif.Log;
+      //TODO: figure out error handling for Assembler
+      return await new Promise((resolve) => {
+        const pipeline = chain([
+          fs.createReadStream('/Users/marcjaramillo/MLH/jdk11-tainted-path.sarif'),
+          parser(),
+          pick({filter: 'runs.0.results'})
+        ]);
+  
+        const asm = Assembler.connectTo(pipeline);
+        asm.on('done', (asm) => {
+          const dummyTool : sarif.Tool = {driver: {name: ''}};
+          const log : sarif.Log = {
+            version: '2.1.0', 
+            runs: [
+              { 
+                tool: dummyTool, 
+                results: asm.current 
+              }
+            ]
+          };
+          console.log(log);  
+          resolve(log);
+        });
+      });
     } catch (err) {
       throw new Error(`Parsing output of interpretation failed: ${err.stderr || err}`);
     }