Resolve sourcemapped program at launch for microsoft/vscode-node-debu…

…g2#12

src/chrome/chromeDebugAdapter.ts

@@ -71,7 +71,7 @@ export abstract class ChromeDebugAdapter extends BaseDebugAdapter {
     protected _chromeConnection: ChromeConnection;
 
     private _lineNumberTransformer: LineNumberTransformer;
-    private _sourceMapTransformer: BaseSourceMapTransformer;
+    protected _sourceMapTransformer: BaseSourceMapTransformer;
     private _pathTransformer: BasePathTransformer;
 
     private _hasTerminated: boolean;

src/debugAdapterInterfaces.d.ts

@@ -16,7 +16,7 @@ export type ISourceMapPathOverrides = { [pattern: string]: string };
 export interface CommonRequestArgs {
     webRoot?: string;
     outDir?: string;
-    outDirs?: string[];
+    outFiles?: string[];
     sourceMaps?: boolean;
     diagnosticLogging?: boolean;
     verboseDiagnosticLogging?: boolean;

src/transformers/baseSourceMapTransformer.ts

@@ -8,6 +8,7 @@ import {Handles} from 'vscode-debugadapter';
 
 import {ISetBreakpointsArgs, ILaunchRequestArgs, IAttachRequestArgs,
     ISetBreakpointsResponseBody, IStackTraceResponseBody} from '../debugAdapterInterfaces';
+import {MappedPosition} from '../sourceMaps/sourceMap';
 import {SourceMaps} from '../sourceMaps/sourceMaps';
 import * as utils from '../utils';
 import * as logger from '../logger';
@@ -32,10 +33,16 @@ export class BaseSourceMapTransformer {
     private _pendingBreakpointsByPath = new Map<string, IPendingBreakpoint>();
     private _authoredPathsToMappedBPs: Map<string, DebugProtocol.SourceBreakpoint[]>;
 
+    protected _preLoad = Promise.resolve<void>();
+
     constructor(sourceHandles: Handles<ISourceContainer>) {
         this._sourceHandles = sourceHandles;
     }
 
+    public get sourceMaps(): SourceMaps {
+        return this._sourceMaps;
+    }
+
     public launch(args: ILaunchRequestArgs): void {
         this.init(args);
     }
@@ -231,13 +238,25 @@ export class BaseSourceMapTransformer {
         if (this._sourceMaps) {
             const mapped = this._sourceMaps.mapToAuthored(scriptPath, bp.line, bp.column);
             if (mapped) {
-                // Not sending back the path here, since the bp has an ID
+                // No need to send back the path, the bp can only move within its script
                 bp.line = mapped.line;
                 bp.column = mapped.column;
             }
         }
     }
 
+    public mapToGenerated(authoredPath: string, line: number, column: number): Promise<MappedPosition> {
+        return this._preLoad.then(() => this._sourceMaps.mapToGenerated(authoredPath, line, column));
+    }
+
+    public mapToAuthored(pathToGenerated: string, line: number, column: number): Promise<MappedPosition> {
+        return this._preLoad.then(() => this._sourceMaps.mapToAuthored(pathToGenerated, line, column));
+    }
+
+    public getGeneratedPathFromAuthoredPath(authoredPath: string): Promise<string> {
+        return this._preLoad.then(() => this._sourceMaps.getGeneratedPathFromAuthoredPath(authoredPath));
+    }
+
     /**
      * Resolve any pending breakpoints for this script
      */

src/transformers/eagerSourceMapTransformer.ts

@@ -16,13 +16,12 @@ import * as logger from '../logger';
  */
 export class EagerSourceMapTransformer extends BaseSourceMapTransformer {
     private static SOURCE_MAPPING_MATCHER = new RegExp('^//[#@] ?sourceMappingURL=(.+)$');
-    private _preLoad: Promise<void>;
 
     protected init(args: ILaunchRequestArgs | IAttachRequestArgs): void {
         super.init(args);
         if (args.sourceMaps) {
-            const generatedCodeGlobs = args.outDirs ?
-                args.outDirs :
+            const generatedCodeGlobs = args.outFiles ?
+                args.outFiles :
                 args.outDir ?
                     [path.join(args.outDir, '**/*.js')] :
                     [];