Merge remote-tracking branch 'origin/master' into pathMappingModuleResolution

Jakefile.js

@@ -40,6 +40,7 @@ var compilerSources = [
     "utilities.ts",
     "binder.ts",
     "checker.ts",
+    "sourcemap.ts",
     "declarationEmitter.ts",
     "emitter.ts",
     "program.ts",
@@ -59,6 +60,7 @@ var servicesSources = [
     "utilities.ts",
     "binder.ts",
     "checker.ts",
+    "sourcemap.ts",
     "declarationEmitter.ts",
     "emitter.ts",
     "program.ts",
@@ -475,7 +477,7 @@ compileFile(servicesFile, servicesSources,[builtLocalDirectory, copyright].conca
                 var nodeDefinitionsFileContents = definitionFileContents + "\r\nexport = ts;";
                 fs.writeFileSync(nodeDefinitionsFile, nodeDefinitionsFileContents);
 
-                // Node package definition file to be distributed without the package. Created by replacing 
+                // Node package definition file to be distributed without the package. Created by replacing
                 // 'ts' namespace with '"typescript"' as a module.
                 var nodeStandaloneDefinitionsFileContents = definitionFileContents.replace(/declare (namespace|module) ts/g, 'declare module "typescript"');
                 fs.writeFileSync(nodeStandaloneDefinitionsFile, nodeStandaloneDefinitionsFileContents);
@@ -884,7 +886,7 @@ var tslintRulesOutFiles = tslintRules.map(function(p) {
 desc("Compiles tslint rules to js");
 task("build-rules", tslintRulesOutFiles);
 tslintRulesFiles.forEach(function(ruleFile, i) {
-    compileFile(tslintRulesOutFiles[i], [ruleFile], [ruleFile], [], /*useBuiltCompiler*/ false, /*noOutFile*/ true, /*generateDeclarations*/ false, path.join(builtLocalDirectory, "tslint")); 
+    compileFile(tslintRulesOutFiles[i], [ruleFile], [ruleFile], [], /*useBuiltCompiler*/ false, /*noOutFile*/ true, /*generateDeclarations*/ false, path.join(builtLocalDirectory, "tslint"));
 });
 
 function getLinterOptions() {
@@ -947,7 +949,7 @@ function lintWatchFile(filename) {
         if (event !== "change") {
             return;
         }
-     
+
         if (!lintSemaphores[filename]) {
             lintSemaphores[filename] = true;
             lintFileAsync(getLinterOptions(), filename, function(err, result) {

src/compiler/checker.ts

@@ -9871,31 +9871,39 @@ namespace ts {
             }
 
             // Functions with with an explicitly specified 'void' or 'any' return type don't need any return expressions.
-            if (returnType && (returnType === voidType || isTypeAny(returnType))) {
-                return;
-            }
-
-            // if return type is not specified then we'll do the check only if 'noImplicitReturns' option is set
-            if (!returnType && !compilerOptions.noImplicitReturns) {
+            if (returnType === voidType || isTypeAny(returnType)) {
                 return;
             }
 
             // If all we have is a function signature, or an arrow function with an expression body, then there is nothing to check.
-            // also if HasImplicitReturnValue flags is not set this means that all codepaths in function body end with return of throw
+            // also if HasImplicitReturn flag is not set this means that all codepaths in function body end with return or throw
             if (nodeIsMissing(func.body) || func.body.kind !== SyntaxKind.Block || !(func.flags & NodeFlags.HasImplicitReturn)) {
                 return;
             }
 
-            if (!returnType || func.flags & NodeFlags.HasExplicitReturn) {
-                if (compilerOptions.noImplicitReturns) {
-                    error(func.type || func, Diagnostics.Not_all_code_paths_return_a_value);
-                }
-            }
-            else {
-                // This function does not conform to the specification.
+            const hasExplicitReturn = func.flags & NodeFlags.HasExplicitReturn;
+
+            if (returnType && !hasExplicitReturn) {
+                // minimal check: function has syntactic return type annotation and no explicit return statements in the body 
+                // this function does not conform to the specification.
                 // NOTE: having returnType !== undefined is a precondition for entering this branch so func.type will always be present 
                 error(func.type, Diagnostics.A_function_whose_declared_type_is_neither_void_nor_any_must_return_a_value);
             }
+            else if (compilerOptions.noImplicitReturns) {
+                if (!returnType) {
+                    // If return type annotation is omitted check if function has any explicit return statements.
+                    // If it does not have any - its inferred return type is void - don't do any checks. 
+                    // Otherwise get inferred return type from function body and report error only if it is not void / anytype
+                    const inferredReturnType = hasExplicitReturn
+                        ? getReturnTypeOfSignature(getSignatureFromDeclaration(func))
+                        : voidType;
+
+                    if (inferredReturnType === voidType || isTypeAny(inferredReturnType)) {
+                        return;
+                    }
+                }
+                error(func.type || func, Diagnostics.Not_all_code_paths_return_a_value);
+            }
         }
 
         function checkFunctionExpressionOrObjectLiteralMethod(node: FunctionExpression | MethodDeclaration, contextualMapper?: TypeMapper): Type {
@@ -12119,8 +12127,8 @@ namespace ts {
                 const symbol = getSymbolOfNode(node);
                 const localSymbol = node.localSymbol || symbol;
 
-                // Since the javascript won't do semantic analysis like typescript, 
-                // if the javascript file comes before the typescript file and both contain same name functions, 
+                // Since the javascript won't do semantic analysis like typescript,
+                // if the javascript file comes before the typescript file and both contain same name functions,
                 // checkFunctionOrConstructorSymbol wouldn't be called if we didnt ignore javascript function.
                 const firstDeclaration = forEach(localSymbol.declarations,
                     // Get first non javascript function declaration
@@ -14370,6 +14378,7 @@ namespace ts {
                 emitExtends = false;
                 emitDecorate = false;
                 emitParam = false;
+                emitAwaiter = false;
                 potentialThisCollisions.length = 0;
 
                 forEach(node.statements, checkSourceElement);

src/compiler/core.ts

@@ -359,6 +359,33 @@ namespace ts {
         return result;
     }
 
+    /**
+     * Reduce the properties of a map.
+     *
+     * @param map The map to reduce
+     * @param callback An aggregation function that is called for each entry in the map
+     * @param initial The initial value for the reduction.
+     */
+    export function reduceProperties<T, U>(map: Map<T>, callback: (aggregate: U, value: T, key: string) => U, initial: U): U {
+        let result = initial;
+        if (map) {
+            for (const key in map) {
+                if (hasProperty(map, key)) {
+                    result = callback(result, map[key], String(key));
+                }
+            }
+        }
+
+        return result;
+    }
+
+    /**
+     * Tests whether a value is an array.
+     */
+    export function isArray(value: any): value is any[] {
+        return Array.isArray ? Array.isArray(value) : value instanceof Array;
+    }
+
     export function memoize<T>(callback: () => T): () => T {
         let value: T;
         return () => {

src/compiler/emitter.ts

@@ -1,4 +1,5 @@
 /// <reference path="checker.ts"/>
+/// <reference path="sourcemap.ts" />
 /// <reference path="declarationEmitter.ts"/>
 
 /* @internal */
@@ -463,6 +464,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
             const writer = createTextWriter(newLine);
             const { write, writeTextOfNode, writeLine, increaseIndent, decreaseIndent } = writer;
 
+            const sourceMap = compilerOptions.sourceMap || compilerOptions.inlineSourceMap ? createSourceMapWriter(host, writer) : getNullSourceMapWriter();
+            const { setSourceFile, emitStart, emitEnd, emitPos } = sourceMap;
+
             let currentSourceFile: SourceFile;
             let currentText: string;
             let currentLineMap: number[];
@@ -497,38 +501,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
             let exportEquals: ExportAssignment;
             let hasExportStars: boolean;
 
-            /** Write emitted output to disk */
-            let writeEmittedFiles = writeJavaScriptFile;
-
             let detachedCommentsInfo: { nodePos: number; detachedCommentEndPos: number }[];
 
-            let writeComment = writeCommentRange;
-
-            /** Emit a node */
-            let emit = emitNodeWithCommentsAndWithoutSourcemap;
-
-            /** Called just before starting emit of a node */
-            let emitStart = function (node: Node) { };
-
-            /** Called once the emit of the node is done */
-            let emitEnd = function (node: Node) { };
-
-            /** Emit the text for the given token that comes after startPos
-              * This by default writes the text provided with the given tokenKind
-              * but if optional emitFn callback is provided the text is emitted using the callback instead of default text
-              * @param tokenKind the kind of the token to search and emit
-              * @param startPos the position in the source to start searching for the token
-              * @param emitFn if given will be invoked to emit the text instead of actual token emit */
-            let emitToken = emitTokenText;
-
-            /** Called to before starting the lexical scopes as in function/class in the emitted code because of node
-              * @param scopeDeclaration node that starts the lexical scope
-              * @param scopeName Optional name of this scope instead of deducing one from the declaration node */
-            let scopeEmitStart = function(scopeDeclaration: Node, scopeName?: string) { };
-
-            /** Called after coming out of the scope */
-            let scopeEmitEnd = function() { };
-
             /** Sourcemap data that will get encoded */
             let sourceMapData: SourceMapData;
 
@@ -554,18 +528,14 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
                 [ModuleKind.CommonJS]() {},
             };
 
-
             return doEmit;
 
             function doEmit(jsFilePath: string, sourceMapFilePath: string, sourceFiles: SourceFile[], isBundledEmit: boolean) {
+                sourceMap.initialize(jsFilePath, sourceMapFilePath, sourceFiles, isBundledEmit);
                 generatedNameSet = {};
                 nodeToGeneratedName = [];
                 isOwnFileEmit = !isBundledEmit;
 
-                if (compilerOptions.sourceMap || compilerOptions.inlineSourceMap) {
-                    initializeEmitterWithSourceMaps(jsFilePath, sourceMapFilePath, sourceFiles, isBundledEmit);
-                }
-
                 // Emit helpers from all the files
                 if (isBundledEmit && modulekind) {
                     forEach(sourceFiles, emitEmitHelpers);
@@ -575,9 +545,16 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
                 forEach(sourceFiles, emitSourceFile);
 
                 writeLine();
-                writeEmittedFiles(writer.getText(), jsFilePath, /*writeByteOrderMark*/ compilerOptions.emitBOM);
+
+                const sourceMappingURL = sourceMap.getSourceMappingURL();
+                if (sourceMappingURL) {
+                    write(`//# sourceMappingURL=${sourceMappingURL}`);
+                }
+
+                writeEmittedFiles(writer.getText(), jsFilePath, sourceMapFilePath, /*writeByteOrderMark*/ compilerOptions.emitBOM);
 
                 // reset the state
+                sourceMap.reset();
                 writer.reset();
                 currentSourceFile = undefined;
                 currentText = undefined;
@@ -616,7 +593,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
                 currentFileIdentifiers = sourceFile.identifiers;
                 isCurrentFileExternalModule = isExternalModule(sourceFile);
 
-                emit(sourceFile);
+                setSourceFile(sourceFile);
+                emitNodeWithCommentsAndWithoutSourcemap(sourceFile);
             }
 
             function isUniqueName(name: string): boolean {
@@ -713,399 +691,16 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
                 return nodeToGeneratedName[id] || (nodeToGeneratedName[id] = unescapeIdentifier(generateNameForNode(node)));
             }
 
-            function initializeEmitterWithSourceMaps(jsFilePath: string, sourceMapFilePath: string, sourceFiles: SourceFile[], isBundledEmit: boolean) {
-                let sourceMapDir: string; // The directory in which sourcemap will be
-
-                // Current source map file and its index in the sources list
-                let sourceMapSourceIndex = -1;
-
-                // Names and its index map
-                const sourceMapNameIndexMap: Map<number> = {};
-                const sourceMapNameIndices: number[] = [];
-                function getSourceMapNameIndex() {
-                    return sourceMapNameIndices.length ? lastOrUndefined(sourceMapNameIndices) : -1;
+            /** Write emitted output to disk */
+            function writeEmittedFiles(emitOutput: string, jsFilePath: string, sourceMapFilePath: string, writeByteOrderMark: boolean) {
+                if (compilerOptions.sourceMap && !compilerOptions.inlineSourceMap) {
+                    writeFile(host, emitterDiagnostics, sourceMapFilePath, sourceMap.getText(), /*writeByteOrderMark*/ false);
                 }
 
-                // Last recorded and encoded spans
-                let lastRecordedSourceMapSpan: SourceMapSpan;
-                let lastEncodedSourceMapSpan: SourceMapSpan = {
-                    emittedLine: 1,
-                    emittedColumn: 1,
-                    sourceLine: 1,
-                    sourceColumn: 1,
-                    sourceIndex: 0
-                };
-                let lastEncodedNameIndex = 0;
-
-                // Encoding for sourcemap span
-                function encodeLastRecordedSourceMapSpan() {
-                    if (!lastRecordedSourceMapSpan || lastRecordedSourceMapSpan === lastEncodedSourceMapSpan) {
-                        return;
-                    }
-
-                    let prevEncodedEmittedColumn = lastEncodedSourceMapSpan.emittedColumn;
-                    // Line/Comma delimiters
-                    if (lastEncodedSourceMapSpan.emittedLine === lastRecordedSourceMapSpan.emittedLine) {
-                        // Emit comma to separate the entry
-                        if (sourceMapData.sourceMapMappings) {
-                            sourceMapData.sourceMapMappings += ",";
-                        }
-                    }
-                    else {
-                        // Emit line delimiters
-                        for (let encodedLine = lastEncodedSourceMapSpan.emittedLine; encodedLine < lastRecordedSourceMapSpan.emittedLine; encodedLine++) {
-                            sourceMapData.sourceMapMappings += ";";
-                        }
-                        prevEncodedEmittedColumn = 1;
-                    }
-
-                    // 1. Relative Column 0 based
-                    sourceMapData.sourceMapMappings += base64VLQFormatEncode(lastRecordedSourceMapSpan.emittedColumn - prevEncodedEmittedColumn);
-
-                    // 2. Relative sourceIndex
-                    sourceMapData.sourceMapMappings += base64VLQFormatEncode(lastRecordedSourceMapSpan.sourceIndex - lastEncodedSourceMapSpan.sourceIndex);
-
-                    // 3. Relative sourceLine 0 based
-                    sourceMapData.sourceMapMappings += base64VLQFormatEncode(lastRecordedSourceMapSpan.sourceLine - lastEncodedSourceMapSpan.sourceLine);
-
-                    // 4. Relative sourceColumn 0 based
-                    sourceMapData.sourceMapMappings += base64VLQFormatEncode(lastRecordedSourceMapSpan.sourceColumn - lastEncodedSourceMapSpan.sourceColumn);
-
-                    // 5. Relative namePosition 0 based
-                    if (lastRecordedSourceMapSpan.nameIndex >= 0) {
-                        sourceMapData.sourceMapMappings += base64VLQFormatEncode(lastRecordedSourceMapSpan.nameIndex - lastEncodedNameIndex);
-                        lastEncodedNameIndex = lastRecordedSourceMapSpan.nameIndex;
-                    }
-
-                    lastEncodedSourceMapSpan = lastRecordedSourceMapSpan;
-                    sourceMapData.sourceMapDecodedMappings.push(lastEncodedSourceMapSpan);
-
-                    function base64VLQFormatEncode(inValue: number) {
-                        function base64FormatEncode(inValue: number) {
-                            if (inValue < 64) {
-                                return "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/".charAt(inValue);
-                            }
-                            throw TypeError(inValue + ": not a 64 based value");
-                        }
-
-                        // Add a new least significant bit that has the sign of the value.
-                        // if negative number the least significant bit that gets added to the number has value 1
-                        // else least significant bit value that gets added is 0
-                        // eg. -1 changes to binary : 01 [1] => 3
-                        //     +1 changes to binary : 01 [0] => 2
-                        if (inValue < 0) {
-                            inValue = ((-inValue) << 1) + 1;
-                        }
-                        else {
-                            inValue = inValue << 1;
-                        }
-
-                        // Encode 5 bits at a time starting from least significant bits
-                        let encodedStr = "";
-                        do {
-                            let currentDigit = inValue & 31; // 11111
-                            inValue = inValue >> 5;
-                            if (inValue > 0) {
-                                // There are still more digits to decode, set the msb (6th bit)
-                                currentDigit = currentDigit | 32;
-                            }
-                            encodedStr = encodedStr + base64FormatEncode(currentDigit);
-                        } while (inValue > 0);
-
-                        return encodedStr;
-                    }
+                if (sourceMapDataList) {
+                    sourceMapDataList.push(sourceMap.getSourceMapData());
                 }
 
-                function recordSourceMapSpan(pos: number) {
-                    const sourceLinePos = computeLineAndCharacterOfPosition(currentLineMap, pos);
-
-                    // Convert the location to be one-based.
-                    sourceLinePos.line++;
-                    sourceLinePos.character++;
-
-                    const emittedLine = writer.getLine();
-                    const emittedColumn = writer.getColumn();
-
-                    // If this location wasn't recorded or the location in source is going backwards, record the span
-                    if (!lastRecordedSourceMapSpan ||
-                        lastRecordedSourceMapSpan.emittedLine !== emittedLine ||
-                        lastRecordedSourceMapSpan.emittedColumn !== emittedColumn ||
-                        (lastRecordedSourceMapSpan.sourceIndex === sourceMapSourceIndex &&
-                            (lastRecordedSourceMapSpan.sourceLine > sourceLinePos.line ||
-                                (lastRecordedSourceMapSpan.sourceLine === sourceLinePos.line && lastRecordedSourceMapSpan.sourceColumn > sourceLinePos.character)))) {
-                        // Encode the last recordedSpan before assigning new
-                        encodeLastRecordedSourceMapSpan();
-
-                        // New span
-                        lastRecordedSourceMapSpan = {
-                            emittedLine: emittedLine,
-                            emittedColumn: emittedColumn,
-                            sourceLine: sourceLinePos.line,
-                            sourceColumn: sourceLinePos.character,
-                            nameIndex: getSourceMapNameIndex(),
-                            sourceIndex: sourceMapSourceIndex
-                        };
-                    }
-                    else {
-                        // Take the new pos instead since there is no change in emittedLine and column since last location
-                        lastRecordedSourceMapSpan.sourceLine = sourceLinePos.line;
-                        lastRecordedSourceMapSpan.sourceColumn = sourceLinePos.character;
-                        lastRecordedSourceMapSpan.sourceIndex = sourceMapSourceIndex;
-                    }
-                }
-
-                function recordEmitNodeStartSpan(node: Node) {
-                    // Get the token pos after skipping to the token (ignoring the leading trivia)
-                    recordSourceMapSpan(skipTrivia(currentText, node.pos));
-                }
-
-                function recordEmitNodeEndSpan(node: Node) {
-                    recordSourceMapSpan(node.end);
-                }
-
-                function writeTextWithSpanRecord(tokenKind: SyntaxKind, startPos: number, emitFn?: () => void) {
-                    const tokenStartPos = ts.skipTrivia(currentText, startPos);
-                    recordSourceMapSpan(tokenStartPos);
-                    const tokenEndPos = emitTokenText(tokenKind, tokenStartPos, emitFn);
-                    recordSourceMapSpan(tokenEndPos);
-                    return tokenEndPos;
-                }
-
-                function recordNewSourceFileStart(node: SourceFile) {
-                    // Add the file to tsFilePaths
-                    // If sourceroot option: Use the relative path corresponding to the common directory path
-                    // otherwise source locations relative to map file location
-                    const sourcesDirectoryPath = compilerOptions.sourceRoot ? host.getCommonSourceDirectory() : sourceMapDir;
-
-                    sourceMapData.sourceMapSources.push(getRelativePathToDirectoryOrUrl(sourcesDirectoryPath,
-                        node.fileName,
-                        host.getCurrentDirectory(),
-                        host.getCanonicalFileName,
-                        /*isAbsolutePathAnUrl*/ true));
-                    sourceMapSourceIndex = sourceMapData.sourceMapSources.length - 1;
-
-                    // The one that can be used from program to get the actual source file
-                    sourceMapData.inputSourceFileNames.push(node.fileName);
-
-                    if (compilerOptions.inlineSources) {
-                        if (!sourceMapData.sourceMapSourcesContent) {
-                            sourceMapData.sourceMapSourcesContent = [];
-                        }
-                        sourceMapData.sourceMapSourcesContent.push(node.text);
-                    }
-                }
-
-                function recordScopeNameOfNode(node: Node, scopeName?: string) {
-                    function recordScopeNameIndex(scopeNameIndex: number) {
-                        sourceMapNameIndices.push(scopeNameIndex);
-                    }
-
-                    function recordScopeNameStart(scopeName: string) {
-                        let scopeNameIndex = -1;
-                        if (scopeName) {
-                            const parentIndex = getSourceMapNameIndex();
-                            if (parentIndex !== -1) {
-                                // Child scopes are always shown with a dot (even if they have no name),
-                                // unless it is a computed property. Then it is shown with brackets,
-                                // but the brackets are included in the name.
-                                const name = (<Declaration>node).name;
-                                if (!name || name.kind !== SyntaxKind.ComputedPropertyName) {
-                                    scopeName = "." + scopeName;
-                                }
-                                scopeName = sourceMapData.sourceMapNames[parentIndex] + scopeName;
-                            }
-
-                            scopeNameIndex = getProperty(sourceMapNameIndexMap, scopeName);
-                            if (scopeNameIndex === undefined) {
-                                scopeNameIndex = sourceMapData.sourceMapNames.length;
-                                sourceMapData.sourceMapNames.push(scopeName);
-                                sourceMapNameIndexMap[scopeName] = scopeNameIndex;
-                            }
-                        }
-                        recordScopeNameIndex(scopeNameIndex);
-                    }
-
-                    if (scopeName) {
-                        // The scope was already given a name  use it
-                        recordScopeNameStart(scopeName);
-                    }
-                    else if (node.kind === SyntaxKind.FunctionDeclaration ||
-                        node.kind === SyntaxKind.FunctionExpression ||
-                        node.kind === SyntaxKind.MethodDeclaration ||
-                        node.kind === SyntaxKind.MethodSignature ||
-                        node.kind === SyntaxKind.GetAccessor ||
-                        node.kind === SyntaxKind.SetAccessor ||
-                        node.kind === SyntaxKind.ModuleDeclaration ||
-                        node.kind === SyntaxKind.ClassDeclaration ||
-                        node.kind === SyntaxKind.EnumDeclaration) {
-                        // Declaration and has associated name use it
-                        if ((<Declaration>node).name) {
-                            const name = (<Declaration>node).name;
-                            // For computed property names, the text will include the brackets
-                            scopeName = name.kind === SyntaxKind.ComputedPropertyName
-                                ? getTextOfNode(name)
-                                : (<Identifier>(<Declaration>node).name).text;
-                        }
-                        recordScopeNameStart(scopeName);
-                    }
-                    else {
-                        // Block just use the name from upper level scope
-                        recordScopeNameIndex(getSourceMapNameIndex());
-                    }
-                }
-
-                function recordScopeNameEnd() {
-                    sourceMapNameIndices.pop();
-                };
-
-                function writeCommentRangeWithMap(currentText: string, currentLineMap: number[], writer: EmitTextWriter, comment: CommentRange, newLine: string) {
-                    recordSourceMapSpan(comment.pos);
-                    writeCommentRange(currentText, currentLineMap, writer, comment, newLine);
-                    recordSourceMapSpan(comment.end);
-                }
-
-                function serializeSourceMapContents(version: number, file: string, sourceRoot: string, sources: string[], names: string[], mappings: string, sourcesContent?: string[]) {
-                    if (typeof JSON !== "undefined") {
-                        const map: any = {
-                            version,
-                            file,
-                            sourceRoot,
-                            sources,
-                            names,
-                            mappings
-                        };
-
-                        if (sourcesContent !== undefined) {
-                            map.sourcesContent = sourcesContent;
-                        }
-
-                        return JSON.stringify(map);
-                    }
-
-                    return "{\"version\":" + version + ",\"file\":\"" + escapeString(file) + "\",\"sourceRoot\":\"" + escapeString(sourceRoot) + "\",\"sources\":[" + serializeStringArray(sources) + "],\"names\":[" + serializeStringArray(names) + "],\"mappings\":\"" + escapeString(mappings) + "\" " + (sourcesContent !== undefined ? ",\"sourcesContent\":[" + serializeStringArray(sourcesContent) + "]" : "") + "}";
-
-                    function serializeStringArray(list: string[]): string {
-                        let output = "";
-                        for (let i = 0, n = list.length; i < n; i++) {
-                            if (i) {
-                                output += ",";
-                            }
-                            output += "\"" + escapeString(list[i]) + "\"";
-                        }
-                        return output;
-                    }
-                }
-
-                function writeJavaScriptAndSourceMapFile(emitOutput: string, jsFilePath: string, writeByteOrderMark: boolean) {
-                    encodeLastRecordedSourceMapSpan();
-
-                    const sourceMapText = serializeSourceMapContents(
-                        3,
-                        sourceMapData.sourceMapFile,
-                        sourceMapData.sourceMapSourceRoot,
-                        sourceMapData.sourceMapSources,
-                        sourceMapData.sourceMapNames,
-                        sourceMapData.sourceMapMappings,
-                        sourceMapData.sourceMapSourcesContent);
-
-                    sourceMapDataList.push(sourceMapData);
-
-                    let sourceMapUrl: string;
-                    if (compilerOptions.inlineSourceMap) {
-                        // Encode the sourceMap into the sourceMap url
-                        const base64SourceMapText = convertToBase64(sourceMapText);
-                        sourceMapData.jsSourceMappingURL = `data:application/json;base64,${base64SourceMapText}`;
-                    }
-                    else {
-                        // Write source map file
-                        writeFile(host, emitterDiagnostics, sourceMapData.sourceMapFilePath, sourceMapText, /*writeByteOrderMark*/ false);
-                    }
-                    sourceMapUrl = `//# sourceMappingURL=${sourceMapData.jsSourceMappingURL}`;
-
-                    // Write sourcemap url to the js file and write the js file
-                    writeJavaScriptFile(emitOutput + sourceMapUrl, jsFilePath, writeByteOrderMark);
-                }
-
-                // Initialize source map data
-                sourceMapData = {
-                    sourceMapFilePath: sourceMapFilePath,
-                    jsSourceMappingURL: !compilerOptions.inlineSourceMap ? getBaseFileName(normalizeSlashes(sourceMapFilePath)) : undefined,
-                    sourceMapFile: getBaseFileName(normalizeSlashes(jsFilePath)),
-                    sourceMapSourceRoot: compilerOptions.sourceRoot || "",
-                    sourceMapSources: [],
-                    inputSourceFileNames: [],
-                    sourceMapNames: [],
-                    sourceMapMappings: "",
-                    sourceMapSourcesContent: undefined,
-                    sourceMapDecodedMappings: []
-                };
-
-                // Normalize source root and make sure it has trailing "/" so that it can be used to combine paths with the
-                // relative paths of the sources list in the sourcemap
-                sourceMapData.sourceMapSourceRoot = ts.normalizeSlashes(sourceMapData.sourceMapSourceRoot);
-                if (sourceMapData.sourceMapSourceRoot.length && sourceMapData.sourceMapSourceRoot.charCodeAt(sourceMapData.sourceMapSourceRoot.length - 1) !== CharacterCodes.slash) {
-                    sourceMapData.sourceMapSourceRoot += directorySeparator;
-                }
-
-                if (compilerOptions.mapRoot) {
-                    sourceMapDir = normalizeSlashes(compilerOptions.mapRoot);
-                    if (!isBundledEmit) { // emitting single module file
-                        Debug.assert(sourceFiles.length === 1);
-                        // For modules or multiple emit files the mapRoot will have directory structure like the sources
-                        // So if src\a.ts and src\lib\b.ts are compiled together user would be moving the maps into mapRoot\a.js.map and mapRoot\lib\b.js.map
-                        sourceMapDir = getDirectoryPath(getSourceFilePathInNewDir(sourceFiles[0], host, sourceMapDir));
-                    }
-
-                    if (!isRootedDiskPath(sourceMapDir) && !isUrl(sourceMapDir)) {
-                        // The relative paths are relative to the common directory
-                        sourceMapDir = combinePaths(host.getCommonSourceDirectory(), sourceMapDir);
-                        sourceMapData.jsSourceMappingURL = getRelativePathToDirectoryOrUrl(
-                            getDirectoryPath(normalizePath(jsFilePath)), // get the relative sourceMapDir path based on jsFilePath
-                            combinePaths(sourceMapDir, sourceMapData.jsSourceMappingURL), // this is where user expects to see sourceMap
-                            host.getCurrentDirectory(),
-                            host.getCanonicalFileName,
-                            /*isAbsolutePathAnUrl*/ true);
-                    }
-                    else {
-                        sourceMapData.jsSourceMappingURL = combinePaths(sourceMapDir, sourceMapData.jsSourceMappingURL);
-                    }
-                }
-                else {
-                    sourceMapDir = getDirectoryPath(normalizePath(jsFilePath));
-                }
-
-                function emitNodeWithSourceMap(node: Node) {
-                    if (node) {
-                        if (nodeIsSynthesized(node)) {
-                            return emitNodeWithoutSourceMap(node);
-                        }
-                        if (node.kind !== SyntaxKind.SourceFile) {
-                            recordEmitNodeStartSpan(node);
-                            emitNodeWithoutSourceMap(node);
-                            recordEmitNodeEndSpan(node);
-                        }
-                        else {
-                            recordNewSourceFileStart(<SourceFile>node);
-                            emitNodeWithoutSourceMap(node);
-                        }
-                    }
-                }
-
-                function emitNodeWithCommentsAndWithSourcemap(node: Node) {
-                    emitNodeConsideringCommentsOption(node, emitNodeWithSourceMap);
-                }
-
-                writeEmittedFiles = writeJavaScriptAndSourceMapFile;
-                emit = emitNodeWithCommentsAndWithSourcemap;
-                emitStart = recordEmitNodeStartSpan;
-                emitEnd = recordEmitNodeEndSpan;
-                emitToken = writeTextWithSpanRecord;
-                scopeEmitStart = recordScopeNameOfNode;
-                scopeEmitEnd = recordScopeNameEnd;
-                writeComment = writeCommentRangeWithMap;
-            }
-
-            function writeJavaScriptFile(emitOutput: string, jsFilePath: string, writeByteOrderMark: boolean) {
                 writeFile(host, emitterDiagnostics, jsFilePath, emitOutput, writeByteOrderMark);
             }
 
@@ -1144,7 +739,16 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
                 }
             }
 
-            function emitTokenText(tokenKind: SyntaxKind, startPos: number, emitFn?: () => void) {
+            /** Emit the text for the given token that comes after startPos
+              * This by default writes the text provided with the given tokenKind
+              * but if optional emitFn callback is provided the text is emitted using the callback instead of default text
+              * @param tokenKind the kind of the token to search and emit
+              * @param startPos the position in the source to start searching for the token
+              * @param emitFn if given will be invoked to emit the text instead of actual token emit */
+            function emitToken(tokenKind: SyntaxKind, startPos: number, emitFn?: () => void) {
+                const tokenStartPos = skipTrivia(currentText, startPos);
+                emitPos(tokenStartPos);
+
                 const tokenString = tokenToString(tokenKind);
                 if (emitFn) {
                     emitFn();
@@ -1152,7 +756,10 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
                 else {
                     write(tokenString);
                 }
-                return startPos + tokenString.length;
+
+                const tokenEndPos = tokenStartPos + tokenString.length;
+                emitPos(tokenEndPos);
+                return tokenEndPos;
             }
 
             function emitOptional(prefix: string, node: Node) {
@@ -3093,7 +2700,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
 
                 emitToken(SyntaxKind.OpenBraceToken, node.pos);
                 increaseIndent();
-                scopeEmitStart(node.parent);
                 if (node.kind === SyntaxKind.ModuleBlock) {
                     Debug.assert(node.parent.kind === SyntaxKind.ModuleDeclaration);
                     emitCaptureThisForNodeIfNecessary(node.parent);
@@ -3105,7 +2711,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
                 decreaseIndent();
                 writeLine();
                 emitToken(SyntaxKind.CloseBraceToken, node.statements.end);
-                scopeEmitEnd();
             }
 
             function emitEmbeddedStatement(node: Node) {
@@ -4971,8 +4576,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
 
             function emitDownLevelExpressionFunctionBody(node: FunctionLikeDeclaration, body: Expression) {
                 write(" {");
-                scopeEmitStart(node);
-
                 increaseIndent();
                 const outPos = writer.getTextPos();
                 emitDetachedCommentsAndUpdateCommentsInfo(node.body);
@@ -5011,14 +4614,10 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
                 emitStart(node.body);
                 write("}");
                 emitEnd(node.body);
-
-                scopeEmitEnd();
             }
 
             function emitBlockFunctionBody(node: FunctionLikeDeclaration, body: Block) {
                 write(" {");
-                scopeEmitStart(node);
-
                 const initialTextPos = writer.getTextPos();
 
                 increaseIndent();
@@ -5052,7 +4651,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
                 }
 
                 emitToken(SyntaxKind.CloseBraceToken, body.statements.end);
-                scopeEmitEnd();
             }
 
             function findInitialSuperCall(ctor: ConstructorDeclaration): ExpressionStatement {
@@ -5338,7 +4936,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
                 let startIndex = 0;
 
                 write(" {");
-                scopeEmitStart(node, "constructor");
                 increaseIndent();
                 if (ctor) {
                     // Emit all the directive prologues (like "use strict").  These have to come before
@@ -5388,7 +4985,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
                 }
                 decreaseIndent();
                 emitToken(SyntaxKind.CloseBraceToken, ctor ? (<Block>ctor.body).statements.end : node.members.end);
-                scopeEmitEnd();
                 emitEnd(<Node>ctor || node);
                 if (ctor) {
                     emitTrailingComments(ctor);
@@ -5525,14 +5121,12 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
 
                 write(" {");
                 increaseIndent();
-                scopeEmitStart(node);
                 writeLine();
                 emitConstructor(node, baseTypeNode);
                 emitMemberFunctionsForES6AndHigher(node);
                 decreaseIndent();
                 writeLine();
                 emitToken(SyntaxKind.CloseBraceToken, node.members.end);
-                scopeEmitEnd();
 
                 // TODO(rbuckton): Need to go back to `let _a = class C {}` approach, removing the defineProperty call for now.
 
@@ -5634,7 +5228,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
                 tempParameters = undefined;
                 computedPropertyNamesToGeneratedNames = undefined;
                 increaseIndent();
-                scopeEmitStart(node);
                 if (baseTypeNode) {
                     writeLine();
                     emitStart(baseTypeNode);
@@ -5667,7 +5260,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
                 decreaseIndent();
                 writeLine();
                 emitToken(SyntaxKind.CloseBraceToken, node.members.end);
-                scopeEmitEnd();
                 emitStart(node);
                 write(")(");
                 if (baseTypeNode) {
@@ -5700,10 +5292,10 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
             function emitDecoratorsOfConstructor(node: ClassLikeDeclaration) {
                 const decorators = node.decorators;
                 const constructor = getFirstConstructorWithBody(node);
-                const hasDecoratedParameters = constructor && forEach(constructor.parameters, nodeIsDecorated);
+                const firstParameterDecorator = constructor && forEach(constructor.parameters, parameter => parameter.decorators);
 
                 // skip decoration of the constructor if neither it nor its parameters are decorated
-                if (!decorators && !hasDecoratedParameters) {
+                if (!decorators && !firstParameterDecorator) {
                     return;
                 }
 
@@ -5719,28 +5311,27 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
                 //
 
                 writeLine();
-                emitStart(node);
+                emitStart(node.decorators || firstParameterDecorator);
                 emitDeclarationName(node);
                 write(" = __decorate([");
                 increaseIndent();
                 writeLine();
 
                 const decoratorCount = decorators ? decorators.length : 0;
-                let argumentsWritten = emitList(decorators, 0, decoratorCount, /*multiLine*/ true, /*trailingComma*/ false, /*leadingComma*/ false, /*noTrailingNewLine*/ true, decorator => {
-                    emitStart(decorator);
-                    emit(decorator.expression);
-                    emitEnd(decorator);
-                });
-
-                argumentsWritten += emitDecoratorsOfParameters(constructor, /*leadingComma*/ argumentsWritten > 0);
+                let argumentsWritten = emitList(decorators, 0, decoratorCount, /*multiLine*/ true, /*trailingComma*/ false, /*leadingComma*/ false, /*noTrailingNewLine*/ true,
+                    decorator => emit(decorator.expression));
+                if (firstParameterDecorator) {
+                    argumentsWritten += emitDecoratorsOfParameters(constructor, /*leadingComma*/ argumentsWritten > 0);
+                }
                 emitSerializedTypeMetadata(node, /*leadingComma*/ argumentsWritten >= 0);
 
                 decreaseIndent();
                 writeLine();
                 write("], ");
                 emitDeclarationName(node);
-                write(");");
-                emitEnd(node);
+                write(")");
+                emitEnd(node.decorators || firstParameterDecorator);
+                write(";");
                 writeLine();
             }
 
@@ -5756,11 +5347,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
                         continue;
                     }
 
-                    // skip a member if it or any of its parameters are not decorated
-                    if (!nodeOrChildIsDecorated(member)) {
-                        continue;
-                    }
-
                     // skip an accessor declaration if it is not the first accessor
                     let decorators: NodeArray<Decorator>;
                     let functionLikeMember: FunctionLikeDeclaration;
@@ -5787,6 +5373,12 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
                             functionLikeMember = <MethodDeclaration>member;
                         }
                     }
+                    const firstParameterDecorator = functionLikeMember && forEach(functionLikeMember.parameters, parameter => parameter.decorators);
+
+                    // skip a member if it or any of its parameters are not decorated
+                    if (!decorators && !firstParameterDecorator) {
+                        continue;
+                    }
 
                     // Emit the call to __decorate. Given the following:
                     //
@@ -5820,29 +5412,26 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
                     //
 
                     writeLine();
-                    emitStart(member);
+                    emitStart(decorators || firstParameterDecorator);
                     write("__decorate([");
                     increaseIndent();
                     writeLine();
 
                     const decoratorCount = decorators ? decorators.length : 0;
-                    let argumentsWritten = emitList(decorators, 0, decoratorCount, /*multiLine*/ true, /*trailingComma*/ false, /*leadingComma*/ false, /*noTrailingNewLine*/ true, decorator => {
-                        emitStart(decorator);
-                        emit(decorator.expression);
-                        emitEnd(decorator);
-                    });
+                    let argumentsWritten = emitList(decorators, 0, decoratorCount, /*multiLine*/ true, /*trailingComma*/ false, /*leadingComma*/ false, /*noTrailingNewLine*/ true,
+                        decorator => emit(decorator.expression));
 
-                    argumentsWritten += emitDecoratorsOfParameters(functionLikeMember, argumentsWritten > 0);
+                    if (firstParameterDecorator) {
+                        argumentsWritten += emitDecoratorsOfParameters(functionLikeMember, argumentsWritten > 0);
+                    }
                     emitSerializedTypeMetadata(member, argumentsWritten > 0);
 
                     decreaseIndent();
                     writeLine();
                     write("], ");
-                    emitStart(member.name);
                     emitClassMemberPrefix(node, member);
                     write(", ");
                     emitExpressionForPropertyName(member.name);
-                    emitEnd(member.name);
 
                     if (languageVersion > ScriptTarget.ES3) {
                         if (member.kind !== SyntaxKind.PropertyDeclaration) {
@@ -5857,8 +5446,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
                         }
                     }
 
-                    write(");");
-                    emitEnd(member);
+                    write(")");
+                    emitEnd(decorators || firstParameterDecorator);
+                    write(";");
                     writeLine();
                 }
             }
@@ -5871,11 +5461,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
                         if (nodeIsDecorated(parameter)) {
                             const decorators = parameter.decorators;
                             argumentsWritten += emitList(decorators, 0, decorators.length, /*multiLine*/ true, /*trailingComma*/ false, /*leadingComma*/ leadingComma, /*noTrailingNewLine*/ true, decorator => {
-                                emitStart(decorator);
                                 write(`__param(${parameterIndex}, `);
                                 emit(decorator.expression);
                                 write(")");
-                                emitEnd(decorator);
                             });
                             leadingComma = true;
                         }
@@ -6228,12 +5816,10 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
                 emitEnd(node.name);
                 write(") {");
                 increaseIndent();
-                scopeEmitStart(node);
                 emitLines(node.members);
                 decreaseIndent();
                 writeLine();
                 emitToken(SyntaxKind.CloseBraceToken, node.members.end);
-                scopeEmitEnd();
                 write(")(");
                 emitModuleMemberName(node);
                 write(" || (");
@@ -6357,7 +5943,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
                 else {
                     write("{");
                     increaseIndent();
-                    scopeEmitStart(node);
                     emitCaptureThisForNodeIfNecessary(node);
                     writeLine();
                     emit(node.body);
@@ -6365,7 +5950,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
                     writeLine();
                     const moduleBlock = <ModuleBlock>getInnerMostModuleDeclarationFromDottedModule(node).body;
                     emitToken(SyntaxKind.CloseBraceToken, moduleBlock.statements.end);
-                    scopeEmitEnd();
                 }
                 write(")(");
                 // write moduleDecl = containingModule.m only if it is not exported es6 module member
@@ -7790,6 +7374,10 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
                 emitLeadingComments(node.endOfFileToken);
             }
 
+            function emit(node: Node): void {
+                emitNodeConsideringCommentsOption(node, emitNodeWithSourceMap);
+            }
+
             function emitNodeWithCommentsAndWithoutSourcemap(node: Node): void {
                 emitNodeConsideringCommentsOption(node, emitNodeWithoutSourceMap);
             }
@@ -7818,6 +7406,14 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
                 }
             }
 
+            function emitNodeWithSourceMap(node: Node): void {
+                if (node) {
+                    emitStart(node);
+                    emitNodeWithoutSourceMap(node);
+                    emitEnd(node);
+                }
+            }
+
             function emitNodeWithoutSourceMap(node: Node): void {
                 if (node) {
                     emitJavaScriptWorker(node);
@@ -8210,6 +7806,12 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
                 }
             }
 
+            function writeComment(text: string, lineMap: number[], writer: EmitTextWriter, comment: CommentRange, newLine: string) {
+                emitPos(comment.pos);
+                writeCommentRange(text, lineMap, writer, comment, newLine);
+                emitPos(comment.end);
+            }
+
             function emitShebang() {
                 const shebang = getShebang(currentText);
                 if (shebang) {

src/compiler/parser.ts

@@ -4902,7 +4902,7 @@ namespace ts {
 
                 if (!decorators) {
                     decorators = <NodeArray<Decorator>>[];
-                    decorators.pos = scanner.getStartPos();
+                    decorators.pos = decoratorStart;
                 }
 
                 const decorator = <Decorator>createNode(SyntaxKind.Decorator, decoratorStart);
@@ -5428,11 +5428,13 @@ namespace ts {
             // reference comment.
             while (true) {
                 const kind = triviaScanner.scan();
-                if (kind === SyntaxKind.WhitespaceTrivia || kind === SyntaxKind.NewLineTrivia || kind === SyntaxKind.MultiLineCommentTrivia) {
-                    continue;
-                }
                 if (kind !== SyntaxKind.SingleLineCommentTrivia) {
-                    break;
+                    if (isTrivia(kind)) {
+                        continue;
+                    }
+                    else {
+                        break;
+                    }
                 }
 
                 const range = { pos: triviaScanner.getTokenPos(), end: triviaScanner.getTextPos(), kind: triviaScanner.getToken() };

src/compiler/scanner.ts

@@ -425,6 +425,12 @@ namespace ts {
 
       /* @internal */
       export function skipTrivia(text: string, pos: number, stopAfterLineBreak?: boolean): number {
+          // Using ! with a greater than test is a fast way of testing the following conditions:
+          //  pos === undefined || pos === null || isNaN(pos) || pos < 0;
+          if (!(pos >= 0)) {
+              return pos;
+          }
+
           // Keep in sync with couldStartTrivia
           while (true) {
               const ch = text.charCodeAt(pos);
@@ -567,12 +573,12 @@ namespace ts {
     }
 
     /**
-     * Extract comments from text prefixing the token closest following `pos`. 
+     * Extract comments from text prefixing the token closest following `pos`.
      * The return value is an array containing a TextRange for each comment.
      * Single-line comment ranges include the beginning '//' characters but not the ending line break.
      * Multi - line comment ranges include the beginning '/* and ending '<asterisk>/' characters.
      * The return value is undefined if no comments were found.
-     * @param trailing 
+     * @param trailing
      * If false, whitespace is skipped until the first line break and comments between that location
      * and the next token are returned.
      * If true, comments occurring between the given position and the next line break are returned.

src/compiler/sourcemap.ts

@@ -0,0 +1,332 @@
+/// <reference path="checker.ts"/>
+
+/* @internal */
+namespace ts {
+    export interface SourceMapWriter {
+        getSourceMapData(): SourceMapData;
+        setSourceFile(sourceFile: SourceFile): void;
+        emitPos(pos: number): void;
+        emitStart(range: TextRange): void;
+        emitEnd(range: TextRange): void;
+        getText(): string;
+        getSourceMappingURL(): string;
+        initialize(filePath: string, sourceMapFilePath: string, sourceFiles: SourceFile[], isBundledEmit: boolean): void;
+        reset(): void;
+    }
+
+    const nop = <(...args: any[]) => any>Function.prototype;
+    let nullSourceMapWriter: SourceMapWriter;
+
+    export function getNullSourceMapWriter(): SourceMapWriter {
+        if (nullSourceMapWriter === undefined) {
+            nullSourceMapWriter = {
+                getSourceMapData(): SourceMapData { return undefined; },
+                setSourceFile(sourceFile: SourceFile): void { },
+                emitStart(range: TextRange): void { },
+                emitEnd(range: TextRange): void { },
+                emitPos(pos: number): void { },
+                getText(): string { return undefined; },
+                getSourceMappingURL(): string { return undefined; },
+                initialize(filePath: string, sourceMapFilePath: string, sourceFiles: SourceFile[], isBundledEmit: boolean): void { },
+                reset(): void { },
+            };
+        }
+
+        return nullSourceMapWriter;
+    }
+
+    export function createSourceMapWriter(host: EmitHost, writer: EmitTextWriter): SourceMapWriter {
+        const compilerOptions = host.getCompilerOptions();
+        let currentSourceFile: SourceFile;
+        let sourceMapDir: string; // The directory in which sourcemap will be
+
+        // Current source map file and its index in the sources list
+        let sourceMapSourceIndex: number;
+
+        // Last recorded and encoded spans
+        let lastRecordedSourceMapSpan: SourceMapSpan;
+        let lastEncodedSourceMapSpan: SourceMapSpan;
+        let lastEncodedNameIndex: number;
+
+        // Source map data
+        let sourceMapData: SourceMapData;
+
+        return {
+            getSourceMapData: () => sourceMapData,
+            setSourceFile,
+            emitPos,
+            emitStart,
+            emitEnd,
+            getText,
+            getSourceMappingURL,
+            initialize,
+            reset,
+        };
+
+        function initialize(filePath: string, sourceMapFilePath: string, sourceFiles: SourceFile[], isBundledEmit: boolean) {
+            if (sourceMapData) {
+                reset();
+            }
+
+            currentSourceFile = undefined;
+
+            // Current source map file and its index in the sources list
+            sourceMapSourceIndex = -1;
+
+            // Last recorded and encoded spans
+            lastRecordedSourceMapSpan = undefined;
+            lastEncodedSourceMapSpan = {
+                emittedLine: 1,
+                emittedColumn: 1,
+                sourceLine: 1,
+                sourceColumn: 1,
+                sourceIndex: 0
+            };
+            lastEncodedNameIndex = 0;
+
+            // Initialize source map data
+            sourceMapData = {
+                sourceMapFilePath: sourceMapFilePath,
+                jsSourceMappingURL: !compilerOptions.inlineSourceMap ? getBaseFileName(normalizeSlashes(sourceMapFilePath)) : undefined,
+                sourceMapFile: getBaseFileName(normalizeSlashes(filePath)),
+                sourceMapSourceRoot: compilerOptions.sourceRoot || "",
+                sourceMapSources: [],
+                inputSourceFileNames: [],
+                sourceMapNames: [],
+                sourceMapMappings: "",
+                sourceMapSourcesContent: compilerOptions.inlineSources ? [] : undefined,
+                sourceMapDecodedMappings: []
+            };
+
+            // Normalize source root and make sure it has trailing "/" so that it can be used to combine paths with the
+            // relative paths of the sources list in the sourcemap
+            sourceMapData.sourceMapSourceRoot = ts.normalizeSlashes(sourceMapData.sourceMapSourceRoot);
+            if (sourceMapData.sourceMapSourceRoot.length && sourceMapData.sourceMapSourceRoot.charCodeAt(sourceMapData.sourceMapSourceRoot.length - 1) !== CharacterCodes.slash) {
+                sourceMapData.sourceMapSourceRoot += directorySeparator;
+            }
+
+            if (compilerOptions.mapRoot) {
+                sourceMapDir = normalizeSlashes(compilerOptions.mapRoot);
+                if (!isBundledEmit) { // emitting single module file
+                    Debug.assert(sourceFiles.length === 1);
+                    // For modules or multiple emit files the mapRoot will have directory structure like the sources
+                    // So if src\a.ts and src\lib\b.ts are compiled together user would be moving the maps into mapRoot\a.js.map and mapRoot\lib\b.js.map
+                    sourceMapDir = getDirectoryPath(getSourceFilePathInNewDir(sourceFiles[0], host, sourceMapDir));
+                }
+
+                if (!isRootedDiskPath(sourceMapDir) && !isUrl(sourceMapDir)) {
+                    // The relative paths are relative to the common directory
+                    sourceMapDir = combinePaths(host.getCommonSourceDirectory(), sourceMapDir);
+                    sourceMapData.jsSourceMappingURL = getRelativePathToDirectoryOrUrl(
+                        getDirectoryPath(normalizePath(filePath)), // get the relative sourceMapDir path based on jsFilePath
+                        combinePaths(sourceMapDir, sourceMapData.jsSourceMappingURL), // this is where user expects to see sourceMap
+                        host.getCurrentDirectory(),
+                        host.getCanonicalFileName,
+                        /*isAbsolutePathAnUrl*/ true);
+                }
+                else {
+                    sourceMapData.jsSourceMappingURL = combinePaths(sourceMapDir, sourceMapData.jsSourceMappingURL);
+                }
+            }
+            else {
+                sourceMapDir = getDirectoryPath(normalizePath(filePath));
+            }
+        }
+
+        function reset() {
+            currentSourceFile = undefined;
+            sourceMapDir = undefined;
+            sourceMapSourceIndex = undefined;
+            lastRecordedSourceMapSpan = undefined;
+            lastEncodedSourceMapSpan = undefined;
+            lastEncodedNameIndex = undefined;
+            sourceMapData = undefined;
+        }
+
+        // Encoding for sourcemap span
+        function encodeLastRecordedSourceMapSpan() {
+            if (!lastRecordedSourceMapSpan || lastRecordedSourceMapSpan === lastEncodedSourceMapSpan) {
+                return;
+            }
+
+            let prevEncodedEmittedColumn = lastEncodedSourceMapSpan.emittedColumn;
+            // Line/Comma delimiters
+            if (lastEncodedSourceMapSpan.emittedLine === lastRecordedSourceMapSpan.emittedLine) {
+                // Emit comma to separate the entry
+                if (sourceMapData.sourceMapMappings) {
+                    sourceMapData.sourceMapMappings += ",";
+                }
+            }
+            else {
+                // Emit line delimiters
+                for (let encodedLine = lastEncodedSourceMapSpan.emittedLine; encodedLine < lastRecordedSourceMapSpan.emittedLine; encodedLine++) {
+                    sourceMapData.sourceMapMappings += ";";
+                }
+                prevEncodedEmittedColumn = 1;
+            }
+
+            // 1. Relative Column 0 based
+            sourceMapData.sourceMapMappings += base64VLQFormatEncode(lastRecordedSourceMapSpan.emittedColumn - prevEncodedEmittedColumn);
+
+            // 2. Relative sourceIndex
+            sourceMapData.sourceMapMappings += base64VLQFormatEncode(lastRecordedSourceMapSpan.sourceIndex - lastEncodedSourceMapSpan.sourceIndex);
+
+            // 3. Relative sourceLine 0 based
+            sourceMapData.sourceMapMappings += base64VLQFormatEncode(lastRecordedSourceMapSpan.sourceLine - lastEncodedSourceMapSpan.sourceLine);
+
+            // 4. Relative sourceColumn 0 based
+            sourceMapData.sourceMapMappings += base64VLQFormatEncode(lastRecordedSourceMapSpan.sourceColumn - lastEncodedSourceMapSpan.sourceColumn);
+
+            // 5. Relative namePosition 0 based
+            if (lastRecordedSourceMapSpan.nameIndex >= 0) {
+                sourceMapData.sourceMapMappings += base64VLQFormatEncode(lastRecordedSourceMapSpan.nameIndex - lastEncodedNameIndex);
+                lastEncodedNameIndex = lastRecordedSourceMapSpan.nameIndex;
+            }
+
+            lastEncodedSourceMapSpan = lastRecordedSourceMapSpan;
+            sourceMapData.sourceMapDecodedMappings.push(lastEncodedSourceMapSpan);
+        }
+
+        function emitPos(pos: number) {
+            if (pos === -1) {
+                return;
+            }
+
+            const sourceLinePos = getLineAndCharacterOfPosition(currentSourceFile, pos);
+
+            // Convert the location to be one-based.
+            sourceLinePos.line++;
+            sourceLinePos.character++;
+
+            const emittedLine = writer.getLine();
+            const emittedColumn = writer.getColumn();
+
+            // If this location wasn't recorded or the location in source is going backwards, record the span
+            if (!lastRecordedSourceMapSpan ||
+                lastRecordedSourceMapSpan.emittedLine !== emittedLine ||
+                lastRecordedSourceMapSpan.emittedColumn !== emittedColumn ||
+                (lastRecordedSourceMapSpan.sourceIndex === sourceMapSourceIndex &&
+                    (lastRecordedSourceMapSpan.sourceLine > sourceLinePos.line ||
+                        (lastRecordedSourceMapSpan.sourceLine === sourceLinePos.line && lastRecordedSourceMapSpan.sourceColumn > sourceLinePos.character)))) {
+
+                // Encode the last recordedSpan before assigning new
+                encodeLastRecordedSourceMapSpan();
+
+                // New span
+                lastRecordedSourceMapSpan = {
+                    emittedLine: emittedLine,
+                    emittedColumn: emittedColumn,
+                    sourceLine: sourceLinePos.line,
+                    sourceColumn: sourceLinePos.character,
+                    sourceIndex: sourceMapSourceIndex
+                };
+            }
+            else {
+                // Take the new pos instead since there is no change in emittedLine and column since last location
+                lastRecordedSourceMapSpan.sourceLine = sourceLinePos.line;
+                lastRecordedSourceMapSpan.sourceColumn = sourceLinePos.character;
+                lastRecordedSourceMapSpan.sourceIndex = sourceMapSourceIndex;
+            }
+        }
+
+        function emitStart(range: TextRange) {
+            const rangeHasDecorators = !!(range as Node).decorators;
+            emitPos(range.pos !== -1 ? skipTrivia(currentSourceFile.text, rangeHasDecorators ? (range as Node).decorators.end : range.pos) : -1);
+        }
+
+        function emitEnd(range: TextRange) {
+            emitPos(range.end);
+        }
+
+        function setSourceFile(sourceFile: SourceFile) {
+            currentSourceFile = sourceFile;
+
+            // Add the file to tsFilePaths
+            // If sourceroot option: Use the relative path corresponding to the common directory path
+            // otherwise source locations relative to map file location
+            const sourcesDirectoryPath = compilerOptions.sourceRoot ? host.getCommonSourceDirectory() : sourceMapDir;
+
+            const source = getRelativePathToDirectoryOrUrl(sourcesDirectoryPath,
+                currentSourceFile.fileName,
+                host.getCurrentDirectory(),
+                host.getCanonicalFileName,
+                /*isAbsolutePathAnUrl*/ true);
+
+            sourceMapSourceIndex = indexOf(sourceMapData.sourceMapSources, source);
+            if (sourceMapSourceIndex === -1) {
+                sourceMapSourceIndex = sourceMapData.sourceMapSources.length;
+                sourceMapData.sourceMapSources.push(source);
+
+                // The one that can be used from program to get the actual source file
+                sourceMapData.inputSourceFileNames.push(sourceFile.fileName);
+
+                if (compilerOptions.inlineSources) {
+                    sourceMapData.sourceMapSourcesContent.push(sourceFile.text);
+                }
+            }
+        }
+
+        function getText() {
+            encodeLastRecordedSourceMapSpan();
+
+            return stringify({
+                version: 3,
+                file: sourceMapData.sourceMapFile,
+                sourceRoot: sourceMapData.sourceMapSourceRoot,
+                sources: sourceMapData.sourceMapSources,
+                names: sourceMapData.sourceMapNames,
+                mappings: sourceMapData.sourceMapMappings,
+                sourcesContent: sourceMapData.sourceMapSourcesContent,
+            });
+        }
+
+        function getSourceMappingURL() {
+            if (compilerOptions.inlineSourceMap) {
+                // Encode the sourceMap into the sourceMap url
+                const base64SourceMapText = convertToBase64(getText());
+                return sourceMapData.jsSourceMappingURL = `data:application/json;base64,${base64SourceMapText}`;
+            }
+            else {
+                return sourceMapData.jsSourceMappingURL;
+            }
+        }
+    }
+
+    const base64Chars = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
+
+    function base64FormatEncode(inValue: number) {
+        if (inValue < 64) {
+            return base64Chars.charAt(inValue);
+        }
+
+        throw TypeError(inValue + ": not a 64 based value");
+    }
+
+    function base64VLQFormatEncode(inValue: number) {
+        // Add a new least significant bit that has the sign of the value.
+        // if negative number the least significant bit that gets added to the number has value 1
+        // else least significant bit value that gets added is 0
+        // eg. -1 changes to binary : 01 [1] => 3
+        //     +1 changes to binary : 01 [0] => 2
+        if (inValue < 0) {
+            inValue = ((-inValue) << 1) + 1;
+        }
+        else {
+            inValue = inValue << 1;
+        }
+
+        // Encode 5 bits at a time starting from least significant bits
+        let encodedStr = "";
+        do {
+            let currentDigit = inValue & 31; // 11111
+            inValue = inValue >> 5;
+            if (inValue > 0) {
+                // There are still more digits to decode, set the msb (6th bit)
+                currentDigit = currentDigit | 32;
+            }
+            encodedStr = encodedStr + base64FormatEncode(currentDigit);
+        } while (inValue > 0);
+
+        return encodedStr;
+    }
+}

src/compiler/utilities.ts

@@ -906,23 +906,6 @@ namespace ts {
         return false;
     }
 
-    export function childIsDecorated(node: Node): boolean {
-        switch (node.kind) {
-            case SyntaxKind.ClassDeclaration:
-                return forEach((<ClassDeclaration>node).members, nodeOrChildIsDecorated);
-
-            case SyntaxKind.MethodDeclaration:
-            case SyntaxKind.SetAccessor:
-                return forEach((<FunctionLikeDeclaration>node).parameters, nodeIsDecorated);
-        }
-
-        return false;
-    }
-
-    export function nodeOrChildIsDecorated(node: Node): boolean {
-        return nodeIsDecorated(node) || childIsDecorated(node);
-    }
-
     export function isPropertyAccessExpression(node: Node): node is PropertyAccessExpression {
         return node.kind === SyntaxKind.PropertyAccessExpression;
     }
@@ -2411,6 +2394,55 @@ namespace ts {
         return output;
     }
 
+    /**
+     * Serialize an object graph into a JSON string. This is intended only for use on an acyclic graph
+     * as the fallback implementation does not check for circular references by default.
+     */
+    export const stringify: (value: any) => string = JSON && JSON.stringify
+        ? JSON.stringify
+        : stringifyFallback;
+
+    /**
+     * Serialize an object graph into a JSON string.
+     */
+    function stringifyFallback(value: any): string {
+        // JSON.stringify returns `undefined` here, instead of the string "undefined".
+        return value === undefined ? undefined : stringifyValue(value);
+    }
+
+    function stringifyValue(value: any): string {
+        return typeof value === "string" ? `"${escapeString(value)}"`
+             : typeof value === "number" ? isFinite(value) ? String(value) : "null"
+             : typeof value === "boolean" ? value ? "true" : "false"
+             : typeof value === "object" && value ? isArray(value) ? cycleCheck(stringifyArray, value) : cycleCheck(stringifyObject, value)
+             : /*fallback*/ "null";
+    }
+
+    function cycleCheck(cb: (value: any) => string, value: any) {
+        Debug.assert(!value.hasOwnProperty("__cycle"), "Converting circular structure to JSON");
+        value.__cycle = true;
+        const result = cb(value);
+        delete value.__cycle;
+        return result;
+    }
+
+    function stringifyArray(value: any) {
+        return `[${reduceLeft(value, stringifyElement, "")}]`;
+    }
+
+    function stringifyElement(memo: string, value: any) {
+        return (memo ? memo + "," : memo) + stringifyValue(value);
+    }
+
+    function stringifyObject(value: any) {
+        return `{${reduceProperties(value, stringifyProperty, "")}}`;
+    }
+
+    function stringifyProperty(memo: string, value: any, key: string) {
+        return value === undefined || typeof value === "function" || key === "__cycle" ? memo
+             : (memo ? memo + "," : memo) + `"${escapeString(key)}":${stringifyValue(value)}`;
+    }
+
     const base64Digits = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=";
 
     /**

src/harness/sourceMapRecorder.ts

@@ -172,7 +172,6 @@ namespace Harness.SourceMapRecoder {
                     return { error: errorDecodeOfEncodedMapping, sourceMapSpan: decodeOfEncodedMapping };
                 }
                 // 5. Check if there is name:
-                decodeOfEncodedMapping.nameIndex = -1;
                 if (!isSourceMappingSegmentEnd()) {
                     prevNameIndex += base64VLQFormatDecode();
                     decodeOfEncodedMapping.nameIndex = prevNameIndex;
@@ -249,7 +248,7 @@ namespace Harness.SourceMapRecoder {
                 mapString += " name (" + sourceMapNames[mapEntry.nameIndex] + ")";
             }
             else {
-                if (mapEntry.nameIndex !== -1 || getAbsentNameIndex) {
+                if ((mapEntry.nameIndex && mapEntry.nameIndex !== -1) || getAbsentNameIndex) {
                     mapString += " nameIndex (" + mapEntry.nameIndex + ")";
                 }
             }

src/services/breakpoints.ts

@@ -16,7 +16,7 @@ namespace ts.BreakpointResolver {
 
         let tokenAtLocation = getTokenAtPosition(sourceFile, position);
         let lineOfPosition = sourceFile.getLineAndCharacterOfPosition(position).line;
-        if (sourceFile.getLineAndCharacterOfPosition(tokenAtLocation.getStart()).line > lineOfPosition) {
+        if (sourceFile.getLineAndCharacterOfPosition(tokenAtLocation.getStart(sourceFile)).line > lineOfPosition) {
             // Get previous token if the token is returned starts on new line
             // eg: let x =10; |--- cursor is here
             //     let y = 10; 
@@ -39,16 +39,23 @@ namespace ts.BreakpointResolver {
         return spanInNode(tokenAtLocation);
 
         function textSpan(startNode: Node, endNode?: Node) {
-            return createTextSpanFromBounds(startNode.getStart(), (endNode || startNode).getEnd());
+            const start = startNode.decorators ?
+                skipTrivia(sourceFile.text, startNode.decorators.end) :
+                startNode.getStart(sourceFile);
+            return createTextSpanFromBounds(start, (endNode || startNode).getEnd());
         }
 
         function spanInNodeIfStartsOnSameLine(node: Node, otherwiseOnNode?: Node): TextSpan {
-            if (node && lineOfPosition === sourceFile.getLineAndCharacterOfPosition(node.getStart()).line) {
+            if (node && lineOfPosition === sourceFile.getLineAndCharacterOfPosition(node.getStart(sourceFile)).line) {
                 return spanInNode(node);
             }
             return spanInNode(otherwiseOnNode);
         }
 
+        function spanInNodeArray<T>(nodeArray: NodeArray<T>) {
+            return createTextSpanFromBounds(skipTrivia(sourceFile.text, nodeArray.pos), nodeArray.end);
+        }
+
         function spanInPreviousNode(node: Node): TextSpan {
             return spanInNode(findPrecedingToken(node.pos, sourceFile));
         }
@@ -65,6 +72,11 @@ namespace ts.BreakpointResolver {
                         return spanInPreviousNode(node);
                     }
 
+                    if (node.parent.kind === SyntaxKind.Decorator) {
+                        // Set breakpoint on the decorator emit
+                        return spanInNode(node.parent);
+                    }
+
                     if (node.parent.kind === SyntaxKind.ForStatement) {
                         // For now lets set the span on this expression, fix it later
                         return textSpan(node);
@@ -207,6 +219,9 @@ namespace ts.BreakpointResolver {
                         // span in statement
                         return spanInNode((<WithStatement>node).statement);
 
+                    case SyntaxKind.Decorator:
+                        return spanInNodeArray(node.parent.decorators);
+
                     // No breakpoint in interface, type alias
                     case SyntaxKind.InterfaceDeclaration:
                     case SyntaxKind.TypeAliasDeclaration:

src/services/services.ts

@@ -1901,7 +1901,7 @@ namespace ts {
                     sourceMapText = text;
                 }
                 else {
-                    Debug.assert(outputText === undefined, "Unexpected multiple outputs for the file: " + name);
+                    Debug.assert(outputText === undefined, `Unexpected multiple outputs for the file: '${name}'`);
                     outputText = text;
                 }
             },
@@ -4248,28 +4248,31 @@ namespace ts {
                 }
                 else {
                     // Method/function type parameter
-                    let container = getContainingFunction(location);
-                    if (container) {
-                        let signatureDeclaration = <SignatureDeclaration>getDeclarationOfKind(symbol, SyntaxKind.TypeParameter).parent;
-                        let signature = typeChecker.getSignatureFromDeclaration(signatureDeclaration);
-                        if (signatureDeclaration.kind === SyntaxKind.ConstructSignature) {
-                            displayParts.push(keywordPart(SyntaxKind.NewKeyword));
+                    let declaration = <Node>getDeclarationOfKind(symbol, SyntaxKind.TypeParameter);
+                    Debug.assert(declaration !== undefined);
+                    declaration = declaration.parent;
+
+                    if (declaration) {
+                        if (isFunctionLikeKind(declaration.kind)) {
+                            const signature = typeChecker.getSignatureFromDeclaration(<SignatureDeclaration>declaration);
+                            if (declaration.kind === SyntaxKind.ConstructSignature) {
+                                displayParts.push(keywordPart(SyntaxKind.NewKeyword));
+                                displayParts.push(spacePart());
+                            }
+                            else if (declaration.kind !== SyntaxKind.CallSignature && (<SignatureDeclaration>declaration).name) {
+                                addFullSymbolName(declaration.symbol);
+                            }
+                            addRange(displayParts, signatureToDisplayParts(typeChecker, signature, sourceFile, TypeFormatFlags.WriteTypeArgumentsOfSignature));
+                        }
+                        else {
+                            // Type alias type parameter
+                            // For example
+                            //      type list<T> = T[];  // Both T will go through same code path
+                            displayParts.push(keywordPart(SyntaxKind.TypeKeyword));
                             displayParts.push(spacePart());
+                            addFullSymbolName(declaration.symbol);
+                            writeTypeParametersOfSymbol(declaration.symbol, sourceFile);
                         }
-                        else if (signatureDeclaration.kind !== SyntaxKind.CallSignature && signatureDeclaration.name) {
-                            addFullSymbolName(signatureDeclaration.symbol);
-                        }
-                        addRange(displayParts, signatureToDisplayParts(typeChecker, signature, sourceFile, TypeFormatFlags.WriteTypeArgumentsOfSignature));
-                    }
-                    else {
-                        // Type  aliash type parameter
-                        // For example
-                        //      type list<T> = T[];  // Both T will go through same code path
-                        let declaration = <TypeAliasDeclaration>getDeclarationOfKind(symbol, SyntaxKind.TypeParameter).parent;
-                        displayParts.push(keywordPart(SyntaxKind.TypeKeyword));
-                        displayParts.push(spacePart());
-                        addFullSymbolName(declaration.symbol);
-                        writeTypeParametersOfSymbol(declaration.symbol, sourceFile);
                     }
                 }
             }

tests/baselines/reference/ES5For-of8.js.map

@@ -1,2 +1,2 @@
 //// [ES5For-of8.js.map]
-{"version":3,"file":"ES5For-of8.js","sourceRoot":"","sources":["ES5For-of8.ts"],"names":["foo"],"mappings":"AAAA;IACIA,MAAMA,CAACA,EAAEA,CAACA,EAAEA,CAACA,EAAEA,CAACA;AACpBA,CAACA;AACD,GAAG,CAAC,CAAY,UAAe,EAAf,MAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,EAA1B,cAAO,EAAP,IAA0B,CAAC;IAA3B,GAAG,EAAE,CAAC,CAAC,SAAA;IACR,IAAI,CAAC,GAAG,GAAG,EAAE,CAAC,CAAC,CAAC;CACnB"}
+{"version":3,"file":"ES5For-of8.js","sourceRoot":"","sources":["ES5For-of8.ts"],"names":[],"mappings":"AAAA;IACI,MAAM,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC;AACpB,CAAC;AACD,GAAG,CAAC,CAAY,UAAe,EAAf,MAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,EAA1B,cAAO,EAAP,IAA0B,CAAC;IAA3B,GAAG,EAAE,CAAC,CAAC,SAAA;IACR,IAAI,CAAC,GAAG,GAAG,EAAE,CAAC,CAAC,CAAC;CACnB"}

tests/baselines/reference/ES5For-of8.sourcemap.txt

@@ -34,15 +34,15 @@ sourceFile:ES5For-of8.ts
 7 >                0
 8 >                  }
 9 >                   ;
-1->Emitted(2, 5) Source(2, 5) + SourceIndex(0) name (foo)
-2 >Emitted(2, 11) Source(2, 11) + SourceIndex(0) name (foo)
-3 >Emitted(2, 12) Source(2, 12) + SourceIndex(0) name (foo)
-4 >Emitted(2, 14) Source(2, 14) + SourceIndex(0) name (foo)
-5 >Emitted(2, 15) Source(2, 15) + SourceIndex(0) name (foo)
-6 >Emitted(2, 17) Source(2, 17) + SourceIndex(0) name (foo)
-7 >Emitted(2, 18) Source(2, 18) + SourceIndex(0) name (foo)
-8 >Emitted(2, 20) Source(2, 20) + SourceIndex(0) name (foo)
-9 >Emitted(2, 21) Source(2, 21) + SourceIndex(0) name (foo)
+1->Emitted(2, 5) Source(2, 5) + SourceIndex(0)
+2 >Emitted(2, 11) Source(2, 11) + SourceIndex(0)
+3 >Emitted(2, 12) Source(2, 12) + SourceIndex(0)
+4 >Emitted(2, 14) Source(2, 14) + SourceIndex(0)
+5 >Emitted(2, 15) Source(2, 15) + SourceIndex(0)
+6 >Emitted(2, 17) Source(2, 17) + SourceIndex(0)
+7 >Emitted(2, 18) Source(2, 18) + SourceIndex(0)
+8 >Emitted(2, 20) Source(2, 20) + SourceIndex(0)
+9 >Emitted(2, 21) Source(2, 21) + SourceIndex(0)
 ---
 >>>}
 1 >
@@ -51,8 +51,8 @@ sourceFile:ES5For-of8.ts
 1 >
   >
 2 >}
-1 >Emitted(3, 1) Source(3, 1) + SourceIndex(0) name (foo)
-2 >Emitted(3, 2) Source(3, 2) + SourceIndex(0) name (foo)
+1 >Emitted(3, 1) Source(3, 1) + SourceIndex(0)
+2 >Emitted(3, 2) Source(3, 2) + SourceIndex(0)
 ---
 >>>for (var _i = 0, _a = ['a', 'b', 'c']; _i < _a.length; _i++) {
 1->

tests/baselines/reference/asyncMultiFile.js

@@ -0,0 +1,26 @@
+//// [tests/cases/conformance/async/es6/asyncMultiFile.ts] ////
+
+//// [a.ts]
+async function f() {}
+//// [b.ts]
+function g() { }
+
+//// [a.js]
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promise, generator) {
+    return new Promise(function (resolve, reject) {
+        generator = generator.call(thisArg, _arguments);
+        function cast(value) { return value instanceof Promise && value.constructor === Promise ? value : new Promise(function (resolve) { resolve(value); }); }
+        function onfulfill(value) { try { step("next", value); } catch (e) { reject(e); } }
+        function onreject(value) { try { step("throw", value); } catch (e) { reject(e); } }
+        function step(verb, value) {
+            var result = generator[verb](value);
+            result.done ? resolve(result.value) : cast(result.value).then(onfulfill, onreject);
+        }
+        step("next", void 0);
+    });
+};
+function f() {
+    return __awaiter(this, void 0, Promise, function* () { });
+}
+//// [b.js]
+function g() { }

tests/baselines/reference/asyncMultiFile.symbols

@@ -0,0 +1,8 @@
+=== tests/cases/conformance/async/es6/a.ts ===
+async function f() {}
+>f : Symbol(f, Decl(a.ts, 0, 0))
+
+=== tests/cases/conformance/async/es6/b.ts ===
+function g() { }
+>g : Symbol(g, Decl(b.ts, 0, 0))
+

tests/baselines/reference/asyncMultiFile.types

@@ -0,0 +1,8 @@
+=== tests/cases/conformance/async/es6/a.ts ===
+async function f() {}
+>f : () => Promise<void>
+
+=== tests/cases/conformance/async/es6/b.ts ===
+function g() { }
+>g : () => void
+

tests/baselines/reference/bpSpan_decorators.baseline

@@ -0,0 +1,384 @@
+
+1  >declare function ClassDecorator1(target: Function): void;
+
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~=> Pos: (0 to 57)  SpanInfo: undefined
+--------------------------------
+2  >declare function ClassDecorator2(x: number): (target: Function) => void;
+
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~=> Pos: (58 to 130)  SpanInfo: undefined
+--------------------------------
+3  >declare function PropertyDecorator1(target: Object, key: string | symbol, descriptor?: PropertyDescriptor): void;
+
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~=> Pos: (131 to 244)  SpanInfo: undefined
+--------------------------------
+4  >declare function PropertyDecorator2(x: number): (target: Object, key: string | symbol, descriptor?: PropertyDescriptor) => void;
+
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~=> Pos: (245 to 373)  SpanInfo: undefined
+--------------------------------
+5  >declare function ParameterDecorator1(target: Object, key: string | symbol, paramIndex: number): void;
+
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~=> Pos: (374 to 475)  SpanInfo: undefined
+--------------------------------
+6  >declare function ParameterDecorator2(x: number): (target: Object, key: string | symbol, paramIndex: number) => void;
+
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~=> Pos: (476 to 592)  SpanInfo: undefined
+--------------------------------
+7  >
+
+    ~                                             => Pos: (593 to 593)  SpanInfo: undefined
+--------------------------------
+8  >@ClassDecorator1
+
+    ~~~~~~~~~~~~~~~~~                             => Pos: (594 to 610)  SpanInfo: {"start":594,"length":37}
+    >@ClassDecorator1
+    >@ClassDecorator2(10)
+    >:=> (line 8, col 0) to (line 9, col 20)
+--------------------------------
+9  >@ClassDecorator2(10)
+
+    ~~~~~~~~~~~~~~~~~~~~~                         => Pos: (611 to 631)  SpanInfo: {"start":594,"length":37}
+    >@ClassDecorator1
+    >@ClassDecorator2(10)
+    >:=> (line 8, col 0) to (line 9, col 20)
+--------------------------------
+10 >class Greeter {
+
+    ~~~~~~~~~~~~~~~~                              => Pos: (632 to 647)  SpanInfo: {"start":632,"length":914}
+    >class Greeter {
+    >    constructor(
+    >        @ParameterDecorator1
+    >        @ParameterDecorator2(20)
+    >        public greeting: string,
+    >
+    >        @ParameterDecorator1
+    >        @ParameterDecorator2(30)
+    >            ...b: string[]) {
+    >    }
+    >
+    >    @PropertyDecorator1
+    >    @PropertyDecorator2(40)
+    >    greet() {
+    >        return "<h1>" + this.greeting + "</h1>";
+    >    }
+    >
+    >    @PropertyDecorator1
+    >    @PropertyDecorator2(50)
+    >    private x: string;
+    >
+    >    @PropertyDecorator1
+    >    @PropertyDecorator2(60)
+    >    private static x1: number = 10;
+    >
+    >    private fn(
+    >        @ParameterDecorator1
+    >        @ParameterDecorator2(70)
+    >        x: number) {
+    >        return this.greeting;
+    >    }
+    >
+    >    @PropertyDecorator1
+    >    @PropertyDecorator2(80)
+    >    get greetings() {
+    >        return this.greeting;
+    >    }
+    >
+    >    set greetings(
+    >        @ParameterDecorator1
+    >        @ParameterDecorator2(90)
+    >        greetings: string) {
+    >        this.greeting = greetings;
+    >    }
+    >}
+    >:=> (line 10, col 0) to (line 54, col 1)
+--------------------------------
+11 >    constructor(
+
+    ~~~~~~~~~~~~~~~~~                             => Pos: (648 to 664)  SpanInfo: {"start":857,"length":1}
+    >}
+    >:=> (line 19, col 4) to (line 19, col 5)
+--------------------------------
+12 >        @ParameterDecorator1
+
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~                 => Pos: (665 to 693)  SpanInfo: {"start":673,"length":53}
+    >@ParameterDecorator1
+    >        @ParameterDecorator2(20)
+    >:=> (line 12, col 8) to (line 13, col 32)
+--------------------------------
+13 >        @ParameterDecorator2(20)
+
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~             => Pos: (694 to 726)  SpanInfo: {"start":673,"length":53}
+    >@ParameterDecorator1
+    >        @ParameterDecorator2(20)
+    >:=> (line 12, col 8) to (line 13, col 32)
+--------------------------------
+14 >        public greeting: string,
+
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~             => Pos: (727 to 759)  SpanInfo: {"start":735,"length":23}
+    >public greeting: string
+    >:=> (line 14, col 8) to (line 14, col 31)
+--------------------------------
+15 >
+
+    ~                                             => Pos: (760 to 760)  SpanInfo: undefined
+--------------------------------
+16 >        @ParameterDecorator1
+
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~                 => Pos: (761 to 789)  SpanInfo: {"start":769,"length":53}
+    >@ParameterDecorator1
+    >        @ParameterDecorator2(30)
+    >:=> (line 16, col 8) to (line 17, col 32)
+--------------------------------
+17 >        @ParameterDecorator2(30)
+
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~             => Pos: (790 to 822)  SpanInfo: {"start":769,"length":53}
+    >@ParameterDecorator1
+    >        @ParameterDecorator2(30)
+    >:=> (line 16, col 8) to (line 17, col 32)
+--------------------------------
+18 >            ...b: string[]) {
+
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~                   => Pos: (823 to 849)  SpanInfo: {"start":835,"length":14}
+    >...b: string[]
+    >:=> (line 18, col 12) to (line 18, col 26)
+18 >            ...b: string[]) {
+
+                               ~~~                => Pos: (850 to 852)  SpanInfo: {"start":857,"length":1}
+    >}
+    >:=> (line 19, col 4) to (line 19, col 5)
+--------------------------------
+19 >    }
+
+    ~~~~~~                                        => Pos: (853 to 858)  SpanInfo: {"start":857,"length":1}
+    >}
+    >:=> (line 19, col 4) to (line 19, col 5)
+--------------------------------
+20 >
+
+    ~                                             => Pos: (859 to 859)  SpanInfo: undefined
+--------------------------------
+21 >    @PropertyDecorator1
+
+    ~~~~~~~~~~~~~~~~~~~~~~~~                      => Pos: (860 to 883)  SpanInfo: {"start":864,"length":47}
+    >@PropertyDecorator1
+    >    @PropertyDecorator2(40)
+    >:=> (line 21, col 4) to (line 22, col 27)
+--------------------------------
+22 >    @PropertyDecorator2(40)
+
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~                  => Pos: (884 to 911)  SpanInfo: {"start":864,"length":47}
+    >@PropertyDecorator1
+    >    @PropertyDecorator2(40)
+    >:=> (line 21, col 4) to (line 22, col 27)
+--------------------------------
+23 >    greet() {
+
+    ~~~~~~~~~~~                                   => Pos: (912 to 922)  SpanInfo: {"start":916,"length":64}
+    >greet() {
+    >        return "<h1>" + this.greeting + "</h1>";
+    >    }
+    >:=> (line 23, col 4) to (line 25, col 5)
+23 >    greet() {
+
+               ~~~                                => Pos: (923 to 925)  SpanInfo: {"start":934,"length":39}
+    >return "<h1>" + this.greeting + "</h1>"
+    >:=> (line 24, col 8) to (line 24, col 47)
+--------------------------------
+24 >        return "<h1>" + this.greeting + "</h1>";
+
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~=> Pos: (926 to 974)  SpanInfo: {"start":934,"length":39}
+    >return "<h1>" + this.greeting + "</h1>"
+    >:=> (line 24, col 8) to (line 24, col 47)
+--------------------------------
+25 >    }
+
+    ~~~~~~                                        => Pos: (975 to 980)  SpanInfo: {"start":979,"length":1}
+    >}
+    >:=> (line 25, col 4) to (line 25, col 5)
+--------------------------------
+26 >
+
+    ~                                             => Pos: (981 to 981)  SpanInfo: undefined
+--------------------------------
+27 >    @PropertyDecorator1
+
+    ~~~~~~~~~~~~~~~~~~~~~~~~                      => Pos: (982 to 1005)  SpanInfo: {"start":986,"length":47}
+    >@PropertyDecorator1
+    >    @PropertyDecorator2(50)
+    >:=> (line 27, col 4) to (line 28, col 27)
+--------------------------------
+28 >    @PropertyDecorator2(50)
+
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~                  => Pos: (1006 to 1033)  SpanInfo: {"start":986,"length":47}
+    >@PropertyDecorator1
+    >    @PropertyDecorator2(50)
+    >:=> (line 27, col 4) to (line 28, col 27)
+--------------------------------
+29 >    private x: string;
+
+    ~~~~~~~~~~~~~~~~~~~~~~~                       => Pos: (1034 to 1056)  SpanInfo: undefined
+--------------------------------
+30 >
+
+    ~                                             => Pos: (1057 to 1057)  SpanInfo: undefined
+--------------------------------
+31 >    @PropertyDecorator1
+
+    ~~~~~~~~~~~~~~~~~~~~~~~~                      => Pos: (1058 to 1081)  SpanInfo: {"start":1062,"length":47}
+    >@PropertyDecorator1
+    >    @PropertyDecorator2(60)
+    >:=> (line 31, col 4) to (line 32, col 27)
+--------------------------------
+32 >    @PropertyDecorator2(60)
+
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~                  => Pos: (1082 to 1109)  SpanInfo: {"start":1062,"length":47}
+    >@PropertyDecorator1
+    >    @PropertyDecorator2(60)
+    >:=> (line 31, col 4) to (line 32, col 27)
+--------------------------------
+33 >    private static x1: number = 10;
+
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~          => Pos: (1110 to 1145)  SpanInfo: {"start":1114,"length":31}
+    >private static x1: number = 10;
+    >:=> (line 33, col 4) to (line 33, col 35)
+--------------------------------
+34 >
+
+    ~                                             => Pos: (1146 to 1146)  SpanInfo: undefined
+--------------------------------
+35 >    private fn(
+
+    ~~~~~~~~~~~~~~~~                              => Pos: (1147 to 1162)  SpanInfo: {"start":1151,"length":130}
+    >private fn(
+    >        @ParameterDecorator1
+    >        @ParameterDecorator2(70)
+    >        x: number) {
+    >        return this.greeting;
+    >    }
+    >:=> (line 35, col 4) to (line 40, col 5)
+--------------------------------
+36 >        @ParameterDecorator1
+
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~                 => Pos: (1163 to 1191)  SpanInfo: {"start":1171,"length":53}
+    >@ParameterDecorator1
+    >        @ParameterDecorator2(70)
+    >:=> (line 36, col 8) to (line 37, col 32)
+--------------------------------
+37 >        @ParameterDecorator2(70)
+
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~             => Pos: (1192 to 1224)  SpanInfo: {"start":1171,"length":53}
+    >@ParameterDecorator1
+    >        @ParameterDecorator2(70)
+    >:=> (line 36, col 8) to (line 37, col 32)
+--------------------------------
+38 >        x: number) {
+
+    ~~~~~~~~~~~~~~~~~~~~~                         => Pos: (1225 to 1245)  SpanInfo: {"start":1254,"length":20}
+    >return this.greeting
+    >:=> (line 39, col 8) to (line 39, col 28)
+--------------------------------
+39 >        return this.greeting;
+
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~                => Pos: (1246 to 1275)  SpanInfo: {"start":1254,"length":20}
+    >return this.greeting
+    >:=> (line 39, col 8) to (line 39, col 28)
+--------------------------------
+40 >    }
+
+    ~~~~~~                                        => Pos: (1276 to 1281)  SpanInfo: {"start":1280,"length":1}
+    >}
+    >:=> (line 40, col 4) to (line 40, col 5)
+--------------------------------
+41 >
+
+    ~                                             => Pos: (1282 to 1282)  SpanInfo: undefined
+--------------------------------
+42 >    @PropertyDecorator1
+
+    ~~~~~~~~~~~~~~~~~~~~~~~~                      => Pos: (1283 to 1306)  SpanInfo: {"start":1287,"length":47}
+    >@PropertyDecorator1
+    >    @PropertyDecorator2(80)
+    >:=> (line 42, col 4) to (line 43, col 27)
+--------------------------------
+43 >    @PropertyDecorator2(80)
+
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~                  => Pos: (1307 to 1334)  SpanInfo: {"start":1287,"length":47}
+    >@PropertyDecorator1
+    >    @PropertyDecorator2(80)
+    >:=> (line 42, col 4) to (line 43, col 27)
+--------------------------------
+44 >    get greetings() {
+
+    ~~~~~~~~~~~~~~~~~~~                           => Pos: (1335 to 1353)  SpanInfo: {"start":1339,"length":53}
+    >get greetings() {
+    >        return this.greeting;
+    >    }
+    >:=> (line 44, col 4) to (line 46, col 5)
+44 >    get greetings() {
+
+                       ~~~                        => Pos: (1354 to 1356)  SpanInfo: {"start":1365,"length":20}
+    >return this.greeting
+    >:=> (line 45, col 8) to (line 45, col 28)
+--------------------------------
+45 >        return this.greeting;
+
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~                => Pos: (1357 to 1386)  SpanInfo: {"start":1365,"length":20}
+    >return this.greeting
+    >:=> (line 45, col 8) to (line 45, col 28)
+--------------------------------
+46 >    }
+
+    ~~~~~~                                        => Pos: (1387 to 1392)  SpanInfo: {"start":1391,"length":1}
+    >}
+    >:=> (line 46, col 4) to (line 46, col 5)
+--------------------------------
+47 >
+
+    ~                                             => Pos: (1393 to 1393)  SpanInfo: undefined
+--------------------------------
+48 >    set greetings(
+
+    ~~~~~~~~~~~~~~~~~~~                           => Pos: (1394 to 1412)  SpanInfo: {"start":1398,"length":146}
+    >set greetings(
+    >        @ParameterDecorator1
+    >        @ParameterDecorator2(90)
+    >        greetings: string) {
+    >        this.greeting = greetings;
+    >    }
+    >:=> (line 48, col 4) to (line 53, col 5)
+--------------------------------
+49 >        @ParameterDecorator1
+
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~                 => Pos: (1413 to 1441)  SpanInfo: {"start":1421,"length":53}
+    >@ParameterDecorator1
+    >        @ParameterDecorator2(90)
+    >:=> (line 49, col 8) to (line 50, col 32)
+--------------------------------
+50 >        @ParameterDecorator2(90)
+
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~             => Pos: (1442 to 1474)  SpanInfo: {"start":1421,"length":53}
+    >@ParameterDecorator1
+    >        @ParameterDecorator2(90)
+    >:=> (line 49, col 8) to (line 50, col 32)
+--------------------------------
+51 >        greetings: string) {
+
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~                 => Pos: (1475 to 1503)  SpanInfo: {"start":1512,"length":25}
+    >this.greeting = greetings
+    >:=> (line 52, col 8) to (line 52, col 33)
+--------------------------------
+52 >        this.greeting = greetings;
+
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~           => Pos: (1504 to 1538)  SpanInfo: {"start":1512,"length":25}
+    >this.greeting = greetings
+    >:=> (line 52, col 8) to (line 52, col 33)
+--------------------------------
+53 >    }
+
+    ~~~~~~                                        => Pos: (1539 to 1544)  SpanInfo: {"start":1543,"length":1}
+    >}
+    >:=> (line 53, col 4) to (line 53, col 5)
+--------------------------------
+54 >}
+    ~                                             => Pos: (1545 to 1545)  SpanInfo: {"start":1545,"length":1}
+    >}
+    >:=> (line 54, col 0) to (line 54, col 1)

tests/baselines/reference/computedPropertyNamesSourceMap1_ES5.js.map

@@ -1,2 +1,2 @@
 //// [computedPropertyNamesSourceMap1_ES5.js.map]
-{"version":3,"file":"computedPropertyNamesSourceMap1_ES5.js","sourceRoot":"","sources":["computedPropertyNamesSourceMap1_ES5.ts"],"names":["C","C.constructor","C[\"hello\"]"],"mappings":"AAAA;IAAAA;IAIAC,CAACA;IAHGD,YAACA,OAAOA,CAACA,GAATA;QACIE,QAAQA,CAACA;IACbA,CAACA;IACLF,QAACA;AAADA,CAACA,AAJD,IAIC"}
+{"version":3,"file":"computedPropertyNamesSourceMap1_ES5.js","sourceRoot":"","sources":["computedPropertyNamesSourceMap1_ES5.ts"],"names":[],"mappings":"AAAA;IAAA;IAIA,CAAC;IAHG,YAAC,OAAO,CAAC,GAAT;QACI,QAAQ,CAAC;IACb,CAAC;IACL,QAAC;AAAD,CAAC,AAJD,IAIC"}

tests/baselines/reference/computedPropertyNamesSourceMap1_ES5.sourcemap.txt

@@ -18,7 +18,7 @@ sourceFile:computedPropertyNamesSourceMap1_ES5.ts
 1->^^^^
 2 >    ^^->
 1->
-1->Emitted(2, 5) Source(1, 1) + SourceIndex(0) name (C)
+1->Emitted(2, 5) Source(1, 1) + SourceIndex(0)
 ---
 >>>    }
 1->^^^^
@@ -30,8 +30,8 @@ sourceFile:computedPropertyNamesSourceMap1_ES5.ts
   >    }
   >
 2 >    }
-1->Emitted(3, 5) Source(5, 1) + SourceIndex(0) name (C.constructor)
-2 >Emitted(3, 6) Source(5, 2) + SourceIndex(0) name (C.constructor)
+1->Emitted(3, 5) Source(5, 1) + SourceIndex(0)
+2 >Emitted(3, 6) Source(5, 2) + SourceIndex(0)
 ---
 >>>    C.prototype["hello"] = function () {
 1->^^^^
@@ -44,11 +44,11 @@ sourceFile:computedPropertyNamesSourceMap1_ES5.ts
 3 >                "hello"
 4 >                       ]
 5 >                        
-1->Emitted(4, 5) Source(2, 5) + SourceIndex(0) name (C)
-2 >Emitted(4, 17) Source(2, 6) + SourceIndex(0) name (C)
-3 >Emitted(4, 24) Source(2, 13) + SourceIndex(0) name (C)
-4 >Emitted(4, 25) Source(2, 14) + SourceIndex(0) name (C)
-5 >Emitted(4, 28) Source(2, 5) + SourceIndex(0) name (C)
+1->Emitted(4, 5) Source(2, 5) + SourceIndex(0)
+2 >Emitted(4, 17) Source(2, 6) + SourceIndex(0)
+3 >Emitted(4, 24) Source(2, 13) + SourceIndex(0)
+4 >Emitted(4, 25) Source(2, 14) + SourceIndex(0)
+5 >Emitted(4, 28) Source(2, 5) + SourceIndex(0)
 ---
 >>>        debugger;
 1 >^^^^^^^^
@@ -58,9 +58,9 @@ sourceFile:computedPropertyNamesSourceMap1_ES5.ts
   >        
 2 >        debugger
 3 >                ;
-1 >Emitted(5, 9) Source(3, 9) + SourceIndex(0) name (C["hello"])
-2 >Emitted(5, 17) Source(3, 17) + SourceIndex(0) name (C["hello"])
-3 >Emitted(5, 18) Source(3, 18) + SourceIndex(0) name (C["hello"])
+1 >Emitted(5, 9) Source(3, 9) + SourceIndex(0)
+2 >Emitted(5, 17) Source(3, 17) + SourceIndex(0)
+3 >Emitted(5, 18) Source(3, 18) + SourceIndex(0)
 ---
 >>>    };
 1 >^^^^
@@ -69,8 +69,8 @@ sourceFile:computedPropertyNamesSourceMap1_ES5.ts
 1 >
   >    
 2 >    }
-1 >Emitted(6, 5) Source(4, 5) + SourceIndex(0) name (C["hello"])
-2 >Emitted(6, 6) Source(4, 6) + SourceIndex(0) name (C["hello"])
+1 >Emitted(6, 5) Source(4, 5) + SourceIndex(0)
+2 >Emitted(6, 6) Source(4, 6) + SourceIndex(0)
 ---
 >>>    return C;
 1->^^^^
@@ -78,8 +78,8 @@ sourceFile:computedPropertyNamesSourceMap1_ES5.ts
 1->
   >
 2 >    }
-1->Emitted(7, 5) Source(5, 1) + SourceIndex(0) name (C)
-2 >Emitted(7, 13) Source(5, 2) + SourceIndex(0) name (C)
+1->Emitted(7, 5) Source(5, 1) + SourceIndex(0)
+2 >Emitted(7, 13) Source(5, 2) + SourceIndex(0)
 ---
 >>>})();
 1 >
@@ -95,8 +95,8 @@ sourceFile:computedPropertyNamesSourceMap1_ES5.ts
   >         debugger;
   >     }
   > }
-1 >Emitted(8, 1) Source(5, 1) + SourceIndex(0) name (C)
-2 >Emitted(8, 2) Source(5, 2) + SourceIndex(0) name (C)
+1 >Emitted(8, 1) Source(5, 1) + SourceIndex(0)
+2 >Emitted(8, 2) Source(5, 2) + SourceIndex(0)
 3 >Emitted(8, 2) Source(1, 1) + SourceIndex(0)
 4 >Emitted(8, 6) Source(5, 2) + SourceIndex(0)
 ---

tests/baselines/reference/computedPropertyNamesSourceMap1_ES6.js.map

@@ -1,2 +1,2 @@
 //// [computedPropertyNamesSourceMap1_ES6.js.map]
-{"version":3,"file":"computedPropertyNamesSourceMap1_ES6.js","sourceRoot":"","sources":["computedPropertyNamesSourceMap1_ES6.ts"],"names":["C","C[\"hello\"]"],"mappings":"AAAA;IACIA,CAACA,OAAOA,CAACA;QACLC,QAAQA,CAACA;IACbA,CAACA;AACLD,CAACA;AAAA"}
+{"version":3,"file":"computedPropertyNamesSourceMap1_ES6.js","sourceRoot":"","sources":["computedPropertyNamesSourceMap1_ES6.ts"],"names":[],"mappings":"AAAA;IACI,CAAC,OAAO,CAAC;QACL,QAAQ,CAAC;IACb,CAAC;AACL,CAAC;AAAA"}

tests/baselines/reference/computedPropertyNamesSourceMap1_ES6.sourcemap.txt

@@ -25,10 +25,10 @@ sourceFile:computedPropertyNamesSourceMap1_ES6.ts
 2 >    [
 3 >     "hello"
 4 >            ]
-1->Emitted(2, 5) Source(2, 5) + SourceIndex(0) name (C)
-2 >Emitted(2, 6) Source(2, 6) + SourceIndex(0) name (C)
-3 >Emitted(2, 13) Source(2, 13) + SourceIndex(0) name (C)
-4 >Emitted(2, 14) Source(2, 14) + SourceIndex(0) name (C)
+1->Emitted(2, 5) Source(2, 5) + SourceIndex(0)
+2 >Emitted(2, 6) Source(2, 6) + SourceIndex(0)
+3 >Emitted(2, 13) Source(2, 13) + SourceIndex(0)
+4 >Emitted(2, 14) Source(2, 14) + SourceIndex(0)
 ---
 >>>        debugger;
 1->^^^^^^^^
@@ -38,9 +38,9 @@ sourceFile:computedPropertyNamesSourceMap1_ES6.ts
   >        
 2 >        debugger
 3 >                ;
-1->Emitted(3, 9) Source(3, 9) + SourceIndex(0) name (C["hello"])
-2 >Emitted(3, 17) Source(3, 17) + SourceIndex(0) name (C["hello"])
-3 >Emitted(3, 18) Source(3, 18) + SourceIndex(0) name (C["hello"])
+1->Emitted(3, 9) Source(3, 9) + SourceIndex(0)
+2 >Emitted(3, 17) Source(3, 17) + SourceIndex(0)
+3 >Emitted(3, 18) Source(3, 18) + SourceIndex(0)
 ---
 >>>    }
 1 >^^^^
@@ -48,8 +48,8 @@ sourceFile:computedPropertyNamesSourceMap1_ES6.ts
 1 >
   >    
 2 >    }
-1 >Emitted(4, 5) Source(4, 5) + SourceIndex(0) name (C["hello"])
-2 >Emitted(4, 6) Source(4, 6) + SourceIndex(0) name (C["hello"])
+1 >Emitted(4, 5) Source(4, 5) + SourceIndex(0)
+2 >Emitted(4, 6) Source(4, 6) + SourceIndex(0)
 ---
 >>>}
 1 >
@@ -58,8 +58,8 @@ sourceFile:computedPropertyNamesSourceMap1_ES6.ts
 1 >
   >
 2 >}
-1 >Emitted(5, 1) Source(5, 1) + SourceIndex(0) name (C)
-2 >Emitted(5, 2) Source(5, 2) + SourceIndex(0) name (C)
+1 >Emitted(5, 1) Source(5, 1) + SourceIndex(0)
+2 >Emitted(5, 2) Source(5, 2) + SourceIndex(0)
 ---
 >>>//# sourceMappingURL=computedPropertyNamesSourceMap1_ES6.js.map1->
 2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->

tests/baselines/reference/computedPropertyNamesSourceMap2_ES5.js.map

@@ -1,2 +1,2 @@
 //// [computedPropertyNamesSourceMap2_ES5.js.map]
-{"version":3,"file":"computedPropertyNamesSourceMap2_ES5.js","sourceRoot":"","sources":["computedPropertyNamesSourceMap2_ES5.ts"],"names":["[\"hello\"]"],"mappings":"AAAA,IAAI,CAAC,GAAG;IACJ,GAAC,OAAO,CAAC,GAAT;QACIA,QAAQA,CAACA;IACbA,CAACA;;CACJ,CAAA"}
+{"version":3,"file":"computedPropertyNamesSourceMap2_ES5.js","sourceRoot":"","sources":["computedPropertyNamesSourceMap2_ES5.ts"],"names":[],"mappings":"AAAA,IAAI,CAAC,GAAG;IACJ,GAAC,OAAO,CAAC,GAAT;QACI,QAAQ,CAAC;IACb,CAAC;;CACJ,CAAA"}

tests/baselines/reference/computedPropertyNamesSourceMap2_ES5.sourcemap.txt

@@ -49,9 +49,9 @@ sourceFile:computedPropertyNamesSourceMap2_ES5.ts
   >        
 2 >        debugger
 3 >                ;
-1 >Emitted(3, 9) Source(3, 9) + SourceIndex(0) name (["hello"])
-2 >Emitted(3, 17) Source(3, 17) + SourceIndex(0) name (["hello"])
-3 >Emitted(3, 18) Source(3, 18) + SourceIndex(0) name (["hello"])
+1 >Emitted(3, 9) Source(3, 9) + SourceIndex(0)
+2 >Emitted(3, 17) Source(3, 17) + SourceIndex(0)
+3 >Emitted(3, 18) Source(3, 18) + SourceIndex(0)
 ---
 >>>    },
 1 >^^^^
@@ -60,8 +60,8 @@ sourceFile:computedPropertyNamesSourceMap2_ES5.ts
 1 >
   >    
 2 >    }
-1 >Emitted(4, 5) Source(4, 5) + SourceIndex(0) name (["hello"])
-2 >Emitted(4, 6) Source(4, 6) + SourceIndex(0) name (["hello"])
+1 >Emitted(4, 5) Source(4, 5) + SourceIndex(0)
+2 >Emitted(4, 6) Source(4, 6) + SourceIndex(0)
 ---
 >>>    _a
 >>>);

tests/baselines/reference/computedPropertyNamesSourceMap2_ES6.js.map

@@ -1,2 +1,2 @@
 //// [computedPropertyNamesSourceMap2_ES6.js.map]
-{"version":3,"file":"computedPropertyNamesSourceMap2_ES6.js","sourceRoot":"","sources":["computedPropertyNamesSourceMap2_ES6.ts"],"names":["[\"hello\"]"],"mappings":"AAAA,IAAI,CAAC,GAAG;IACJ,CAAC,OAAO,CAAC;QACLA,QAAQA,CAACA;IACbA,CAACA;CACJ,CAAA"}
+{"version":3,"file":"computedPropertyNamesSourceMap2_ES6.js","sourceRoot":"","sources":["computedPropertyNamesSourceMap2_ES6.ts"],"names":[],"mappings":"AAAA,IAAI,CAAC,GAAG;IACJ,CAAC,OAAO,CAAC;QACL,QAAQ,CAAC;IACb,CAAC;CACJ,CAAA"}

tests/baselines/reference/computedPropertyNamesSourceMap2_ES6.sourcemap.txt

@@ -47,9 +47,9 @@ sourceFile:computedPropertyNamesSourceMap2_ES6.ts
   >        
 2 >        debugger
 3 >                ;
-1->Emitted(3, 9) Source(3, 9) + SourceIndex(0) name (["hello"])
-2 >Emitted(3, 17) Source(3, 17) + SourceIndex(0) name (["hello"])
-3 >Emitted(3, 18) Source(3, 18) + SourceIndex(0) name (["hello"])
+1->Emitted(3, 9) Source(3, 9) + SourceIndex(0)
+2 >Emitted(3, 17) Source(3, 17) + SourceIndex(0)
+3 >Emitted(3, 18) Source(3, 18) + SourceIndex(0)
 ---
 >>>    }
 1 >^^^^
@@ -57,8 +57,8 @@ sourceFile:computedPropertyNamesSourceMap2_ES6.ts
 1 >
   >    
 2 >    }
-1 >Emitted(4, 5) Source(4, 5) + SourceIndex(0) name (["hello"])
-2 >Emitted(4, 6) Source(4, 6) + SourceIndex(0) name (["hello"])
+1 >Emitted(4, 5) Source(4, 5) + SourceIndex(0)
+2 >Emitted(4, 6) Source(4, 6) + SourceIndex(0)
 ---
 >>>};
 1 >^

tests/baselines/reference/contextualTyping.sourcemap.txt

@@ -39,7 +39,7 @@ sourceFile:contextualTyping.ts
 1->^^^^
 2 >    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1->
-1->Emitted(3, 5) Source(14, 1) + SourceIndex(0) name (C1T5)
+1->Emitted(3, 5) Source(14, 1) + SourceIndex(0)
 ---
 >>>        this.foo = function (i) {
 1->^^^^^^^^
@@ -53,11 +53,11 @@ sourceFile:contextualTyping.ts
 3 >                : (i: number, s: string) => number = 
 4 >                   function(
 5 >                             i
-1->Emitted(4, 9) Source(15, 5) + SourceIndex(0) name (C1T5.constructor)
-2 >Emitted(4, 17) Source(15, 8) + SourceIndex(0) name (C1T5.constructor)
-3 >Emitted(4, 20) Source(15, 45) + SourceIndex(0) name (C1T5.constructor)
-4 >Emitted(4, 30) Source(15, 54) + SourceIndex(0) name (C1T5.constructor)
-5 >Emitted(4, 31) Source(15, 55) + SourceIndex(0) name (C1T5.constructor)
+1->Emitted(4, 9) Source(15, 5) + SourceIndex(0)
+2 >Emitted(4, 17) Source(15, 8) + SourceIndex(0)
+3 >Emitted(4, 20) Source(15, 45) + SourceIndex(0)
+4 >Emitted(4, 30) Source(15, 54) + SourceIndex(0)
+5 >Emitted(4, 31) Source(15, 55) + SourceIndex(0)
 ---
 >>>            return i;
 1 >^^^^^^^^^^^^
@@ -87,7 +87,7 @@ sourceFile:contextualTyping.ts
 3 >         
 1 >Emitted(6, 9) Source(17, 5) + SourceIndex(0)
 2 >Emitted(6, 10) Source(17, 6) + SourceIndex(0)
-3 >Emitted(6, 11) Source(17, 6) + SourceIndex(0) name (C1T5.constructor)
+3 >Emitted(6, 11) Source(17, 6) + SourceIndex(0)
 ---
 >>>    }
 1 >^^^^
@@ -96,16 +96,16 @@ sourceFile:contextualTyping.ts
 1 >
   >
 2 >    }
-1 >Emitted(7, 5) Source(18, 1) + SourceIndex(0) name (C1T5.constructor)
-2 >Emitted(7, 6) Source(18, 2) + SourceIndex(0) name (C1T5.constructor)
+1 >Emitted(7, 5) Source(18, 1) + SourceIndex(0)
+2 >Emitted(7, 6) Source(18, 2) + SourceIndex(0)
 ---
 >>>    return C1T5;
 1->^^^^
 2 >    ^^^^^^^^^^^
 1->
 2 >    }
-1->Emitted(8, 5) Source(18, 1) + SourceIndex(0) name (C1T5)
-2 >Emitted(8, 16) Source(18, 2) + SourceIndex(0) name (C1T5)
+1->Emitted(8, 5) Source(18, 1) + SourceIndex(0)
+2 >Emitted(8, 16) Source(18, 2) + SourceIndex(0)
 ---
 >>>})();
 1 >
@@ -121,8 +121,8 @@ sourceFile:contextualTyping.ts
   >         return i;
   >     }
   > }
-1 >Emitted(9, 1) Source(18, 1) + SourceIndex(0) name (C1T5)
-2 >Emitted(9, 2) Source(18, 2) + SourceIndex(0) name (C1T5)
+1 >Emitted(9, 1) Source(18, 1) + SourceIndex(0)
+2 >Emitted(9, 2) Source(18, 2) + SourceIndex(0)
 3 >Emitted(9, 2) Source(14, 1) + SourceIndex(0)
 4 >Emitted(9, 6) Source(18, 2) + SourceIndex(0)
 ---
@@ -186,11 +186,11 @@ sourceFile:contextualTyping.ts
 3 >            : (i: number, s: string) => number = 
 4 >               function(
 5 >                         i
-1->Emitted(13, 5) Source(22, 16) + SourceIndex(0) name (C2T5)
-2 >Emitted(13, 13) Source(22, 19) + SourceIndex(0) name (C2T5)
-3 >Emitted(13, 16) Source(22, 56) + SourceIndex(0) name (C2T5)
-4 >Emitted(13, 26) Source(22, 65) + SourceIndex(0) name (C2T5)
-5 >Emitted(13, 27) Source(22, 66) + SourceIndex(0) name (C2T5)
+1->Emitted(13, 5) Source(22, 16) + SourceIndex(0)
+2 >Emitted(13, 13) Source(22, 19) + SourceIndex(0)
+3 >Emitted(13, 16) Source(22, 56) + SourceIndex(0)
+4 >Emitted(13, 26) Source(22, 65) + SourceIndex(0)
+5 >Emitted(13, 27) Source(22, 66) + SourceIndex(0)
 ---
 >>>        return i;
 1 >^^^^^^^^
@@ -221,7 +221,7 @@ sourceFile:contextualTyping.ts
 3 >     
 1 >Emitted(15, 5) Source(24, 5) + SourceIndex(0)
 2 >Emitted(15, 6) Source(24, 6) + SourceIndex(0)
-3 >Emitted(15, 7) Source(24, 6) + SourceIndex(0) name (C2T5)
+3 >Emitted(15, 7) Source(24, 6) + SourceIndex(0)
 ---
 >>>})(C2T5 || (C2T5 = {}));
 1->
@@ -244,8 +244,8 @@ sourceFile:contextualTyping.ts
   >                        return i;
   >                    }
   >                }
-1->Emitted(16, 1) Source(25, 1) + SourceIndex(0) name (C2T5)
-2 >Emitted(16, 2) Source(25, 2) + SourceIndex(0) name (C2T5)
+1->Emitted(16, 1) Source(25, 1) + SourceIndex(0)
+2 >Emitted(16, 2) Source(25, 2) + SourceIndex(0)
 3 >Emitted(16, 4) Source(21, 8) + SourceIndex(0)
 4 >Emitted(16, 8) Source(21, 12) + SourceIndex(0)
 5 >Emitted(16, 13) Source(21, 8) + SourceIndex(0)
@@ -962,7 +962,7 @@ sourceFile:contextualTyping.ts
 1->class C4T5 {
   >    foo: (i: number, s: string) => string;
   >    
-1->Emitted(42, 5) Source(58, 5) + SourceIndex(0) name (C4T5)
+1->Emitted(42, 5) Source(58, 5) + SourceIndex(0)
 ---
 >>>        this.foo = function (i, s) {
 1->^^^^^^^^
@@ -984,15 +984,15 @@ sourceFile:contextualTyping.ts
 7 >                             i
 8 >                              , 
 9 >                                s
-1->Emitted(43, 9) Source(59, 9) + SourceIndex(0) name (C4T5.constructor)
-2 >Emitted(43, 13) Source(59, 13) + SourceIndex(0) name (C4T5.constructor)
-3 >Emitted(43, 14) Source(59, 14) + SourceIndex(0) name (C4T5.constructor)
-4 >Emitted(43, 17) Source(59, 17) + SourceIndex(0) name (C4T5.constructor)
-5 >Emitted(43, 20) Source(59, 20) + SourceIndex(0) name (C4T5.constructor)
-6 >Emitted(43, 30) Source(59, 29) + SourceIndex(0) name (C4T5.constructor)
-7 >Emitted(43, 31) Source(59, 30) + SourceIndex(0) name (C4T5.constructor)
-8 >Emitted(43, 33) Source(59, 32) + SourceIndex(0) name (C4T5.constructor)
-9 >Emitted(43, 34) Source(59, 33) + SourceIndex(0) name (C4T5.constructor)
+1->Emitted(43, 9) Source(59, 9) + SourceIndex(0)
+2 >Emitted(43, 13) Source(59, 13) + SourceIndex(0)
+3 >Emitted(43, 14) Source(59, 14) + SourceIndex(0)
+4 >Emitted(43, 17) Source(59, 17) + SourceIndex(0)
+5 >Emitted(43, 20) Source(59, 20) + SourceIndex(0)
+6 >Emitted(43, 30) Source(59, 29) + SourceIndex(0)
+7 >Emitted(43, 31) Source(59, 30) + SourceIndex(0)
+8 >Emitted(43, 33) Source(59, 32) + SourceIndex(0)
+9 >Emitted(43, 34) Source(59, 33) + SourceIndex(0)
 ---
 >>>            return s;
 1 >^^^^^^^^^^^^
@@ -1022,7 +1022,7 @@ sourceFile:contextualTyping.ts
 3 >         
 1 >Emitted(45, 9) Source(61, 9) + SourceIndex(0)
 2 >Emitted(45, 10) Source(61, 10) + SourceIndex(0)
-3 >Emitted(45, 11) Source(61, 10) + SourceIndex(0) name (C4T5.constructor)
+3 >Emitted(45, 11) Source(61, 10) + SourceIndex(0)
 ---
 >>>    }
 1 >^^^^
@@ -1031,8 +1031,8 @@ sourceFile:contextualTyping.ts
 1 >
   >    
 2 >    }
-1 >Emitted(46, 5) Source(62, 5) + SourceIndex(0) name (C4T5.constructor)
-2 >Emitted(46, 6) Source(62, 6) + SourceIndex(0) name (C4T5.constructor)
+1 >Emitted(46, 5) Source(62, 5) + SourceIndex(0)
+2 >Emitted(46, 6) Source(62, 6) + SourceIndex(0)
 ---
 >>>    return C4T5;
 1->^^^^
@@ -1040,8 +1040,8 @@ sourceFile:contextualTyping.ts
 1->
   >
 2 >    }
-1->Emitted(47, 5) Source(63, 1) + SourceIndex(0) name (C4T5)
-2 >Emitted(47, 16) Source(63, 2) + SourceIndex(0) name (C4T5)
+1->Emitted(47, 5) Source(63, 1) + SourceIndex(0)
+2 >Emitted(47, 16) Source(63, 2) + SourceIndex(0)
 ---
 >>>})();
 1 >
@@ -1060,8 +1060,8 @@ sourceFile:contextualTyping.ts
   >         }
   >     }
   > }
-1 >Emitted(48, 1) Source(63, 1) + SourceIndex(0) name (C4T5)
-2 >Emitted(48, 2) Source(63, 2) + SourceIndex(0) name (C4T5)
+1 >Emitted(48, 1) Source(63, 1) + SourceIndex(0)
+2 >Emitted(48, 2) Source(63, 2) + SourceIndex(0)
 3 >Emitted(48, 2) Source(56, 1) + SourceIndex(0)
 4 >Emitted(48, 6) Source(63, 2) + SourceIndex(0)
 ---
@@ -1131,13 +1131,13 @@ sourceFile:contextualTyping.ts
 5 >                         i
 6 >                          , 
 7 >                            s
-1->Emitted(52, 5) Source(68, 5) + SourceIndex(0) name (C5T5)
-2 >Emitted(52, 13) Source(68, 8) + SourceIndex(0) name (C5T5)
-3 >Emitted(52, 16) Source(68, 11) + SourceIndex(0) name (C5T5)
-4 >Emitted(52, 26) Source(68, 20) + SourceIndex(0) name (C5T5)
-5 >Emitted(52, 27) Source(68, 21) + SourceIndex(0) name (C5T5)
-6 >Emitted(52, 29) Source(68, 23) + SourceIndex(0) name (C5T5)
-7 >Emitted(52, 30) Source(68, 24) + SourceIndex(0) name (C5T5)
+1->Emitted(52, 5) Source(68, 5) + SourceIndex(0)
+2 >Emitted(52, 13) Source(68, 8) + SourceIndex(0)
+3 >Emitted(52, 16) Source(68, 11) + SourceIndex(0)
+4 >Emitted(52, 26) Source(68, 20) + SourceIndex(0)
+5 >Emitted(52, 27) Source(68, 21) + SourceIndex(0)
+6 >Emitted(52, 29) Source(68, 23) + SourceIndex(0)
+7 >Emitted(52, 30) Source(68, 24) + SourceIndex(0)
 ---
 >>>        return s;
 1 >^^^^^^^^
@@ -1168,7 +1168,7 @@ sourceFile:contextualTyping.ts
 3 >     
 1 >Emitted(54, 5) Source(70, 5) + SourceIndex(0)
 2 >Emitted(54, 6) Source(70, 6) + SourceIndex(0)
-3 >Emitted(54, 7) Source(70, 6) + SourceIndex(0) name (C5T5)
+3 >Emitted(54, 7) Source(70, 6) + SourceIndex(0)
 ---
 >>>})(C5T5 || (C5T5 = {}));
 1->
@@ -1192,8 +1192,8 @@ sourceFile:contextualTyping.ts
   >                        return s;
   >                    }
   >                }
-1->Emitted(55, 1) Source(71, 1) + SourceIndex(0) name (C5T5)
-2 >Emitted(55, 2) Source(71, 2) + SourceIndex(0) name (C5T5)
+1->Emitted(55, 1) Source(71, 1) + SourceIndex(0)
+2 >Emitted(55, 2) Source(71, 2) + SourceIndex(0)
 3 >Emitted(55, 4) Source(66, 8) + SourceIndex(0)
 4 >Emitted(55, 8) Source(66, 12) + SourceIndex(0)
 5 >Emitted(55, 13) Source(66, 8) + SourceIndex(0)
@@ -2153,8 +2153,8 @@ sourceFile:contextualTyping.ts
 1 >Emitted(86, 1) Source(146, 1) + SourceIndex(0)
 2 >Emitted(86, 15) Source(146, 15) + SourceIndex(0)
 3 >Emitted(86, 16) Source(146, 37) + SourceIndex(0)
-4 >Emitted(86, 20) Source(146, 40) + SourceIndex(0) name (c9t5)
-5 >Emitted(86, 21) Source(146, 41) + SourceIndex(0) name (c9t5)
+4 >Emitted(86, 20) Source(146, 40) + SourceIndex(0)
+5 >Emitted(86, 21) Source(146, 41) + SourceIndex(0)
 ---
 >>>;
 1 >
@@ -2329,9 +2329,9 @@ sourceFile:contextualTyping.ts
 1->class C11t5 { 
 2 >    constructor(
 3 >                   f: (n: number) => IFoo
-1->Emitted(95, 5) Source(155, 15) + SourceIndex(0) name (C11t5)
-2 >Emitted(95, 20) Source(155, 27) + SourceIndex(0) name (C11t5)
-3 >Emitted(95, 21) Source(155, 49) + SourceIndex(0) name (C11t5)
+1->Emitted(95, 5) Source(155, 15) + SourceIndex(0)
+2 >Emitted(95, 20) Source(155, 27) + SourceIndex(0)
+3 >Emitted(95, 21) Source(155, 49) + SourceIndex(0)
 ---
 >>>    }
 1 >^^^^
@@ -2339,16 +2339,16 @@ sourceFile:contextualTyping.ts
 3 >     ^^^^^^^^^^^^^->
 1 >) { 
 2 >    }
-1 >Emitted(96, 5) Source(155, 53) + SourceIndex(0) name (C11t5.constructor)
-2 >Emitted(96, 6) Source(155, 54) + SourceIndex(0) name (C11t5.constructor)
+1 >Emitted(96, 5) Source(155, 53) + SourceIndex(0)
+2 >Emitted(96, 6) Source(155, 54) + SourceIndex(0)
 ---
 >>>    return C11t5;
 1->^^^^
 2 >    ^^^^^^^^^^^^
 1-> 
 2 >    }
-1->Emitted(97, 5) Source(155, 55) + SourceIndex(0) name (C11t5)
-2 >Emitted(97, 17) Source(155, 56) + SourceIndex(0) name (C11t5)
+1->Emitted(97, 5) Source(155, 55) + SourceIndex(0)
+2 >Emitted(97, 17) Source(155, 56) + SourceIndex(0)
 ---
 >>>})();
 1 >
@@ -2359,8 +2359,8 @@ sourceFile:contextualTyping.ts
 2 >}
 3 > 
 4 > class C11t5 { constructor(f: (n: number) => IFoo) { } }
-1 >Emitted(98, 1) Source(155, 55) + SourceIndex(0) name (C11t5)
-2 >Emitted(98, 2) Source(155, 56) + SourceIndex(0) name (C11t5)
+1 >Emitted(98, 1) Source(155, 55) + SourceIndex(0)
+2 >Emitted(98, 2) Source(155, 56) + SourceIndex(0)
 3 >Emitted(98, 2) Source(155, 1) + SourceIndex(0)
 4 >Emitted(98, 6) Source(155, 56) + SourceIndex(0)
 ---
@@ -3164,15 +3164,15 @@ sourceFile:contextualTyping.ts
 3 >Emitted(124, 15) Source(191, 15) + SourceIndex(0)
 4 >Emitted(124, 17) Source(191, 16) + SourceIndex(0)
 5 >Emitted(124, 18) Source(191, 17) + SourceIndex(0)
-6 >Emitted(124, 22) Source(191, 21) + SourceIndex(0) name (EF1)
-7 >Emitted(124, 28) Source(191, 27) + SourceIndex(0) name (EF1)
-8 >Emitted(124, 29) Source(191, 28) + SourceIndex(0) name (EF1)
-9 >Emitted(124, 30) Source(191, 29) + SourceIndex(0) name (EF1)
-10>Emitted(124, 33) Source(191, 30) + SourceIndex(0) name (EF1)
-11>Emitted(124, 34) Source(191, 31) + SourceIndex(0) name (EF1)
-12>Emitted(124, 35) Source(191, 32) + SourceIndex(0) name (EF1)
-13>Emitted(124, 36) Source(191, 33) + SourceIndex(0) name (EF1)
-14>Emitted(124, 37) Source(191, 34) + SourceIndex(0) name (EF1)
+6 >Emitted(124, 22) Source(191, 21) + SourceIndex(0)
+7 >Emitted(124, 28) Source(191, 27) + SourceIndex(0)
+8 >Emitted(124, 29) Source(191, 28) + SourceIndex(0)
+9 >Emitted(124, 30) Source(191, 29) + SourceIndex(0)
+10>Emitted(124, 33) Source(191, 30) + SourceIndex(0)
+11>Emitted(124, 34) Source(191, 31) + SourceIndex(0)
+12>Emitted(124, 35) Source(191, 32) + SourceIndex(0)
+13>Emitted(124, 36) Source(191, 33) + SourceIndex(0)
+14>Emitted(124, 37) Source(191, 34) + SourceIndex(0)
 ---
 >>>var efv = EF1(1, 2);
 1 >
@@ -3260,13 +3260,13 @@ sourceFile:contextualTyping.ts
 5 >           = 
 6 >             x
 7 >              ;
-1 >Emitted(127, 5) Source(208, 5) + SourceIndex(0) name (Point)
-2 >Emitted(127, 9) Source(208, 9) + SourceIndex(0) name (Point)
-3 >Emitted(127, 10) Source(208, 10) + SourceIndex(0) name (Point)
-4 >Emitted(127, 11) Source(208, 11) + SourceIndex(0) name (Point)
-5 >Emitted(127, 14) Source(208, 14) + SourceIndex(0) name (Point)
-6 >Emitted(127, 15) Source(208, 15) + SourceIndex(0) name (Point)
-7 >Emitted(127, 16) Source(208, 16) + SourceIndex(0) name (Point)
+1 >Emitted(127, 5) Source(208, 5) + SourceIndex(0)
+2 >Emitted(127, 9) Source(208, 9) + SourceIndex(0)
+3 >Emitted(127, 10) Source(208, 10) + SourceIndex(0)
+4 >Emitted(127, 11) Source(208, 11) + SourceIndex(0)
+5 >Emitted(127, 14) Source(208, 14) + SourceIndex(0)
+6 >Emitted(127, 15) Source(208, 15) + SourceIndex(0)
+7 >Emitted(127, 16) Source(208, 16) + SourceIndex(0)
 ---
 >>>    this.y = y;
 1->^^^^
@@ -3285,13 +3285,13 @@ sourceFile:contextualTyping.ts
 5 >           = 
 6 >             y
 7 >              ;
-1->Emitted(128, 5) Source(209, 5) + SourceIndex(0) name (Point)
-2 >Emitted(128, 9) Source(209, 9) + SourceIndex(0) name (Point)
-3 >Emitted(128, 10) Source(209, 10) + SourceIndex(0) name (Point)
-4 >Emitted(128, 11) Source(209, 11) + SourceIndex(0) name (Point)
-5 >Emitted(128, 14) Source(209, 14) + SourceIndex(0) name (Point)
-6 >Emitted(128, 15) Source(209, 15) + SourceIndex(0) name (Point)
-7 >Emitted(128, 16) Source(209, 16) + SourceIndex(0) name (Point)
+1->Emitted(128, 5) Source(209, 5) + SourceIndex(0)
+2 >Emitted(128, 9) Source(209, 9) + SourceIndex(0)
+3 >Emitted(128, 10) Source(209, 10) + SourceIndex(0)
+4 >Emitted(128, 11) Source(209, 11) + SourceIndex(0)
+5 >Emitted(128, 14) Source(209, 14) + SourceIndex(0)
+6 >Emitted(128, 15) Source(209, 15) + SourceIndex(0)
+7 >Emitted(128, 16) Source(209, 16) + SourceIndex(0)
 ---
 >>>    return this;
 1->^^^^
@@ -3306,11 +3306,11 @@ sourceFile:contextualTyping.ts
 3 >           
 4 >           this
 5 >               ;
-1->Emitted(129, 5) Source(211, 5) + SourceIndex(0) name (Point)
-2 >Emitted(129, 11) Source(211, 11) + SourceIndex(0) name (Point)
-3 >Emitted(129, 12) Source(211, 12) + SourceIndex(0) name (Point)
-4 >Emitted(129, 16) Source(211, 16) + SourceIndex(0) name (Point)
-5 >Emitted(129, 17) Source(211, 17) + SourceIndex(0) name (Point)
+1->Emitted(129, 5) Source(211, 5) + SourceIndex(0)
+2 >Emitted(129, 11) Source(211, 11) + SourceIndex(0)
+3 >Emitted(129, 12) Source(211, 12) + SourceIndex(0)
+4 >Emitted(129, 16) Source(211, 16) + SourceIndex(0)
+5 >Emitted(129, 17) Source(211, 17) + SourceIndex(0)
 ---
 >>>}
 1 >
@@ -3319,8 +3319,8 @@ sourceFile:contextualTyping.ts
 1 >
   >
 2 >}
-1 >Emitted(130, 1) Source(212, 1) + SourceIndex(0) name (Point)
-2 >Emitted(130, 2) Source(212, 2) + SourceIndex(0) name (Point)
+1 >Emitted(130, 1) Source(212, 1) + SourceIndex(0)
+2 >Emitted(130, 2) Source(212, 2) + SourceIndex(0)
 ---
 >>>Point.origin = new Point(0, 0);
 1->

tests/baselines/reference/es3-sourcemap-amd.js.map

@@ -1,2 +1,2 @@
 //// [es3-sourcemap-amd.js.map]
-{"version":3,"file":"es3-sourcemap-amd.js","sourceRoot":"","sources":["es3-sourcemap-amd.ts"],"names":["A","A.constructor","A.B"],"mappings":"AACA;IAEIA;IAGAC,CAACA;IAEMD,aAACA,GAARA;QAEIE,MAAMA,CAACA,EAAEA,CAACA;IACdA,CAACA;IACLF,QAACA;AAADA,CAACA,AAXD,IAWC"}
+{"version":3,"file":"es3-sourcemap-amd.js","sourceRoot":"","sources":["es3-sourcemap-amd.ts"],"names":[],"mappings":"AACA;IAEI;IAGA,CAAC;IAEM,aAAC,GAAR;QAEI,MAAM,CAAC,EAAE,CAAC;IACd,CAAC;IACL,QAAC;AAAD,CAAC,AAXD,IAWC"}

tests/baselines/reference/es3-sourcemap-amd.sourcemap.txt

@@ -21,7 +21,7 @@ sourceFile:es3-sourcemap-amd.ts
 1->class A
   >{
   >    
-1->Emitted(2, 5) Source(4, 5) + SourceIndex(0) name (A)
+1->Emitted(2, 5) Source(4, 5) + SourceIndex(0)
 ---
 >>>    }
 1->^^^^
@@ -32,8 +32,8 @@ sourceFile:es3-sourcemap-amd.ts
   >
   >    
 2 >    }
-1->Emitted(3, 5) Source(7, 5) + SourceIndex(0) name (A.constructor)
-2 >Emitted(3, 6) Source(7, 6) + SourceIndex(0) name (A.constructor)
+1->Emitted(3, 5) Source(7, 5) + SourceIndex(0)
+2 >Emitted(3, 6) Source(7, 6) + SourceIndex(0)
 ---
 >>>    A.prototype.B = function () {
 1->^^^^
@@ -44,9 +44,9 @@ sourceFile:es3-sourcemap-amd.ts
   >    public 
 2 >    B
 3 >                 
-1->Emitted(4, 5) Source(9, 12) + SourceIndex(0) name (A)
-2 >Emitted(4, 18) Source(9, 13) + SourceIndex(0) name (A)
-3 >Emitted(4, 21) Source(9, 5) + SourceIndex(0) name (A)
+1->Emitted(4, 5) Source(9, 12) + SourceIndex(0)
+2 >Emitted(4, 18) Source(9, 13) + SourceIndex(0)
+3 >Emitted(4, 21) Source(9, 5) + SourceIndex(0)
 ---
 >>>        return 42;
 1 >^^^^^^^^
@@ -61,11 +61,11 @@ sourceFile:es3-sourcemap-amd.ts
 3 >               
 4 >               42
 5 >                 ;
-1 >Emitted(5, 9) Source(11, 9) + SourceIndex(0) name (A.B)
-2 >Emitted(5, 15) Source(11, 15) + SourceIndex(0) name (A.B)
-3 >Emitted(5, 16) Source(11, 16) + SourceIndex(0) name (A.B)
-4 >Emitted(5, 18) Source(11, 18) + SourceIndex(0) name (A.B)
-5 >Emitted(5, 19) Source(11, 19) + SourceIndex(0) name (A.B)
+1 >Emitted(5, 9) Source(11, 9) + SourceIndex(0)
+2 >Emitted(5, 15) Source(11, 15) + SourceIndex(0)
+3 >Emitted(5, 16) Source(11, 16) + SourceIndex(0)
+4 >Emitted(5, 18) Source(11, 18) + SourceIndex(0)
+5 >Emitted(5, 19) Source(11, 19) + SourceIndex(0)
 ---
 >>>    };
 1 >^^^^
@@ -74,8 +74,8 @@ sourceFile:es3-sourcemap-amd.ts
 1 >
   >    
 2 >    }
-1 >Emitted(6, 5) Source(12, 5) + SourceIndex(0) name (A.B)
-2 >Emitted(6, 6) Source(12, 6) + SourceIndex(0) name (A.B)
+1 >Emitted(6, 5) Source(12, 5) + SourceIndex(0)
+2 >Emitted(6, 6) Source(12, 6) + SourceIndex(0)
 ---
 >>>    return A;
 1->^^^^
@@ -83,8 +83,8 @@ sourceFile:es3-sourcemap-amd.ts
 1->
   >
 2 >    }
-1->Emitted(7, 5) Source(13, 1) + SourceIndex(0) name (A)
-2 >Emitted(7, 13) Source(13, 2) + SourceIndex(0) name (A)
+1->Emitted(7, 5) Source(13, 1) + SourceIndex(0)
+2 >Emitted(7, 13) Source(13, 2) + SourceIndex(0)
 ---
 >>>})();
 1 >
@@ -107,8 +107,8 @@ sourceFile:es3-sourcemap-amd.ts
   >         return 42;
   >     }
   > }
-1 >Emitted(8, 1) Source(13, 1) + SourceIndex(0) name (A)
-2 >Emitted(8, 2) Source(13, 2) + SourceIndex(0) name (A)
+1 >Emitted(8, 1) Source(13, 1) + SourceIndex(0)
+2 >Emitted(8, 2) Source(13, 2) + SourceIndex(0)
 3 >Emitted(8, 2) Source(2, 1) + SourceIndex(0)
 4 >Emitted(8, 6) Source(13, 2) + SourceIndex(0)
 ---

tests/baselines/reference/es5-souremap-amd.js.map

@@ -1,2 +1,2 @@
 //// [es5-souremap-amd.js.map]
-{"version":3,"file":"es5-souremap-amd.js","sourceRoot":"","sources":["es5-souremap-amd.ts"],"names":["A","A.constructor","A.B"],"mappings":"AACA;IAEIA;IAGAC,CAACA;IAEMD,aAACA,GAARA;QAEIE,MAAMA,CAACA,EAAEA,CAACA;IACdA,CAACA;IACLF,QAACA;AAADA,CAACA,AAXD,IAWC"}
+{"version":3,"file":"es5-souremap-amd.js","sourceRoot":"","sources":["es5-souremap-amd.ts"],"names":[],"mappings":"AACA;IAEI;IAGA,CAAC;IAEM,aAAC,GAAR;QAEI,MAAM,CAAC,EAAE,CAAC;IACd,CAAC;IACL,QAAC;AAAD,CAAC,AAXD,IAWC"}

tests/baselines/reference/es5-souremap-amd.sourcemap.txt

@@ -21,7 +21,7 @@ sourceFile:es5-souremap-amd.ts
 1->class A
   >{
   >    
-1->Emitted(2, 5) Source(4, 5) + SourceIndex(0) name (A)
+1->Emitted(2, 5) Source(4, 5) + SourceIndex(0)
 ---
 >>>    }
 1->^^^^
@@ -32,8 +32,8 @@ sourceFile:es5-souremap-amd.ts
   >
   >    
 2 >    }
-1->Emitted(3, 5) Source(7, 5) + SourceIndex(0) name (A.constructor)
-2 >Emitted(3, 6) Source(7, 6) + SourceIndex(0) name (A.constructor)
+1->Emitted(3, 5) Source(7, 5) + SourceIndex(0)
+2 >Emitted(3, 6) Source(7, 6) + SourceIndex(0)
 ---
 >>>    A.prototype.B = function () {
 1->^^^^
@@ -44,9 +44,9 @@ sourceFile:es5-souremap-amd.ts
   >    public 
 2 >    B
 3 >                 
-1->Emitted(4, 5) Source(9, 12) + SourceIndex(0) name (A)
-2 >Emitted(4, 18) Source(9, 13) + SourceIndex(0) name (A)
-3 >Emitted(4, 21) Source(9, 5) + SourceIndex(0) name (A)
+1->Emitted(4, 5) Source(9, 12) + SourceIndex(0)
+2 >Emitted(4, 18) Source(9, 13) + SourceIndex(0)
+3 >Emitted(4, 21) Source(9, 5) + SourceIndex(0)
 ---
 >>>        return 42;
 1 >^^^^^^^^
@@ -61,11 +61,11 @@ sourceFile:es5-souremap-amd.ts
 3 >               
 4 >               42
 5 >                 ;
-1 >Emitted(5, 9) Source(11, 9) + SourceIndex(0) name (A.B)
-2 >Emitted(5, 15) Source(11, 15) + SourceIndex(0) name (A.B)
-3 >Emitted(5, 16) Source(11, 16) + SourceIndex(0) name (A.B)
-4 >Emitted(5, 18) Source(11, 18) + SourceIndex(0) name (A.B)
-5 >Emitted(5, 19) Source(11, 19) + SourceIndex(0) name (A.B)
+1 >Emitted(5, 9) Source(11, 9) + SourceIndex(0)
+2 >Emitted(5, 15) Source(11, 15) + SourceIndex(0)
+3 >Emitted(5, 16) Source(11, 16) + SourceIndex(0)
+4 >Emitted(5, 18) Source(11, 18) + SourceIndex(0)
+5 >Emitted(5, 19) Source(11, 19) + SourceIndex(0)
 ---
 >>>    };
 1 >^^^^
@@ -74,8 +74,8 @@ sourceFile:es5-souremap-amd.ts
 1 >
   >    
 2 >    }
-1 >Emitted(6, 5) Source(12, 5) + SourceIndex(0) name (A.B)
-2 >Emitted(6, 6) Source(12, 6) + SourceIndex(0) name (A.B)
+1 >Emitted(6, 5) Source(12, 5) + SourceIndex(0)
+2 >Emitted(6, 6) Source(12, 6) + SourceIndex(0)
 ---
 >>>    return A;
 1->^^^^
@@ -83,8 +83,8 @@ sourceFile:es5-souremap-amd.ts
 1->
   >
 2 >    }
-1->Emitted(7, 5) Source(13, 1) + SourceIndex(0) name (A)
-2 >Emitted(7, 13) Source(13, 2) + SourceIndex(0) name (A)
+1->Emitted(7, 5) Source(13, 1) + SourceIndex(0)
+2 >Emitted(7, 13) Source(13, 2) + SourceIndex(0)
 ---
 >>>})();
 1 >
@@ -107,8 +107,8 @@ sourceFile:es5-souremap-amd.ts
   >         return 42;
   >     }
   > }
-1 >Emitted(8, 1) Source(13, 1) + SourceIndex(0) name (A)
-2 >Emitted(8, 2) Source(13, 2) + SourceIndex(0) name (A)
+1 >Emitted(8, 1) Source(13, 1) + SourceIndex(0)
+2 >Emitted(8, 2) Source(13, 2) + SourceIndex(0)
 3 >Emitted(8, 2) Source(2, 1) + SourceIndex(0)
 4 >Emitted(8, 6) Source(13, 2) + SourceIndex(0)
 ---

tests/baselines/reference/es6-sourcemap-amd.js.map

@@ -1,2 +1,2 @@
 //// [es6-sourcemap-amd.js.map]
-{"version":3,"file":"es6-sourcemap-amd.js","sourceRoot":"","sources":["es6-sourcemap-amd.ts"],"names":["A","A.constructor","A.B"],"mappings":"AACA;IAEIA;IAGAC,CAACA;IAEMD,CAACA;QAEJE,MAAMA,CAACA,EAAEA,CAACA;IACdA,CAACA;AACLF,CAACA;AAAA"}
+{"version":3,"file":"es6-sourcemap-amd.js","sourceRoot":"","sources":["es6-sourcemap-amd.ts"],"names":[],"mappings":"AACA;IAEI;IAGA,CAAC;IAEM,CAAC;QAEJ,MAAM,CAAC,EAAE,CAAC;IACd,CAAC;AACL,CAAC;AAAA"}

tests/baselines/reference/es6-sourcemap-amd.sourcemap.txt

@@ -21,7 +21,7 @@ sourceFile:es6-sourcemap-amd.ts
 1->class A
   >{
   >    
-1->Emitted(2, 5) Source(4, 5) + SourceIndex(0) name (A)
+1->Emitted(2, 5) Source(4, 5) + SourceIndex(0)
 ---
 >>>    }
 1->^^^^
@@ -32,8 +32,8 @@ sourceFile:es6-sourcemap-amd.ts
   >
   >    
 2 >    }
-1->Emitted(3, 5) Source(7, 5) + SourceIndex(0) name (A.constructor)
-2 >Emitted(3, 6) Source(7, 6) + SourceIndex(0) name (A.constructor)
+1->Emitted(3, 5) Source(7, 5) + SourceIndex(0)
+2 >Emitted(3, 6) Source(7, 6) + SourceIndex(0)
 ---
 >>>    B() {
 1->^^^^
@@ -43,8 +43,8 @@ sourceFile:es6-sourcemap-amd.ts
   >
   >    public 
 2 >    B
-1->Emitted(4, 5) Source(9, 12) + SourceIndex(0) name (A)
-2 >Emitted(4, 6) Source(9, 13) + SourceIndex(0) name (A)
+1->Emitted(4, 5) Source(9, 12) + SourceIndex(0)
+2 >Emitted(4, 6) Source(9, 13) + SourceIndex(0)
 ---
 >>>        return 42;
 1->^^^^^^^^
@@ -59,11 +59,11 @@ sourceFile:es6-sourcemap-amd.ts
 3 >               
 4 >               42
 5 >                 ;
-1->Emitted(5, 9) Source(11, 9) + SourceIndex(0) name (A.B)
-2 >Emitted(5, 15) Source(11, 15) + SourceIndex(0) name (A.B)
-3 >Emitted(5, 16) Source(11, 16) + SourceIndex(0) name (A.B)
-4 >Emitted(5, 18) Source(11, 18) + SourceIndex(0) name (A.B)
-5 >Emitted(5, 19) Source(11, 19) + SourceIndex(0) name (A.B)
+1->Emitted(5, 9) Source(11, 9) + SourceIndex(0)
+2 >Emitted(5, 15) Source(11, 15) + SourceIndex(0)
+3 >Emitted(5, 16) Source(11, 16) + SourceIndex(0)
+4 >Emitted(5, 18) Source(11, 18) + SourceIndex(0)
+5 >Emitted(5, 19) Source(11, 19) + SourceIndex(0)
 ---
 >>>    }
 1 >^^^^
@@ -71,8 +71,8 @@ sourceFile:es6-sourcemap-amd.ts
 1 >
   >    
 2 >    }
-1 >Emitted(6, 5) Source(12, 5) + SourceIndex(0) name (A.B)
-2 >Emitted(6, 6) Source(12, 6) + SourceIndex(0) name (A.B)
+1 >Emitted(6, 5) Source(12, 5) + SourceIndex(0)
+2 >Emitted(6, 6) Source(12, 6) + SourceIndex(0)
 ---
 >>>}
 1 >
@@ -81,8 +81,8 @@ sourceFile:es6-sourcemap-amd.ts
 1 >
   >
 2 >}
-1 >Emitted(7, 1) Source(13, 1) + SourceIndex(0) name (A)
-2 >Emitted(7, 2) Source(13, 2) + SourceIndex(0) name (A)
+1 >Emitted(7, 1) Source(13, 1) + SourceIndex(0)
+2 >Emitted(7, 2) Source(13, 2) + SourceIndex(0)
 ---
 >>>//# sourceMappingURL=es6-sourcemap-amd.js.map1->
 2 >^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->

tests/baselines/reference/getEmitOutputMapRoots.baseline

@@ -1,6 +1,6 @@
 EmitSkipped: false
 FileName : declSingleFile.js.map
-{"version":3,"file":"declSingleFile.js","sourceRoot":"","sources":["../inputFile.ts"],"names":["M","M.constructor"],"mappings":"AAAA,IAAI,CAAC,GAAG,GAAG,CAAC;AACZ,IAAI,GAAG,GAAG,aAAa,CAAC;AACxB;IAAAA;IAGAC,CAACA;IAADD,QAACA;AAADA,CAACA,AAHD,IAGC"}FileName : declSingleFile.js
+{"version":3,"file":"declSingleFile.js","sourceRoot":"","sources":["../inputFile.ts"],"names":[],"mappings":"AAAA,IAAI,CAAC,GAAG,GAAG,CAAC;AACZ,IAAI,GAAG,GAAG,aAAa,CAAC;AACxB;IAAA;IAGA,CAAC;IAAD,QAAC;AAAD,CAAC,AAHD,IAGC"}FileName : declSingleFile.js
 var x = 109;
 var foo = "hello world";
 var M = (function () {

tests/baselines/reference/getEmitOutputSourceMap.baseline

@@ -1,6 +1,6 @@
 EmitSkipped: false
 FileName : tests/cases/fourslash/inputFile.js.map
-{"version":3,"file":"inputFile.js","sourceRoot":"","sources":["inputFile.ts"],"names":["M","M.constructor"],"mappings":"AAAA,IAAI,CAAC,GAAG,GAAG,CAAC;AACZ,IAAI,GAAG,GAAG,aAAa,CAAC;AACxB;IAAAA;IAGAC,CAACA;IAADD,QAACA;AAADA,CAACA,AAHD,IAGC"}FileName : tests/cases/fourslash/inputFile.js
+{"version":3,"file":"inputFile.js","sourceRoot":"","sources":["inputFile.ts"],"names":[],"mappings":"AAAA,IAAI,CAAC,GAAG,GAAG,CAAC;AACZ,IAAI,GAAG,GAAG,aAAa,CAAC;AACxB;IAAA;IAGA,CAAC;IAAD,QAAC;AAAD,CAAC,AAHD,IAGC"}FileName : tests/cases/fourslash/inputFile.js
 var x = 109;
 var foo = "hello world";
 var M = (function () {

tests/baselines/reference/getEmitOutputSourceMap2.baseline

@@ -1,6 +1,6 @@
 EmitSkipped: false
 FileName : sample/outDir/inputFile1.js.map
-{"version":3,"file":"inputFile1.js","sourceRoot":"","sources":["../../tests/cases/fourslash/inputFile1.ts"],"names":["M","M.constructor"],"mappings":"AAAA,IAAI,CAAC,GAAG,GAAG,CAAC;AACZ,IAAI,GAAG,GAAG,aAAa,CAAC;AACxB;IAAAA;IAGAC,CAACA;IAADD,QAACA;AAADA,CAACA,AAHD,IAGC"}FileName : sample/outDir/inputFile1.js
+{"version":3,"file":"inputFile1.js","sourceRoot":"","sources":["../../tests/cases/fourslash/inputFile1.ts"],"names":[],"mappings":"AAAA,IAAI,CAAC,GAAG,GAAG,CAAC;AACZ,IAAI,GAAG,GAAG,aAAa,CAAC;AACxB;IAAA;IAGA,CAAC;IAAD,QAAC;AAAD,CAAC,AAHD,IAGC"}FileName : sample/outDir/inputFile1.js
 var x = 109;
 var foo = "hello world";
 var M = (function () {

tests/baselines/reference/getEmitOutputSourceRoot.baseline

@@ -1,6 +1,6 @@
 EmitSkipped: false
 FileName : tests/cases/fourslash/inputFile.js.map
-{"version":3,"file":"inputFile.js","sourceRoot":"sourceRootDir/","sources":["inputFile.ts"],"names":["M","M.constructor"],"mappings":"AAAA,IAAI,CAAC,GAAG,GAAG,CAAC;AACZ,IAAI,GAAG,GAAG,aAAa,CAAC;AACxB;IAAAA;IAGAC,CAACA;IAADD,QAACA;AAADA,CAACA,AAHD,IAGC"}FileName : tests/cases/fourslash/inputFile.js
+{"version":3,"file":"inputFile.js","sourceRoot":"sourceRootDir/","sources":["inputFile.ts"],"names":[],"mappings":"AAAA,IAAI,CAAC,GAAG,GAAG,CAAC;AACZ,IAAI,GAAG,GAAG,aAAa,CAAC;AACxB;IAAA;IAGA,CAAC;IAAD,QAAC;AAAD,CAAC,AAHD,IAGC"}FileName : tests/cases/fourslash/inputFile.js
 var x = 109;
 var foo = "hello world";
 var M = (function () {

tests/baselines/reference/getEmitOutputSourceRootMultiFiles.baseline

@@ -1,6 +1,6 @@
 EmitSkipped: false
 FileName : tests/cases/fourslash/inputFile1.js.map
-{"version":3,"file":"inputFile1.js","sourceRoot":"sourceRootDir/","sources":["inputFile1.ts"],"names":["M","M.constructor"],"mappings":"AAAA,IAAI,CAAC,GAAG,GAAG,CAAC;AACZ,IAAI,GAAG,GAAG,aAAa,CAAC;AACxB;IAAAA;IAGAC,CAACA;IAADD,QAACA;AAADA,CAACA,AAHD,IAGC"}FileName : tests/cases/fourslash/inputFile1.js
+{"version":3,"file":"inputFile1.js","sourceRoot":"sourceRootDir/","sources":["inputFile1.ts"],"names":[],"mappings":"AAAA,IAAI,CAAC,GAAG,GAAG,CAAC;AACZ,IAAI,GAAG,GAAG,aAAa,CAAC;AACxB;IAAA;IAGA,CAAC;IAAD,QAAC;AAAD,CAAC,AAHD,IAGC"}FileName : tests/cases/fourslash/inputFile1.js
 var x = 109;
 var foo = "hello world";
 var M = (function () {
@@ -11,7 +11,7 @@ var M = (function () {
 //# sourceMappingURL=inputFile1.js.map
 EmitSkipped: false
 FileName : tests/cases/fourslash/inputFile2.js.map
-{"version":3,"file":"inputFile2.js","sourceRoot":"sourceRootDir/","sources":["inputFile2.ts"],"names":["C","C.constructor"],"mappings":"AAAA,IAAI,GAAG,GAAG,wBAAwB,CAAC;AACnC;IAAAA;IAGAC,CAACA;IAADD,QAACA;AAADA,CAACA,AAHD,IAGC"}FileName : tests/cases/fourslash/inputFile2.js
+{"version":3,"file":"inputFile2.js","sourceRoot":"sourceRootDir/","sources":["inputFile2.ts"],"names":[],"mappings":"AAAA,IAAI,GAAG,GAAG,wBAAwB,CAAC;AACnC;IAAA;IAGA,CAAC;IAAD,QAAC;AAAD,CAAC,AAHD,IAGC"}FileName : tests/cases/fourslash/inputFile2.js
 var bar = "hello world Typescript";
 var C = (function () {
     function C() {

tests/baselines/reference/getEmitOutputTsxFile_Preserve.baseline

@@ -1,6 +1,6 @@
 EmitSkipped: false
 FileName : tests/cases/fourslash/inputFile1.js.map
-{"version":3,"file":"inputFile1.js","sourceRoot":"","sources":["inputFile1.ts"],"names":["Bar","Bar.constructor"],"mappings":"AAAA,kBAAkB;AACjB,IAAI,CAAC,GAAW,CAAC,CAAC;AAClB;IAAAA;IAGAC,CAACA;IAADD,UAACA;AAADA,CAACA,AAHD,IAGC"}FileName : tests/cases/fourslash/inputFile1.js
+{"version":3,"file":"inputFile1.js","sourceRoot":"","sources":["inputFile1.ts"],"names":[],"mappings":"AAAA,kBAAkB;AACjB,IAAI,CAAC,GAAW,CAAC,CAAC;AAClB;IAAA;IAGA,CAAC;IAAD,UAAC;AAAD,CAAC,AAHD,IAGC"}FileName : tests/cases/fourslash/inputFile1.js
 // regular ts file
 var t = 5;
 var Bar = (function () {

tests/baselines/reference/getEmitOutputTsxFile_React.baseline

@@ -1,6 +1,6 @@
 EmitSkipped: false
 FileName : tests/cases/fourslash/inputFile1.js.map
-{"version":3,"file":"inputFile1.js","sourceRoot":"","sources":["inputFile1.ts"],"names":["Bar","Bar.constructor"],"mappings":"AAAA,kBAAkB;AACjB,IAAI,CAAC,GAAW,CAAC,CAAC;AAClB;IAAAA;IAGAC,CAACA;IAADD,UAACA;AAADA,CAACA,AAHD,IAGC"}FileName : tests/cases/fourslash/inputFile1.js
+{"version":3,"file":"inputFile1.js","sourceRoot":"","sources":["inputFile1.ts"],"names":[],"mappings":"AAAA,kBAAkB;AACjB,IAAI,CAAC,GAAW,CAAC,CAAC;AAClB;IAAA;IAGA,CAAC;IAAD,UAAC;AAAD,CAAC,AAHD,IAGC"}FileName : tests/cases/fourslash/inputFile1.js
 // regular ts file
 var t = 5;
 var Bar = (function () {

tests/baselines/reference/jsFileCompilationWithMapFileAsJs.js.map

@@ -1,2 +1,2 @@
 //// [a.js.map]
-{"version":3,"file":"a.js","sourceRoot":"","sources":["a.ts"],"names":["c","c.constructor"],"mappings":"AACA;IAAAA;IACAC,CAACA;IAADD,QAACA;AAADA,CAACA,AADD,IACC"}
+{"version":3,"file":"a.js","sourceRoot":"","sources":["a.ts"],"names":[],"mappings":"AACA;IAAA;IACA,CAAC;IAAD,QAAC;AAAD,CAAC,AADD,IACC"}

tests/baselines/reference/jsFileCompilationWithMapFileAsJs.sourcemap.txt

@@ -19,7 +19,7 @@ sourceFile:a.ts
 1->^^^^
 2 >    ^^->
 1->
-1->Emitted(2, 5) Source(2, 1) + SourceIndex(0) name (c)
+1->Emitted(2, 5) Source(2, 1) + SourceIndex(0)
 ---
 >>>    }
 1->^^^^
@@ -28,16 +28,16 @@ sourceFile:a.ts
 1->class c {
   >
 2 >    }
-1->Emitted(3, 5) Source(3, 1) + SourceIndex(0) name (c.constructor)
-2 >Emitted(3, 6) Source(3, 2) + SourceIndex(0) name (c.constructor)
+1->Emitted(3, 5) Source(3, 1) + SourceIndex(0)
+2 >Emitted(3, 6) Source(3, 2) + SourceIndex(0)
 ---
 >>>    return c;
 1->^^^^
 2 >    ^^^^^^^^
 1->
 2 >    }
-1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c)
-2 >Emitted(4, 13) Source(3, 2) + SourceIndex(0) name (c)
+1->Emitted(4, 5) Source(3, 1) + SourceIndex(0)
+2 >Emitted(4, 13) Source(3, 2) + SourceIndex(0)
 ---
 >>>})();
 1 >
@@ -50,8 +50,8 @@ sourceFile:a.ts
 3 > 
 4 > class c {
   > }
-1 >Emitted(5, 1) Source(3, 1) + SourceIndex(0) name (c)
-2 >Emitted(5, 2) Source(3, 2) + SourceIndex(0) name (c)
+1 >Emitted(5, 1) Source(3, 1) + SourceIndex(0)
+2 >Emitted(5, 2) Source(3, 2) + SourceIndex(0)
 3 >Emitted(5, 2) Source(2, 1) + SourceIndex(0)
 4 >Emitted(5, 6) Source(3, 2) + SourceIndex(0)
 ---

tests/baselines/reference/jsFileCompilationWithMapFileAsJsWithInlineSourceMap.js

@@ -19,4 +19,4 @@ var c = (function () {
     }
     return c;
 })();
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbImEudHMiXSwibmFtZXMiOlsiYyIsImMuY29uc3RydWN0b3IiXSwibWFwcGluZ3MiOiJBQUNBO0lBQUFBO0lBQ0FDLENBQUNBO0lBQURELFFBQUNBO0FBQURBLENBQUNBLEFBREQsSUFDQyJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbImEudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0E7SUFBQTtJQUNBLENBQUM7SUFBRCxRQUFDO0FBQUQsQ0FBQyxBQURELElBQ0MifQ==

tests/baselines/reference/jsFileCompilationWithMapFileAsJsWithInlineSourceMap.sourcemap.txt

@@ -1,6 +1,6 @@
 ===================================================================
 JsFile: a.js
-mapUrl: data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbImEudHMiXSwibmFtZXMiOlsiYyIsImMuY29uc3RydWN0b3IiXSwibWFwcGluZ3MiOiJBQUNBO0lBQUFBO0lBQ0FDLENBQUNBO0lBQURELFFBQUNBO0FBQURBLENBQUNBLEFBREQsSUFDQyJ9
+mapUrl: data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbImEudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0E7SUFBQTtJQUNBLENBQUM7SUFBRCxRQUFDO0FBQUQsQ0FBQyxBQURELElBQ0MifQ==
 sourceRoot: 
 sources: a.ts
 ===================================================================
@@ -19,7 +19,7 @@ sourceFile:a.ts
 1->^^^^
 2 >    ^^->
 1->
-1->Emitted(2, 5) Source(2, 1) + SourceIndex(0) name (c)
+1->Emitted(2, 5) Source(2, 1) + SourceIndex(0)
 ---
 >>>    }
 1->^^^^
@@ -28,31 +28,31 @@ sourceFile:a.ts
 1->class c {
   >
 2 >    }
-1->Emitted(3, 5) Source(3, 1) + SourceIndex(0) name (c.constructor)
-2 >Emitted(3, 6) Source(3, 2) + SourceIndex(0) name (c.constructor)
+1->Emitted(3, 5) Source(3, 1) + SourceIndex(0)
+2 >Emitted(3, 6) Source(3, 2) + SourceIndex(0)
 ---
 >>>    return c;
 1->^^^^
 2 >    ^^^^^^^^
 1->
 2 >    }
-1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c)
-2 >Emitted(4, 13) Source(3, 2) + SourceIndex(0) name (c)
+1->Emitted(4, 5) Source(3, 1) + SourceIndex(0)
+2 >Emitted(4, 13) Source(3, 2) + SourceIndex(0)
 ---
 >>>})();
 1 >
 2 >^
 3 > 
 4 > ^^^^
-5 >     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
+5 >     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
 2 >}
 3 > 
 4 > class c {
   > }
-1 >Emitted(5, 1) Source(3, 1) + SourceIndex(0) name (c)
-2 >Emitted(5, 2) Source(3, 2) + SourceIndex(0) name (c)
+1 >Emitted(5, 1) Source(3, 1) + SourceIndex(0)
+2 >Emitted(5, 2) Source(3, 2) + SourceIndex(0)
 3 >Emitted(5, 2) Source(2, 1) + SourceIndex(0)
 4 >Emitted(5, 6) Source(3, 2) + SourceIndex(0)
 ---
->>>//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbImEudHMiXSwibmFtZXMiOlsiYyIsImMuY29uc3RydWN0b3IiXSwibWFwcGluZ3MiOiJBQUNBO0lBQUFBO0lBQ0FDLENBQUNBO0lBQURELFFBQUNBO0FBQURBLENBQUNBLEFBREQsSUFDQyJ9
+>>>//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbImEudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0E7SUFBQTtJQUNBLENBQUM7SUFBRCxRQUFDO0FBQUQsQ0FBQyxBQURELElBQ0MifQ==

tests/baselines/reference/jsFileCompilationWithMapFileAsJsWithOutDir.js.map

@@ -1,2 +1,2 @@
 //// [a.js.map]
-{"version":3,"file":"a.js","sourceRoot":"","sources":["../tests/cases/compiler/a.ts"],"names":["c","c.constructor"],"mappings":"AACA;IAAAA;IACAC,CAACA;IAADD,QAACA;AAADA,CAACA,AADD,IACC"}
+{"version":3,"file":"a.js","sourceRoot":"","sources":["../tests/cases/compiler/a.ts"],"names":[],"mappings":"AACA;IAAA;IACA,CAAC;IAAD,QAAC;AAAD,CAAC,AADD,IACC"}

tests/baselines/reference/jsFileCompilationWithMapFileAsJsWithOutDir.sourcemap.txt

@@ -19,7 +19,7 @@ sourceFile:../tests/cases/compiler/a.ts
 1->^^^^
 2 >    ^^->
 1->
-1->Emitted(2, 5) Source(2, 1) + SourceIndex(0) name (c)
+1->Emitted(2, 5) Source(2, 1) + SourceIndex(0)
 ---
 >>>    }
 1->^^^^
@@ -28,16 +28,16 @@ sourceFile:../tests/cases/compiler/a.ts
 1->class c {
   >
 2 >    }
-1->Emitted(3, 5) Source(3, 1) + SourceIndex(0) name (c.constructor)
-2 >Emitted(3, 6) Source(3, 2) + SourceIndex(0) name (c.constructor)
+1->Emitted(3, 5) Source(3, 1) + SourceIndex(0)
+2 >Emitted(3, 6) Source(3, 2) + SourceIndex(0)
 ---
 >>>    return c;
 1->^^^^
 2 >    ^^^^^^^^
 1->
 2 >    }
-1->Emitted(4, 5) Source(3, 1) + SourceIndex(0) name (c)
-2 >Emitted(4, 13) Source(3, 2) + SourceIndex(0) name (c)
+1->Emitted(4, 5) Source(3, 1) + SourceIndex(0)
+2 >Emitted(4, 13) Source(3, 2) + SourceIndex(0)
 ---
 >>>})();
 1 >
@@ -50,8 +50,8 @@ sourceFile:../tests/cases/compiler/a.ts
 3 > 
 4 > class c {
   > }
-1 >Emitted(5, 1) Source(3, 1) + SourceIndex(0) name (c)
-2 >Emitted(5, 2) Source(3, 2) + SourceIndex(0) name (c)
+1 >Emitted(5, 1) Source(3, 1) + SourceIndex(0)
+2 >Emitted(5, 2) Source(3, 2) + SourceIndex(0)
 3 >Emitted(5, 2) Source(2, 1) + SourceIndex(0)
 4 >Emitted(5, 6) Source(3, 2) + SourceIndex(0)
 ---

tests/baselines/reference/out-flag.js.map

@@ -1,2 +1,2 @@
 //// [out-flag.js.map]
-{"version":3,"file":"out-flag.js","sourceRoot":"","sources":["out-flag.ts"],"names":["MyClass","MyClass.constructor","MyClass.Count","MyClass.SetCount"],"mappings":"AAAA,eAAe;AAEf,oBAAoB;AACpB;IAAAA;IAYAC,CAACA;IAVGD,uBAAuBA;IAChBA,uBAAKA,GAAZA;QAEIE,MAAMA,CAACA,EAAEA,CAACA;IACdA,CAACA;IAEMF,0BAAQA,GAAfA,UAAgBA,KAAaA;QAEzBG,EAAEA;IACNA,CAACA;IACLH,cAACA;AAADA,CAACA,AAZD,IAYC"}
+{"version":3,"file":"out-flag.js","sourceRoot":"","sources":["out-flag.ts"],"names":[],"mappings":"AAAA,eAAe;AAEf,oBAAoB;AACpB;IAAA;IAYA,CAAC;IAVG,uBAAuB;IAChB,uBAAK,GAAZ;QAEI,MAAM,CAAC,EAAE,CAAC;IACd,CAAC;IAEM,0BAAQ,GAAf,UAAgB,KAAa;QAEzB,EAAE;IACN,CAAC;IACL,cAAC;AAAD,CAAC,AAZD,IAYC"}

tests/baselines/reference/out-flag.sourcemap.txt

@@ -39,7 +39,7 @@ sourceFile:out-flag.ts
 1->^^^^
 2 >    ^^->
 1->
-1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (MyClass)
+1->Emitted(4, 5) Source(4, 1) + SourceIndex(0)
 ---
 >>>    }
 1->^^^^
@@ -59,8 +59,8 @@ sourceFile:out-flag.ts
   >    }
   >
 2 >    }
-1->Emitted(5, 5) Source(16, 1) + SourceIndex(0) name (MyClass.constructor)
-2 >Emitted(5, 6) Source(16, 2) + SourceIndex(0) name (MyClass.constructor)
+1->Emitted(5, 5) Source(16, 1) + SourceIndex(0)
+2 >Emitted(5, 6) Source(16, 2) + SourceIndex(0)
 ---
 >>>    // my function comments
 1->^^^^
@@ -68,8 +68,8 @@ sourceFile:out-flag.ts
 3 >                           ^^^^^^^^^^^^^^^^^->
 1->
 2 >    // my function comments
-1->Emitted(6, 5) Source(6, 5) + SourceIndex(0) name (MyClass)
-2 >Emitted(6, 28) Source(6, 28) + SourceIndex(0) name (MyClass)
+1->Emitted(6, 5) Source(6, 5) + SourceIndex(0)
+2 >Emitted(6, 28) Source(6, 28) + SourceIndex(0)
 ---
 >>>    MyClass.prototype.Count = function () {
 1->^^^^
@@ -79,9 +79,9 @@ sourceFile:out-flag.ts
   >    public 
 2 >    Count
 3 >                           
-1->Emitted(7, 5) Source(7, 12) + SourceIndex(0) name (MyClass)
-2 >Emitted(7, 28) Source(7, 17) + SourceIndex(0) name (MyClass)
-3 >Emitted(7, 31) Source(7, 5) + SourceIndex(0) name (MyClass)
+1->Emitted(7, 5) Source(7, 12) + SourceIndex(0)
+2 >Emitted(7, 28) Source(7, 17) + SourceIndex(0)
+3 >Emitted(7, 31) Source(7, 5) + SourceIndex(0)
 ---
 >>>        return 42;
 1 >^^^^^^^^
@@ -96,11 +96,11 @@ sourceFile:out-flag.ts
 3 >               
 4 >               42
 5 >                 ;
-1 >Emitted(8, 9) Source(9, 9) + SourceIndex(0) name (MyClass.Count)
-2 >Emitted(8, 15) Source(9, 15) + SourceIndex(0) name (MyClass.Count)
-3 >Emitted(8, 16) Source(9, 16) + SourceIndex(0) name (MyClass.Count)
-4 >Emitted(8, 18) Source(9, 18) + SourceIndex(0) name (MyClass.Count)
-5 >Emitted(8, 19) Source(9, 19) + SourceIndex(0) name (MyClass.Count)
+1 >Emitted(8, 9) Source(9, 9) + SourceIndex(0)
+2 >Emitted(8, 15) Source(9, 15) + SourceIndex(0)
+3 >Emitted(8, 16) Source(9, 16) + SourceIndex(0)
+4 >Emitted(8, 18) Source(9, 18) + SourceIndex(0)
+5 >Emitted(8, 19) Source(9, 19) + SourceIndex(0)
 ---
 >>>    };
 1 >^^^^
@@ -109,8 +109,8 @@ sourceFile:out-flag.ts
 1 >
   >    
 2 >    }
-1 >Emitted(9, 5) Source(10, 5) + SourceIndex(0) name (MyClass.Count)
-2 >Emitted(9, 6) Source(10, 6) + SourceIndex(0) name (MyClass.Count)
+1 >Emitted(9, 5) Source(10, 5) + SourceIndex(0)
+2 >Emitted(9, 6) Source(10, 6) + SourceIndex(0)
 ---
 >>>    MyClass.prototype.SetCount = function (value) {
 1->^^^^
@@ -125,11 +125,11 @@ sourceFile:out-flag.ts
 3 >                              
 4 >                                 public SetCount(
 5 >                                           value: number
-1->Emitted(10, 5) Source(12, 12) + SourceIndex(0) name (MyClass)
-2 >Emitted(10, 31) Source(12, 20) + SourceIndex(0) name (MyClass)
-3 >Emitted(10, 34) Source(12, 5) + SourceIndex(0) name (MyClass)
-4 >Emitted(10, 44) Source(12, 21) + SourceIndex(0) name (MyClass)
-5 >Emitted(10, 49) Source(12, 34) + SourceIndex(0) name (MyClass)
+1->Emitted(10, 5) Source(12, 12) + SourceIndex(0)
+2 >Emitted(10, 31) Source(12, 20) + SourceIndex(0)
+3 >Emitted(10, 34) Source(12, 5) + SourceIndex(0)
+4 >Emitted(10, 44) Source(12, 21) + SourceIndex(0)
+5 >Emitted(10, 49) Source(12, 34) + SourceIndex(0)
 ---
 >>>        //
 1 >^^^^^^^^
@@ -138,8 +138,8 @@ sourceFile:out-flag.ts
   >    {
   >        
 2 >        //
-1 >Emitted(11, 9) Source(14, 9) + SourceIndex(0) name (MyClass.SetCount)
-2 >Emitted(11, 11) Source(14, 11) + SourceIndex(0) name (MyClass.SetCount)
+1 >Emitted(11, 9) Source(14, 9) + SourceIndex(0)
+2 >Emitted(11, 11) Source(14, 11) + SourceIndex(0)
 ---
 >>>    };
 1 >^^^^
@@ -148,8 +148,8 @@ sourceFile:out-flag.ts
 1 >
   >    
 2 >    }
-1 >Emitted(12, 5) Source(15, 5) + SourceIndex(0) name (MyClass.SetCount)
-2 >Emitted(12, 6) Source(15, 6) + SourceIndex(0) name (MyClass.SetCount)
+1 >Emitted(12, 5) Source(15, 5) + SourceIndex(0)
+2 >Emitted(12, 6) Source(15, 6) + SourceIndex(0)
 ---
 >>>    return MyClass;
 1->^^^^
@@ -157,8 +157,8 @@ sourceFile:out-flag.ts
 1->
   >
 2 >    }
-1->Emitted(13, 5) Source(16, 1) + SourceIndex(0) name (MyClass)
-2 >Emitted(13, 19) Source(16, 2) + SourceIndex(0) name (MyClass)
+1->Emitted(13, 5) Source(16, 1) + SourceIndex(0)
+2 >Emitted(13, 19) Source(16, 2) + SourceIndex(0)
 ---
 >>>})();
 1 >
@@ -182,8 +182,8 @@ sourceFile:out-flag.ts
   >         //
   >     }
   > }
-1 >Emitted(14, 1) Source(16, 1) + SourceIndex(0) name (MyClass)
-2 >Emitted(14, 2) Source(16, 2) + SourceIndex(0) name (MyClass)
+1 >Emitted(14, 1) Source(16, 1) + SourceIndex(0)
+2 >Emitted(14, 2) Source(16, 2) + SourceIndex(0)
 3 >Emitted(14, 2) Source(4, 1) + SourceIndex(0)
 4 >Emitted(14, 6) Source(16, 2) + SourceIndex(0)
 ---

tests/baselines/reference/out-flag2.js.map

@@ -1,2 +1,2 @@
 //// [c.js.map]
-{"version":3,"file":"c.js","sourceRoot":"","sources":["tests/cases/compiler/a.ts","tests/cases/compiler/b.ts"],"names":["A","A.constructor","B","B.constructor"],"mappings":"AACA;IAAAA;IAAUC,CAACA;IAADD,QAACA;AAADA,CAACA,AAAX,IAAW;ACDX;IAAAE;IAAUC,CAACA;IAADD,QAACA;AAADA,CAACA,AAAX,IAAW"}
+{"version":3,"file":"c.js","sourceRoot":"","sources":["tests/cases/compiler/a.ts","tests/cases/compiler/b.ts"],"names":[],"mappings":"AACA;IAAA;IAAU,CAAC;IAAD,QAAC;AAAD,CAAC,AAAX,IAAW;ACDX;IAAA;IAAU,CAAC;IAAD,QAAC;AAAD,CAAC,AAAX,IAAW"}

tests/baselines/reference/out-flag2.sourcemap.txt

@@ -19,7 +19,7 @@ sourceFile:tests/cases/compiler/a.ts
 1->^^^^
 2 >    ^^->
 1->
-1->Emitted(2, 5) Source(2, 1) + SourceIndex(0) name (A)
+1->Emitted(2, 5) Source(2, 1) + SourceIndex(0)
 ---
 >>>    }
 1->^^^^
@@ -27,16 +27,16 @@ sourceFile:tests/cases/compiler/a.ts
 3 >     ^^^^^^^^^->
 1->class A { 
 2 >    }
-1->Emitted(3, 5) Source(2, 11) + SourceIndex(0) name (A.constructor)
-2 >Emitted(3, 6) Source(2, 12) + SourceIndex(0) name (A.constructor)
+1->Emitted(3, 5) Source(2, 11) + SourceIndex(0)
+2 >Emitted(3, 6) Source(2, 12) + SourceIndex(0)
 ---
 >>>    return A;
 1->^^^^
 2 >    ^^^^^^^^
 1->
 2 >    }
-1->Emitted(4, 5) Source(2, 11) + SourceIndex(0) name (A)
-2 >Emitted(4, 13) Source(2, 12) + SourceIndex(0) name (A)
+1->Emitted(4, 5) Source(2, 11) + SourceIndex(0)
+2 >Emitted(4, 13) Source(2, 12) + SourceIndex(0)
 ---
 >>>})();
 1 >
@@ -48,8 +48,8 @@ sourceFile:tests/cases/compiler/a.ts
 2 >}
 3 > 
 4 > class A { }
-1 >Emitted(5, 1) Source(2, 11) + SourceIndex(0) name (A)
-2 >Emitted(5, 2) Source(2, 12) + SourceIndex(0) name (A)
+1 >Emitted(5, 1) Source(2, 11) + SourceIndex(0)
+2 >Emitted(5, 2) Source(2, 12) + SourceIndex(0)
 3 >Emitted(5, 2) Source(2, 1) + SourceIndex(0)
 4 >Emitted(5, 6) Source(2, 12) + SourceIndex(0)
 ---
@@ -67,7 +67,7 @@ sourceFile:tests/cases/compiler/b.ts
 1->^^^^
 2 >    ^^->
 1->
-1->Emitted(7, 5) Source(1, 1) + SourceIndex(1) name (B)
+1->Emitted(7, 5) Source(1, 1) + SourceIndex(1)
 ---
 >>>    }
 1->^^^^
@@ -75,16 +75,16 @@ sourceFile:tests/cases/compiler/b.ts
 3 >     ^^^^^^^^^->
 1->class B { 
 2 >    }
-1->Emitted(8, 5) Source(1, 11) + SourceIndex(1) name (B.constructor)
-2 >Emitted(8, 6) Source(1, 12) + SourceIndex(1) name (B.constructor)
+1->Emitted(8, 5) Source(1, 11) + SourceIndex(1)
+2 >Emitted(8, 6) Source(1, 12) + SourceIndex(1)
 ---
 >>>    return B;
 1->^^^^
 2 >    ^^^^^^^^
 1->
 2 >    }
-1->Emitted(9, 5) Source(1, 11) + SourceIndex(1) name (B)
-2 >Emitted(9, 13) Source(1, 12) + SourceIndex(1) name (B)
+1->Emitted(9, 5) Source(1, 11) + SourceIndex(1)
+2 >Emitted(9, 13) Source(1, 12) + SourceIndex(1)
 ---
 >>>})();
 1 >
@@ -96,8 +96,8 @@ sourceFile:tests/cases/compiler/b.ts
 2 >}
 3 > 
 4 > class B { }
-1 >Emitted(10, 1) Source(1, 11) + SourceIndex(1) name (B)
-2 >Emitted(10, 2) Source(1, 12) + SourceIndex(1) name (B)
+1 >Emitted(10, 1) Source(1, 11) + SourceIndex(1)
+2 >Emitted(10, 2) Source(1, 12) + SourceIndex(1)
 3 >Emitted(10, 2) Source(1, 1) + SourceIndex(1)
 4 >Emitted(10, 6) Source(1, 12) + SourceIndex(1)
 ---

tests/baselines/reference/out-flag3.js.map

@@ -1,2 +1,2 @@
 //// [c.js.map]
-{"version":3,"file":"c.js","sourceRoot":"","sources":["tests/cases/compiler/a.ts","tests/cases/compiler/b.ts"],"names":["A","A.constructor","B","B.constructor"],"mappings":"AACA,4BAA4B;AAE5B;IAAAA;IAAUC,CAACA;IAADD,QAACA;AAADA,CAACA,AAAX,IAAW;ACHX;IAAAE;IAAUC,CAACA;IAADD,QAACA;AAADA,CAACA,AAAX,IAAW"}
+{"version":3,"file":"c.js","sourceRoot":"","sources":["tests/cases/compiler/a.ts","tests/cases/compiler/b.ts"],"names":[],"mappings":"AACA,4BAA4B;AAE5B;IAAA;IAAU,CAAC;IAAD,QAAC;AAAD,CAAC,AAAX,IAAW;ACHX;IAAA;IAAU,CAAC;IAAD,QAAC;AAAD,CAAC,AAAX,IAAW"}

tests/baselines/reference/out-flag3.sourcemap.txt

@@ -29,7 +29,7 @@ sourceFile:tests/cases/compiler/a.ts
 1->^^^^
 2 >    ^^->
 1->
-1->Emitted(3, 5) Source(4, 1) + SourceIndex(0) name (A)
+1->Emitted(3, 5) Source(4, 1) + SourceIndex(0)
 ---
 >>>    }
 1->^^^^
@@ -37,16 +37,16 @@ sourceFile:tests/cases/compiler/a.ts
 3 >     ^^^^^^^^^->
 1->class A { 
 2 >    }
-1->Emitted(4, 5) Source(4, 11) + SourceIndex(0) name (A.constructor)
-2 >Emitted(4, 6) Source(4, 12) + SourceIndex(0) name (A.constructor)
+1->Emitted(4, 5) Source(4, 11) + SourceIndex(0)
+2 >Emitted(4, 6) Source(4, 12) + SourceIndex(0)
 ---
 >>>    return A;
 1->^^^^
 2 >    ^^^^^^^^
 1->
 2 >    }
-1->Emitted(5, 5) Source(4, 11) + SourceIndex(0) name (A)
-2 >Emitted(5, 13) Source(4, 12) + SourceIndex(0) name (A)
+1->Emitted(5, 5) Source(4, 11) + SourceIndex(0)
+2 >Emitted(5, 13) Source(4, 12) + SourceIndex(0)
 ---
 >>>})();
 1 >
@@ -58,8 +58,8 @@ sourceFile:tests/cases/compiler/a.ts
 2 >}
 3 > 
 4 > class A { }
-1 >Emitted(6, 1) Source(4, 11) + SourceIndex(0) name (A)
-2 >Emitted(6, 2) Source(4, 12) + SourceIndex(0) name (A)
+1 >Emitted(6, 1) Source(4, 11) + SourceIndex(0)
+2 >Emitted(6, 2) Source(4, 12) + SourceIndex(0)
 3 >Emitted(6, 2) Source(4, 1) + SourceIndex(0)
 4 >Emitted(6, 6) Source(4, 12) + SourceIndex(0)
 ---
@@ -77,7 +77,7 @@ sourceFile:tests/cases/compiler/b.ts
 1->^^^^
 2 >    ^^->
 1->
-1->Emitted(8, 5) Source(1, 1) + SourceIndex(1) name (B)
+1->Emitted(8, 5) Source(1, 1) + SourceIndex(1)
 ---
 >>>    }
 1->^^^^
@@ -85,16 +85,16 @@ sourceFile:tests/cases/compiler/b.ts
 3 >     ^^^^^^^^^->
 1->class B { 
 2 >    }
-1->Emitted(9, 5) Source(1, 11) + SourceIndex(1) name (B.constructor)
-2 >Emitted(9, 6) Source(1, 12) + SourceIndex(1) name (B.constructor)
+1->Emitted(9, 5) Source(1, 11) + SourceIndex(1)
+2 >Emitted(9, 6) Source(1, 12) + SourceIndex(1)
 ---
 >>>    return B;
 1->^^^^
 2 >    ^^^^^^^^
 1->
 2 >    }
-1->Emitted(10, 5) Source(1, 11) + SourceIndex(1) name (B)
-2 >Emitted(10, 13) Source(1, 12) + SourceIndex(1) name (B)
+1->Emitted(10, 5) Source(1, 11) + SourceIndex(1)
+2 >Emitted(10, 13) Source(1, 12) + SourceIndex(1)
 ---
 >>>})();
 1 >
@@ -106,8 +106,8 @@ sourceFile:tests/cases/compiler/b.ts
 2 >}
 3 > 
 4 > class B { }
-1 >Emitted(11, 1) Source(1, 11) + SourceIndex(1) name (B)
-2 >Emitted(11, 2) Source(1, 12) + SourceIndex(1) name (B)
+1 >Emitted(11, 1) Source(1, 11) + SourceIndex(1)
+2 >Emitted(11, 2) Source(1, 12) + SourceIndex(1)
 3 >Emitted(11, 2) Source(1, 1) + SourceIndex(1)
 4 >Emitted(11, 6) Source(1, 12) + SourceIndex(1)
 ---

tests/baselines/reference/outModuleConcatAmd.js.map

@@ -1,2 +1,2 @@
 //// [all.js.map]
-{"version":3,"file":"all.js","sourceRoot":"","sources":["tests/cases/compiler/ref/a.ts","tests/cases/compiler/b.ts"],"names":["A","A.constructor","B","B.constructor"],"mappings":";;;;;;;IACA;QAAAA;QAAiBC,CAACA;QAADD,QAACA;IAADA,CAACA,AAAlB,IAAkB;IAAL,SAAC,IAAI,CAAA;;;;ICAlB;QAAuBE,qBAACA;QAAxBA;YAAuBC,8BAACA;QAAGA,CAACA;QAADD,QAACA;IAADA,CAACA,AAA5B,EAAuB,KAAC,EAAI;IAAf,SAAC,IAAc,CAAA"}
+{"version":3,"file":"all.js","sourceRoot":"","sources":["tests/cases/compiler/ref/a.ts","tests/cases/compiler/b.ts"],"names":[],"mappings":";;;;;;;IACA;QAAA;QAAiB,CAAC;QAAD,QAAC;IAAD,CAAC,AAAlB,IAAkB;IAAL,SAAC,IAAI,CAAA;;;;ICAlB;QAAuB,qBAAC;QAAxB;YAAuB,8BAAC;QAAG,CAAC;QAAD,QAAC;IAAD,CAAC,AAA5B,EAAuB,KAAC,EAAI;IAAf,SAAC,IAAc,CAAA"}

tests/baselines/reference/outModuleConcatAmd.sourcemap.txt

@@ -26,7 +26,7 @@ sourceFile:tests/cases/compiler/ref/a.ts
 1->^^^^^^^^
 2 >        ^^->
 1->
-1->Emitted(9, 9) Source(2, 1) + SourceIndex(0) name (A)
+1->Emitted(9, 9) Source(2, 1) + SourceIndex(0)
 ---
 >>>        }
 1->^^^^^^^^
@@ -34,16 +34,16 @@ sourceFile:tests/cases/compiler/ref/a.ts
 3 >         ^^^^^^^^^->
 1->export class A { 
 2 >        }
-1->Emitted(10, 9) Source(2, 18) + SourceIndex(0) name (A.constructor)
-2 >Emitted(10, 10) Source(2, 19) + SourceIndex(0) name (A.constructor)
+1->Emitted(10, 9) Source(2, 18) + SourceIndex(0)
+2 >Emitted(10, 10) Source(2, 19) + SourceIndex(0)
 ---
 >>>        return A;
 1->^^^^^^^^
 2 >        ^^^^^^^^
 1->
 2 >        }
-1->Emitted(11, 9) Source(2, 18) + SourceIndex(0) name (A)
-2 >Emitted(11, 17) Source(2, 19) + SourceIndex(0) name (A)
+1->Emitted(11, 9) Source(2, 18) + SourceIndex(0)
+2 >Emitted(11, 17) Source(2, 19) + SourceIndex(0)
 ---
 >>>    })();
 1 >^^^^
@@ -55,8 +55,8 @@ sourceFile:tests/cases/compiler/ref/a.ts
 2 >    }
 3 >     
 4 >     export class A { }
-1 >Emitted(12, 5) Source(2, 18) + SourceIndex(0) name (A)
-2 >Emitted(12, 6) Source(2, 19) + SourceIndex(0) name (A)
+1 >Emitted(12, 5) Source(2, 18) + SourceIndex(0)
+2 >Emitted(12, 6) Source(2, 19) + SourceIndex(0)
 3 >Emitted(12, 6) Source(2, 1) + SourceIndex(0)
 4 >Emitted(12, 10) Source(2, 19) + SourceIndex(0)
 ---
@@ -93,22 +93,22 @@ sourceFile:tests/cases/compiler/b.ts
 2 >        ^^^^^^^^^^^^^^^^^^^^^
 1->export class B extends 
 2 >        A
-1->Emitted(18, 9) Source(2, 24) + SourceIndex(1) name (B)
-2 >Emitted(18, 30) Source(2, 25) + SourceIndex(1) name (B)
+1->Emitted(18, 9) Source(2, 24) + SourceIndex(1)
+2 >Emitted(18, 30) Source(2, 25) + SourceIndex(1)
 ---
 >>>        function B() {
 1 >^^^^^^^^
 2 >        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
-1 >Emitted(19, 9) Source(2, 1) + SourceIndex(1) name (B)
+1 >Emitted(19, 9) Source(2, 1) + SourceIndex(1)
 ---
 >>>            _super.apply(this, arguments);
 1->^^^^^^^^^^^^
 2 >            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 1->export class B extends 
 2 >            A
-1->Emitted(20, 13) Source(2, 24) + SourceIndex(1) name (B.constructor)
-2 >Emitted(20, 43) Source(2, 25) + SourceIndex(1) name (B.constructor)
+1->Emitted(20, 13) Source(2, 24) + SourceIndex(1)
+2 >Emitted(20, 43) Source(2, 25) + SourceIndex(1)
 ---
 >>>        }
 1 >^^^^^^^^
@@ -116,16 +116,16 @@ sourceFile:tests/cases/compiler/b.ts
 3 >         ^^^^^^^^^->
 1 > { 
 2 >        }
-1 >Emitted(21, 9) Source(2, 28) + SourceIndex(1) name (B.constructor)
-2 >Emitted(21, 10) Source(2, 29) + SourceIndex(1) name (B.constructor)
+1 >Emitted(21, 9) Source(2, 28) + SourceIndex(1)
+2 >Emitted(21, 10) Source(2, 29) + SourceIndex(1)
 ---
 >>>        return B;
 1->^^^^^^^^
 2 >        ^^^^^^^^
 1->
 2 >        }
-1->Emitted(22, 9) Source(2, 28) + SourceIndex(1) name (B)
-2 >Emitted(22, 17) Source(2, 29) + SourceIndex(1) name (B)
+1->Emitted(22, 9) Source(2, 28) + SourceIndex(1)
+2 >Emitted(22, 17) Source(2, 29) + SourceIndex(1)
 ---
 >>>    })(a_1.A);
 1 >^^^^
@@ -141,8 +141,8 @@ sourceFile:tests/cases/compiler/b.ts
 4 >     export class B extends 
 5 >       A
 6 >             { }
-1 >Emitted(23, 5) Source(2, 28) + SourceIndex(1) name (B)
-2 >Emitted(23, 6) Source(2, 29) + SourceIndex(1) name (B)
+1 >Emitted(23, 5) Source(2, 28) + SourceIndex(1)
+2 >Emitted(23, 6) Source(2, 29) + SourceIndex(1)
 3 >Emitted(23, 6) Source(2, 1) + SourceIndex(1)
 4 >Emitted(23, 8) Source(2, 24) + SourceIndex(1)
 5 >Emitted(23, 13) Source(2, 25) + SourceIndex(1)

tests/baselines/reference/outModuleConcatSystem.js.map

@@ -1,2 +1,2 @@
 //// [all.js.map]
-{"version":3,"file":"all.js","sourceRoot":"","sources":["tests/cases/compiler/ref/a.ts","tests/cases/compiler/b.ts"],"names":["A","A.constructor","B","B.constructor"],"mappings":";;;;;;;;;;;YACA;gBAAAA;gBAAiBC,CAACA;gBAADD,QAACA;YAADA,CAACA,AAAlB,IAAkB;YAAlB,iBAAkB,CAAA;;;;;;;;;;;;;;YCAlB;gBAAuBE,qBAACA;gBAAxBA;oBAAuBC,8BAACA;gBAAGA,CAACA;gBAADD,QAACA;YAADA,CAACA,AAA5B,EAAuB,KAAC,EAAI;YAA5B,iBAA4B,CAAA"}
+{"version":3,"file":"all.js","sourceRoot":"","sources":["tests/cases/compiler/ref/a.ts","tests/cases/compiler/b.ts"],"names":[],"mappings":";;;;;;;;;;;YACA;gBAAA;gBAAiB,CAAC;gBAAD,QAAC;YAAD,CAAC,AAAlB,IAAkB;YAAlB,iBAAkB,CAAA;;;;;;;;;;;;;;YCAlB;gBAAuB,qBAAC;gBAAxB;oBAAuB,8BAAC;gBAAG,CAAC;gBAAD,QAAC;YAAD,CAAC,AAA5B,EAAuB,KAAC,EAAI;YAA5B,iBAA4B,CAAA"}

tests/baselines/reference/outModuleConcatSystem.sourcemap.txt

@@ -30,7 +30,7 @@ sourceFile:tests/cases/compiler/ref/a.ts
 1->^^^^^^^^^^^^^^^^
 2 >                ^^->
 1->
-1->Emitted(13, 17) Source(2, 1) + SourceIndex(0) name (A)
+1->Emitted(13, 17) Source(2, 1) + SourceIndex(0)
 ---
 >>>                }
 1->^^^^^^^^^^^^^^^^
@@ -38,16 +38,16 @@ sourceFile:tests/cases/compiler/ref/a.ts
 3 >                 ^^^^^^^^^->
 1->export class A { 
 2 >                }
-1->Emitted(14, 17) Source(2, 18) + SourceIndex(0) name (A.constructor)
-2 >Emitted(14, 18) Source(2, 19) + SourceIndex(0) name (A.constructor)
+1->Emitted(14, 17) Source(2, 18) + SourceIndex(0)
+2 >Emitted(14, 18) Source(2, 19) + SourceIndex(0)
 ---
 >>>                return A;
 1->^^^^^^^^^^^^^^^^
 2 >                ^^^^^^^^
 1->
 2 >                }
-1->Emitted(15, 17) Source(2, 18) + SourceIndex(0) name (A)
-2 >Emitted(15, 25) Source(2, 19) + SourceIndex(0) name (A)
+1->Emitted(15, 17) Source(2, 18) + SourceIndex(0)
+2 >Emitted(15, 25) Source(2, 19) + SourceIndex(0)
 ---
 >>>            })();
 1 >^^^^^^^^^^^^
@@ -59,8 +59,8 @@ sourceFile:tests/cases/compiler/ref/a.ts
 2 >            }
 3 >             
 4 >             export class A { }
-1 >Emitted(16, 13) Source(2, 18) + SourceIndex(0) name (A)
-2 >Emitted(16, 14) Source(2, 19) + SourceIndex(0) name (A)
+1 >Emitted(16, 13) Source(2, 18) + SourceIndex(0)
+2 >Emitted(16, 14) Source(2, 19) + SourceIndex(0)
 3 >Emitted(16, 14) Source(2, 1) + SourceIndex(0)
 4 >Emitted(16, 18) Source(2, 19) + SourceIndex(0)
 ---
@@ -104,22 +104,22 @@ sourceFile:tests/cases/compiler/b.ts
 2 >                ^^^^^^^^^^^^^^^^^^^^^
 1->export class B extends 
 2 >                A
-1->Emitted(32, 17) Source(2, 24) + SourceIndex(1) name (B)
-2 >Emitted(32, 38) Source(2, 25) + SourceIndex(1) name (B)
+1->Emitted(32, 17) Source(2, 24) + SourceIndex(1)
+2 >Emitted(32, 38) Source(2, 25) + SourceIndex(1)
 ---
 >>>                function B() {
 1 >^^^^^^^^^^^^^^^^
 2 >                ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
-1 >Emitted(33, 17) Source(2, 1) + SourceIndex(1) name (B)
+1 >Emitted(33, 17) Source(2, 1) + SourceIndex(1)
 ---
 >>>                    _super.apply(this, arguments);
 1->^^^^^^^^^^^^^^^^^^^^
 2 >                    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 1->export class B extends 
 2 >                    A
-1->Emitted(34, 21) Source(2, 24) + SourceIndex(1) name (B.constructor)
-2 >Emitted(34, 51) Source(2, 25) + SourceIndex(1) name (B.constructor)
+1->Emitted(34, 21) Source(2, 24) + SourceIndex(1)
+2 >Emitted(34, 51) Source(2, 25) + SourceIndex(1)
 ---
 >>>                }
 1 >^^^^^^^^^^^^^^^^
@@ -127,16 +127,16 @@ sourceFile:tests/cases/compiler/b.ts
 3 >                 ^^^^^^^^^->
 1 > { 
 2 >                }
-1 >Emitted(35, 17) Source(2, 28) + SourceIndex(1) name (B.constructor)
-2 >Emitted(35, 18) Source(2, 29) + SourceIndex(1) name (B.constructor)
+1 >Emitted(35, 17) Source(2, 28) + SourceIndex(1)
+2 >Emitted(35, 18) Source(2, 29) + SourceIndex(1)
 ---
 >>>                return B;
 1->^^^^^^^^^^^^^^^^
 2 >                ^^^^^^^^
 1->
 2 >                }
-1->Emitted(36, 17) Source(2, 28) + SourceIndex(1) name (B)
-2 >Emitted(36, 25) Source(2, 29) + SourceIndex(1) name (B)
+1->Emitted(36, 17) Source(2, 28) + SourceIndex(1)
+2 >Emitted(36, 25) Source(2, 29) + SourceIndex(1)
 ---
 >>>            })(a_1.A);
 1 >^^^^^^^^^^^^
@@ -152,8 +152,8 @@ sourceFile:tests/cases/compiler/b.ts
 4 >             export class B extends 
 5 >               A
 6 >                     { }
-1 >Emitted(37, 13) Source(2, 28) + SourceIndex(1) name (B)
-2 >Emitted(37, 14) Source(2, 29) + SourceIndex(1) name (B)
+1 >Emitted(37, 13) Source(2, 28) + SourceIndex(1)
+2 >Emitted(37, 14) Source(2, 29) + SourceIndex(1)
 3 >Emitted(37, 14) Source(2, 1) + SourceIndex(1)
 4 >Emitted(37, 16) Source(2, 24) + SourceIndex(1)
 5 >Emitted(37, 21) Source(2, 25) + SourceIndex(1)

tests/baselines/reference/outModuleTripleSlashRefs.js.map

@@ -1,2 +1,2 @@
 //// [all.js.map]
-{"version":3,"file":"all.js","sourceRoot":"","sources":["tests/cases/compiler/ref/b.ts","tests/cases/compiler/ref/a.ts","tests/cases/compiler/b.ts"],"names":["Foo","Foo.constructor","A","A.constructor","B","B.constructor"],"mappings":";;;;;AAAA,iCAAiC;AACjC;IAAAA;IAEAC,CAACA;IAADD,UAACA;AAADA,CAACA,AAFD,IAEC;;;ICFD,+BAA+B;IAC/B;QAAAE;QAEAC,CAACA;QAADD,QAACA;IAADA,CAACA,AAFD,IAEC;IAFY,SAAC,IAEb,CAAA;;;;ICHD;QAAuBE,qBAACA;QAAxBA;YAAuBC,8BAACA;QAAGA,CAACA;QAADD,QAACA;IAADA,CAACA,AAA5B,EAAuB,KAAC,EAAI;IAAf,SAAC,IAAc,CAAA"}
+{"version":3,"file":"all.js","sourceRoot":"","sources":["tests/cases/compiler/ref/b.ts","tests/cases/compiler/ref/a.ts","tests/cases/compiler/b.ts"],"names":[],"mappings":";;;;;AAAA,iCAAiC;AACjC;IAAA;IAEA,CAAC;IAAD,UAAC;AAAD,CAAC,AAFD,IAEC;;;ICFD,+BAA+B;IAC/B;QAAA;QAEA,CAAC;QAAD,QAAC;IAAD,CAAC,AAFD,IAEC;IAFY,SAAC,IAEb,CAAA;;;;ICHD;QAAuB,qBAAC;QAAxB;YAAuB,8BAAC;QAAG,CAAC;QAAD,QAAC;IAAD,CAAC,AAA5B,EAAuB,KAAC,EAAI;IAAf,SAAC,IAAc,CAAA"}

tests/baselines/reference/outModuleTripleSlashRefs.sourcemap.txt

@@ -32,7 +32,7 @@ sourceFile:tests/cases/compiler/ref/b.ts
 1->^^^^
 2 >    ^^->
 1->
-1->Emitted(8, 5) Source(2, 1) + SourceIndex(0) name (Foo)
+1->Emitted(8, 5) Source(2, 1) + SourceIndex(0)
 ---
 >>>    }
 1->^^^^
@@ -42,16 +42,16 @@ sourceFile:tests/cases/compiler/ref/b.ts
   >	member: Bar;
   >
 2 >    }
-1->Emitted(9, 5) Source(4, 1) + SourceIndex(0) name (Foo.constructor)
-2 >Emitted(9, 6) Source(4, 2) + SourceIndex(0) name (Foo.constructor)
+1->Emitted(9, 5) Source(4, 1) + SourceIndex(0)
+2 >Emitted(9, 6) Source(4, 2) + SourceIndex(0)
 ---
 >>>    return Foo;
 1->^^^^
 2 >    ^^^^^^^^^^
 1->
 2 >    }
-1->Emitted(10, 5) Source(4, 1) + SourceIndex(0) name (Foo)
-2 >Emitted(10, 15) Source(4, 2) + SourceIndex(0) name (Foo)
+1->Emitted(10, 5) Source(4, 1) + SourceIndex(0)
+2 >Emitted(10, 15) Source(4, 2) + SourceIndex(0)
 ---
 >>>})();
 1 >
@@ -65,8 +65,8 @@ sourceFile:tests/cases/compiler/ref/b.ts
 4 > class Foo {
   > 	member: Bar;
   > }
-1 >Emitted(11, 1) Source(4, 1) + SourceIndex(0) name (Foo)
-2 >Emitted(11, 2) Source(4, 2) + SourceIndex(0) name (Foo)
+1 >Emitted(11, 1) Source(4, 1) + SourceIndex(0)
+2 >Emitted(11, 2) Source(4, 2) + SourceIndex(0)
 3 >Emitted(11, 2) Source(2, 1) + SourceIndex(0)
 4 >Emitted(11, 6) Source(4, 2) + SourceIndex(0)
 ---
@@ -96,7 +96,7 @@ sourceFile:tests/cases/compiler/ref/a.ts
 1->^^^^^^^^
 2 >        ^^->
 1->
-1->Emitted(16, 9) Source(3, 1) + SourceIndex(1) name (A)
+1->Emitted(16, 9) Source(3, 1) + SourceIndex(1)
 ---
 >>>        }
 1->^^^^^^^^
@@ -106,16 +106,16 @@ sourceFile:tests/cases/compiler/ref/a.ts
   >	member: typeof GlobalFoo;
   >
 2 >        }
-1->Emitted(17, 9) Source(5, 1) + SourceIndex(1) name (A.constructor)
-2 >Emitted(17, 10) Source(5, 2) + SourceIndex(1) name (A.constructor)
+1->Emitted(17, 9) Source(5, 1) + SourceIndex(1)
+2 >Emitted(17, 10) Source(5, 2) + SourceIndex(1)
 ---
 >>>        return A;
 1->^^^^^^^^
 2 >        ^^^^^^^^
 1->
 2 >        }
-1->Emitted(18, 9) Source(5, 1) + SourceIndex(1) name (A)
-2 >Emitted(18, 17) Source(5, 2) + SourceIndex(1) name (A)
+1->Emitted(18, 9) Source(5, 1) + SourceIndex(1)
+2 >Emitted(18, 17) Source(5, 2) + SourceIndex(1)
 ---
 >>>    })();
 1 >^^^^
@@ -129,8 +129,8 @@ sourceFile:tests/cases/compiler/ref/a.ts
 4 >     export class A {
   >     	member: typeof GlobalFoo;
   >     }
-1 >Emitted(19, 5) Source(5, 1) + SourceIndex(1) name (A)
-2 >Emitted(19, 6) Source(5, 2) + SourceIndex(1) name (A)
+1 >Emitted(19, 5) Source(5, 1) + SourceIndex(1)
+2 >Emitted(19, 6) Source(5, 2) + SourceIndex(1)
 3 >Emitted(19, 6) Source(3, 1) + SourceIndex(1)
 4 >Emitted(19, 10) Source(5, 2) + SourceIndex(1)
 ---
@@ -169,22 +169,22 @@ sourceFile:tests/cases/compiler/b.ts
 2 >        ^^^^^^^^^^^^^^^^^^^^^
 1->export class B extends 
 2 >        A
-1->Emitted(25, 9) Source(2, 24) + SourceIndex(2) name (B)
-2 >Emitted(25, 30) Source(2, 25) + SourceIndex(2) name (B)
+1->Emitted(25, 9) Source(2, 24) + SourceIndex(2)
+2 >Emitted(25, 30) Source(2, 25) + SourceIndex(2)
 ---
 >>>        function B() {
 1 >^^^^^^^^
 2 >        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
 1 >
-1 >Emitted(26, 9) Source(2, 1) + SourceIndex(2) name (B)
+1 >Emitted(26, 9) Source(2, 1) + SourceIndex(2)
 ---
 >>>            _super.apply(this, arguments);
 1->^^^^^^^^^^^^
 2 >            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 1->export class B extends 
 2 >            A
-1->Emitted(27, 13) Source(2, 24) + SourceIndex(2) name (B.constructor)
-2 >Emitted(27, 43) Source(2, 25) + SourceIndex(2) name (B.constructor)
+1->Emitted(27, 13) Source(2, 24) + SourceIndex(2)
+2 >Emitted(27, 43) Source(2, 25) + SourceIndex(2)
 ---
 >>>        }
 1 >^^^^^^^^
@@ -192,16 +192,16 @@ sourceFile:tests/cases/compiler/b.ts
 3 >         ^^^^^^^^^->
 1 > { 
 2 >        }
-1 >Emitted(28, 9) Source(2, 28) + SourceIndex(2) name (B.constructor)
-2 >Emitted(28, 10) Source(2, 29) + SourceIndex(2) name (B.constructor)
+1 >Emitted(28, 9) Source(2, 28) + SourceIndex(2)
+2 >Emitted(28, 10) Source(2, 29) + SourceIndex(2)
 ---
 >>>        return B;
 1->^^^^^^^^
 2 >        ^^^^^^^^
 1->
 2 >        }
-1->Emitted(29, 9) Source(2, 28) + SourceIndex(2) name (B)
-2 >Emitted(29, 17) Source(2, 29) + SourceIndex(2) name (B)
+1->Emitted(29, 9) Source(2, 28) + SourceIndex(2)
+2 >Emitted(29, 17) Source(2, 29) + SourceIndex(2)
 ---
 >>>    })(a_1.A);
 1 >^^^^
@@ -217,8 +217,8 @@ sourceFile:tests/cases/compiler/b.ts
 4 >     export class B extends 
 5 >       A
 6 >             { }
-1 >Emitted(30, 5) Source(2, 28) + SourceIndex(2) name (B)
-2 >Emitted(30, 6) Source(2, 29) + SourceIndex(2) name (B)
+1 >Emitted(30, 5) Source(2, 28) + SourceIndex(2)
+2 >Emitted(30, 6) Source(2, 29) + SourceIndex(2)
 3 >Emitted(30, 6) Source(2, 1) + SourceIndex(2)
 4 >Emitted(30, 8) Source(2, 24) + SourceIndex(2)
 5 >Emitted(30, 13) Source(2, 25) + SourceIndex(2)

tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/amd/mapRootAbsolutePathMixedSubfolderNoOutdir.sourcemap.txt

@@ -40,7 +40,7 @@ sourceFile:../../ref/m1.ts
 1->^^^^
 2 >    ^^->
 1->
-1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1)
+1->Emitted(3, 5) Source(2, 1) + SourceIndex(0)
 ---
 >>>    }
 1->^^^^
@@ -50,16 +50,16 @@ sourceFile:../../ref/m1.ts
   >    public m1_c1_p1: number;
   >
 2 >    }
-1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor)
-2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor)
+1->Emitted(4, 5) Source(4, 1) + SourceIndex(0)
+2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0)
 ---
 >>>    return m1_c1;
 1->^^^^
 2 >    ^^^^^^^^^^^^
 1->
 2 >    }
-1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (m1_c1)
-2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) name (m1_c1)
+1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
+2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
 >>>})();
 1 >
@@ -73,8 +73,8 @@ sourceFile:../../ref/m1.ts
 4 > class m1_c1 {
   >     public m1_c1_p1: number;
   > }
-1 >Emitted(6, 1) Source(4, 1) + SourceIndex(0) name (m1_c1)
-2 >Emitted(6, 2) Source(4, 2) + SourceIndex(0) name (m1_c1)
+1 >Emitted(6, 1) Source(4, 1) + SourceIndex(0)
+2 >Emitted(6, 2) Source(4, 2) + SourceIndex(0)
 3 >Emitted(6, 2) Source(2, 1) + SourceIndex(0)
 4 >Emitted(6, 6) Source(4, 2) + SourceIndex(0)
 ---
@@ -125,11 +125,11 @@ sourceFile:../../ref/m1.ts
 3 >           
 4 >           m1_instance1
 5 >                       ;
-1->Emitted(9, 5) Source(8, 5) + SourceIndex(0) name (m1_f1)
-2 >Emitted(9, 11) Source(8, 11) + SourceIndex(0) name (m1_f1)
-3 >Emitted(9, 12) Source(8, 12) + SourceIndex(0) name (m1_f1)
-4 >Emitted(9, 24) Source(8, 24) + SourceIndex(0) name (m1_f1)
-5 >Emitted(9, 25) Source(8, 25) + SourceIndex(0) name (m1_f1)
+1->Emitted(9, 5) Source(8, 5) + SourceIndex(0)
+2 >Emitted(9, 11) Source(8, 11) + SourceIndex(0)
+3 >Emitted(9, 12) Source(8, 12) + SourceIndex(0)
+4 >Emitted(9, 24) Source(8, 24) + SourceIndex(0)
+5 >Emitted(9, 25) Source(8, 25) + SourceIndex(0)
 ---
 >>>}
 1 >
@@ -138,8 +138,8 @@ sourceFile:../../ref/m1.ts
 1 >
   >
 2 >}
-1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) name (m1_f1)
-2 >Emitted(10, 2) Source(9, 2) + SourceIndex(0) name (m1_f1)
+1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0)
+2 >Emitted(10, 2) Source(9, 2) + SourceIndex(0)
 ---
 >>>//# sourceMappingURL=/tests/cases/projects/outputdir_mixed_subfolder/mapFiles/ref/m1.js.map===================================================================
 JsFile: m2.js
@@ -182,7 +182,7 @@ sourceFile:../../ref/m2.ts
 1->^^^^^^^^
 2 >        ^^->
 1->
-1->Emitted(5, 9) Source(2, 1) + SourceIndex(0) name (m2_c1)
+1->Emitted(5, 9) Source(2, 1) + SourceIndex(0)
 ---
 >>>        }
 1->^^^^^^^^
@@ -192,16 +192,16 @@ sourceFile:../../ref/m2.ts
   >    public m2_c1_p1: number;
   >
 2 >        }
-1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor)
-2 >Emitted(6, 10) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor)
+1->Emitted(6, 9) Source(4, 1) + SourceIndex(0)
+2 >Emitted(6, 10) Source(4, 2) + SourceIndex(0)
 ---
 >>>        return m2_c1;
 1->^^^^^^^^
 2 >        ^^^^^^^^^^^^
 1->
 2 >        }
-1->Emitted(7, 9) Source(4, 1) + SourceIndex(0) name (m2_c1)
-2 >Emitted(7, 21) Source(4, 2) + SourceIndex(0) name (m2_c1)
+1->Emitted(7, 9) Source(4, 1) + SourceIndex(0)
+2 >Emitted(7, 21) Source(4, 2) + SourceIndex(0)
 ---
 >>>    })();
 1 >^^^^
@@ -215,8 +215,8 @@ sourceFile:../../ref/m2.ts
 4 >     export class m2_c1 {
   >         public m2_c1_p1: number;
   >     }
-1 >Emitted(8, 5) Source(4, 1) + SourceIndex(0) name (m2_c1)
-2 >Emitted(8, 6) Source(4, 2) + SourceIndex(0) name (m2_c1)
+1 >Emitted(8, 5) Source(4, 1) + SourceIndex(0)
+2 >Emitted(8, 6) Source(4, 2) + SourceIndex(0)
 3 >Emitted(8, 6) Source(2, 1) + SourceIndex(0)
 4 >Emitted(8, 10) Source(4, 2) + SourceIndex(0)
 ---
@@ -281,11 +281,11 @@ sourceFile:../../ref/m2.ts
 3 >               
 4 >               m2_instance1
 5 >                                   ;
-1->Emitted(12, 9) Source(8, 5) + SourceIndex(0) name (m2_f1)
-2 >Emitted(12, 15) Source(8, 11) + SourceIndex(0) name (m2_f1)
-3 >Emitted(12, 16) Source(8, 12) + SourceIndex(0) name (m2_f1)
-4 >Emitted(12, 36) Source(8, 24) + SourceIndex(0) name (m2_f1)
-5 >Emitted(12, 37) Source(8, 25) + SourceIndex(0) name (m2_f1)
+1->Emitted(12, 9) Source(8, 5) + SourceIndex(0)
+2 >Emitted(12, 15) Source(8, 11) + SourceIndex(0)
+3 >Emitted(12, 16) Source(8, 12) + SourceIndex(0)
+4 >Emitted(12, 36) Source(8, 24) + SourceIndex(0)
+5 >Emitted(12, 37) Source(8, 25) + SourceIndex(0)
 ---
 >>>    }
 1 >^^^^
@@ -294,8 +294,8 @@ sourceFile:../../ref/m2.ts
 1 >
   >
 2 >    }
-1 >Emitted(13, 5) Source(9, 1) + SourceIndex(0) name (m2_f1)
-2 >Emitted(13, 6) Source(9, 2) + SourceIndex(0) name (m2_f1)
+1 >Emitted(13, 5) Source(9, 1) + SourceIndex(0)
+2 >Emitted(13, 6) Source(9, 2) + SourceIndex(0)
 ---
 >>>    exports.m2_f1 = m2_f1;
 1->^^^^
@@ -375,7 +375,7 @@ sourceFile:../test.ts
 1->^^^^
 2 >    ^^->
 1->
-1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (c1)
+1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 ---
 >>>    }
 1->^^^^
@@ -385,16 +385,16 @@ sourceFile:../test.ts
   >    public p1: number;
   >
 2 >    }
-1->Emitted(6, 5) Source(6, 1) + SourceIndex(0) name (c1.constructor)
-2 >Emitted(6, 6) Source(6, 2) + SourceIndex(0) name (c1.constructor)
+1->Emitted(6, 5) Source(6, 1) + SourceIndex(0)
+2 >Emitted(6, 6) Source(6, 2) + SourceIndex(0)
 ---
 >>>    return c1;
 1->^^^^
 2 >    ^^^^^^^^^
 1->
 2 >    }
-1->Emitted(7, 5) Source(6, 1) + SourceIndex(0) name (c1)
-2 >Emitted(7, 14) Source(6, 2) + SourceIndex(0) name (c1)
+1->Emitted(7, 5) Source(6, 1) + SourceIndex(0)
+2 >Emitted(7, 14) Source(6, 2) + SourceIndex(0)
 ---
 >>>})();
 1 >
@@ -408,8 +408,8 @@ sourceFile:../test.ts
 4 > class c1 {
   >     public p1: number;
   > }
-1 >Emitted(8, 1) Source(6, 1) + SourceIndex(0) name (c1)
-2 >Emitted(8, 2) Source(6, 2) + SourceIndex(0) name (c1)
+1 >Emitted(8, 1) Source(6, 1) + SourceIndex(0)
+2 >Emitted(8, 2) Source(6, 2) + SourceIndex(0)
 3 >Emitted(8, 2) Source(4, 1) + SourceIndex(0)
 4 >Emitted(8, 6) Source(6, 2) + SourceIndex(0)
 ---
@@ -460,11 +460,11 @@ sourceFile:../test.ts
 3 >           
 4 >           instance1
 5 >                    ;
-1->Emitted(11, 5) Source(10, 5) + SourceIndex(0) name (f1)
-2 >Emitted(11, 11) Source(10, 11) + SourceIndex(0) name (f1)
-3 >Emitted(11, 12) Source(10, 12) + SourceIndex(0) name (f1)
-4 >Emitted(11, 21) Source(10, 21) + SourceIndex(0) name (f1)
-5 >Emitted(11, 22) Source(10, 22) + SourceIndex(0) name (f1)
+1->Emitted(11, 5) Source(10, 5) + SourceIndex(0)
+2 >Emitted(11, 11) Source(10, 11) + SourceIndex(0)
+3 >Emitted(11, 12) Source(10, 12) + SourceIndex(0)
+4 >Emitted(11, 21) Source(10, 21) + SourceIndex(0)
+5 >Emitted(11, 22) Source(10, 22) + SourceIndex(0)
 ---
 >>>}
 1 >
@@ -473,7 +473,7 @@ sourceFile:../test.ts
 1 >
   >
 2 >}
-1 >Emitted(12, 1) Source(11, 1) + SourceIndex(0) name (f1)
-2 >Emitted(12, 2) Source(11, 2) + SourceIndex(0) name (f1)
+1 >Emitted(12, 1) Source(11, 1) + SourceIndex(0)
+2 >Emitted(12, 2) Source(11, 2) + SourceIndex(0)
 ---
 >>>//# sourceMappingURL=/tests/cases/projects/outputdir_mixed_subfolder/mapFiles/test.js.map

tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/amd/ref/m1.js.map

@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"}
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../ref/m1.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC"}

tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/amd/ref/m2.js.map

@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":";;IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAA;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA"}
+{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../ref/m2.ts"],"names":[],"mappings":";;IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFe,aAAK,QAEpB,CAAA"}

tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/amd/test.js.map

@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":[],"mappings":"AAAA,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}

tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/node/mapRootAbsolutePathMixedSubfolderNoOutdir.sourcemap.txt

@@ -40,7 +40,7 @@ sourceFile:../../ref/m1.ts
 1->^^^^
 2 >    ^^->
 1->
-1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1)
+1->Emitted(3, 5) Source(2, 1) + SourceIndex(0)
 ---
 >>>    }
 1->^^^^
@@ -50,16 +50,16 @@ sourceFile:../../ref/m1.ts
   >    public m1_c1_p1: number;
   >
 2 >    }
-1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor)
-2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor)
+1->Emitted(4, 5) Source(4, 1) + SourceIndex(0)
+2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0)
 ---
 >>>    return m1_c1;
 1->^^^^
 2 >    ^^^^^^^^^^^^
 1->
 2 >    }
-1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (m1_c1)
-2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) name (m1_c1)
+1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
+2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
 >>>})();
 1 >
@@ -73,8 +73,8 @@ sourceFile:../../ref/m1.ts
 4 > class m1_c1 {
   >     public m1_c1_p1: number;
   > }
-1 >Emitted(6, 1) Source(4, 1) + SourceIndex(0) name (m1_c1)
-2 >Emitted(6, 2) Source(4, 2) + SourceIndex(0) name (m1_c1)
+1 >Emitted(6, 1) Source(4, 1) + SourceIndex(0)
+2 >Emitted(6, 2) Source(4, 2) + SourceIndex(0)
 3 >Emitted(6, 2) Source(2, 1) + SourceIndex(0)
 4 >Emitted(6, 6) Source(4, 2) + SourceIndex(0)
 ---
@@ -125,11 +125,11 @@ sourceFile:../../ref/m1.ts
 3 >           
 4 >           m1_instance1
 5 >                       ;
-1->Emitted(9, 5) Source(8, 5) + SourceIndex(0) name (m1_f1)
-2 >Emitted(9, 11) Source(8, 11) + SourceIndex(0) name (m1_f1)
-3 >Emitted(9, 12) Source(8, 12) + SourceIndex(0) name (m1_f1)
-4 >Emitted(9, 24) Source(8, 24) + SourceIndex(0) name (m1_f1)
-5 >Emitted(9, 25) Source(8, 25) + SourceIndex(0) name (m1_f1)
+1->Emitted(9, 5) Source(8, 5) + SourceIndex(0)
+2 >Emitted(9, 11) Source(8, 11) + SourceIndex(0)
+3 >Emitted(9, 12) Source(8, 12) + SourceIndex(0)
+4 >Emitted(9, 24) Source(8, 24) + SourceIndex(0)
+5 >Emitted(9, 25) Source(8, 25) + SourceIndex(0)
 ---
 >>>}
 1 >
@@ -138,8 +138,8 @@ sourceFile:../../ref/m1.ts
 1 >
   >
 2 >}
-1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) name (m1_f1)
-2 >Emitted(10, 2) Source(9, 2) + SourceIndex(0) name (m1_f1)
+1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0)
+2 >Emitted(10, 2) Source(9, 2) + SourceIndex(0)
 ---
 >>>//# sourceMappingURL=/tests/cases/projects/outputdir_mixed_subfolder/mapFiles/ref/m1.js.map===================================================================
 JsFile: m2.js
@@ -181,7 +181,7 @@ sourceFile:../../ref/m2.ts
 1->^^^^
 2 >    ^^->
 1->
-1->Emitted(4, 5) Source(2, 1) + SourceIndex(0) name (m2_c1)
+1->Emitted(4, 5) Source(2, 1) + SourceIndex(0)
 ---
 >>>    }
 1->^^^^
@@ -191,16 +191,16 @@ sourceFile:../../ref/m2.ts
   >    public m2_c1_p1: number;
   >
 2 >    }
-1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor)
-2 >Emitted(5, 6) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor)
+1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
+2 >Emitted(5, 6) Source(4, 2) + SourceIndex(0)
 ---
 >>>    return m2_c1;
 1->^^^^
 2 >    ^^^^^^^^^^^^
 1->
 2 >    }
-1->Emitted(6, 5) Source(4, 1) + SourceIndex(0) name (m2_c1)
-2 >Emitted(6, 17) Source(4, 2) + SourceIndex(0) name (m2_c1)
+1->Emitted(6, 5) Source(4, 1) + SourceIndex(0)
+2 >Emitted(6, 17) Source(4, 2) + SourceIndex(0)
 ---
 >>>})();
 1 >
@@ -214,8 +214,8 @@ sourceFile:../../ref/m2.ts
 4 > export class m2_c1 {
   >     public m2_c1_p1: number;
   > }
-1 >Emitted(7, 1) Source(4, 1) + SourceIndex(0) name (m2_c1)
-2 >Emitted(7, 2) Source(4, 2) + SourceIndex(0) name (m2_c1)
+1 >Emitted(7, 1) Source(4, 1) + SourceIndex(0)
+2 >Emitted(7, 2) Source(4, 2) + SourceIndex(0)
 3 >Emitted(7, 2) Source(2, 1) + SourceIndex(0)
 4 >Emitted(7, 6) Source(4, 2) + SourceIndex(0)
 ---
@@ -280,11 +280,11 @@ sourceFile:../../ref/m2.ts
 3 >           
 4 >           m2_instance1
 5 >                               ;
-1->Emitted(11, 5) Source(8, 5) + SourceIndex(0) name (m2_f1)
-2 >Emitted(11, 11) Source(8, 11) + SourceIndex(0) name (m2_f1)
-3 >Emitted(11, 12) Source(8, 12) + SourceIndex(0) name (m2_f1)
-4 >Emitted(11, 32) Source(8, 24) + SourceIndex(0) name (m2_f1)
-5 >Emitted(11, 33) Source(8, 25) + SourceIndex(0) name (m2_f1)
+1->Emitted(11, 5) Source(8, 5) + SourceIndex(0)
+2 >Emitted(11, 11) Source(8, 11) + SourceIndex(0)
+3 >Emitted(11, 12) Source(8, 12) + SourceIndex(0)
+4 >Emitted(11, 32) Source(8, 24) + SourceIndex(0)
+5 >Emitted(11, 33) Source(8, 25) + SourceIndex(0)
 ---
 >>>}
 1 >
@@ -293,8 +293,8 @@ sourceFile:../../ref/m2.ts
 1 >
   >
 2 >}
-1 >Emitted(12, 1) Source(9, 1) + SourceIndex(0) name (m2_f1)
-2 >Emitted(12, 2) Source(9, 2) + SourceIndex(0) name (m2_f1)
+1 >Emitted(12, 1) Source(9, 1) + SourceIndex(0)
+2 >Emitted(12, 2) Source(9, 2) + SourceIndex(0)
 ---
 >>>exports.m2_f1 = m2_f1;
 1->
@@ -374,7 +374,7 @@ sourceFile:../test.ts
 1->^^^^
 2 >    ^^->
 1->
-1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (c1)
+1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 ---
 >>>    }
 1->^^^^
@@ -384,16 +384,16 @@ sourceFile:../test.ts
   >    public p1: number;
   >
 2 >    }
-1->Emitted(6, 5) Source(6, 1) + SourceIndex(0) name (c1.constructor)
-2 >Emitted(6, 6) Source(6, 2) + SourceIndex(0) name (c1.constructor)
+1->Emitted(6, 5) Source(6, 1) + SourceIndex(0)
+2 >Emitted(6, 6) Source(6, 2) + SourceIndex(0)
 ---
 >>>    return c1;
 1->^^^^
 2 >    ^^^^^^^^^
 1->
 2 >    }
-1->Emitted(7, 5) Source(6, 1) + SourceIndex(0) name (c1)
-2 >Emitted(7, 14) Source(6, 2) + SourceIndex(0) name (c1)
+1->Emitted(7, 5) Source(6, 1) + SourceIndex(0)
+2 >Emitted(7, 14) Source(6, 2) + SourceIndex(0)
 ---
 >>>})();
 1 >
@@ -407,8 +407,8 @@ sourceFile:../test.ts
 4 > class c1 {
   >     public p1: number;
   > }
-1 >Emitted(8, 1) Source(6, 1) + SourceIndex(0) name (c1)
-2 >Emitted(8, 2) Source(6, 2) + SourceIndex(0) name (c1)
+1 >Emitted(8, 1) Source(6, 1) + SourceIndex(0)
+2 >Emitted(8, 2) Source(6, 2) + SourceIndex(0)
 3 >Emitted(8, 2) Source(4, 1) + SourceIndex(0)
 4 >Emitted(8, 6) Source(6, 2) + SourceIndex(0)
 ---
@@ -459,11 +459,11 @@ sourceFile:../test.ts
 3 >           
 4 >           instance1
 5 >                    ;
-1->Emitted(11, 5) Source(10, 5) + SourceIndex(0) name (f1)
-2 >Emitted(11, 11) Source(10, 11) + SourceIndex(0) name (f1)
-3 >Emitted(11, 12) Source(10, 12) + SourceIndex(0) name (f1)
-4 >Emitted(11, 21) Source(10, 21) + SourceIndex(0) name (f1)
-5 >Emitted(11, 22) Source(10, 22) + SourceIndex(0) name (f1)
+1->Emitted(11, 5) Source(10, 5) + SourceIndex(0)
+2 >Emitted(11, 11) Source(10, 11) + SourceIndex(0)
+3 >Emitted(11, 12) Source(10, 12) + SourceIndex(0)
+4 >Emitted(11, 21) Source(10, 21) + SourceIndex(0)
+5 >Emitted(11, 22) Source(10, 22) + SourceIndex(0)
 ---
 >>>}
 1 >
@@ -472,7 +472,7 @@ sourceFile:../test.ts
 1 >
   >
 2 >}
-1 >Emitted(12, 1) Source(11, 1) + SourceIndex(0) name (f1)
-2 >Emitted(12, 2) Source(11, 2) + SourceIndex(0) name (f1)
+1 >Emitted(12, 1) Source(11, 1) + SourceIndex(0)
+2 >Emitted(12, 2) Source(11, 2) + SourceIndex(0)
 ---
 >>>//# sourceMappingURL=/tests/cases/projects/outputdir_mixed_subfolder/mapFiles/test.js.map

tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/node/ref/m1.js.map

@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"}
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../ref/m1.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC"}

tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/node/ref/m2.js.map

@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":";AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACIE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,QAEpB,CAAA"}
+{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../ref/m2.ts"],"names":[],"mappings":";AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFe,aAAK,QAEpB,CAAA"}

tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderNoOutdir/node/test.js.map

@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":[],"mappings":"AAAA,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}

tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory.sourcemap.txt

@@ -40,7 +40,7 @@ sourceFile:../../ref/m1.ts
 1->^^^^
 2 >    ^^->
 1->
-1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1)
+1->Emitted(3, 5) Source(2, 1) + SourceIndex(0)
 ---
 >>>    }
 1->^^^^
@@ -50,16 +50,16 @@ sourceFile:../../ref/m1.ts
   >    public m1_c1_p1: number;
   >
 2 >    }
-1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor)
-2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor)
+1->Emitted(4, 5) Source(4, 1) + SourceIndex(0)
+2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0)
 ---
 >>>    return m1_c1;
 1->^^^^
 2 >    ^^^^^^^^^^^^
 1->
 2 >    }
-1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (m1_c1)
-2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) name (m1_c1)
+1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
+2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
 >>>})();
 1 >
@@ -73,8 +73,8 @@ sourceFile:../../ref/m1.ts
 4 > class m1_c1 {
   >     public m1_c1_p1: number;
   > }
-1 >Emitted(6, 1) Source(4, 1) + SourceIndex(0) name (m1_c1)
-2 >Emitted(6, 2) Source(4, 2) + SourceIndex(0) name (m1_c1)
+1 >Emitted(6, 1) Source(4, 1) + SourceIndex(0)
+2 >Emitted(6, 2) Source(4, 2) + SourceIndex(0)
 3 >Emitted(6, 2) Source(2, 1) + SourceIndex(0)
 4 >Emitted(6, 6) Source(4, 2) + SourceIndex(0)
 ---
@@ -125,11 +125,11 @@ sourceFile:../../ref/m1.ts
 3 >           
 4 >           m1_instance1
 5 >                       ;
-1->Emitted(9, 5) Source(8, 5) + SourceIndex(0) name (m1_f1)
-2 >Emitted(9, 11) Source(8, 11) + SourceIndex(0) name (m1_f1)
-3 >Emitted(9, 12) Source(8, 12) + SourceIndex(0) name (m1_f1)
-4 >Emitted(9, 24) Source(8, 24) + SourceIndex(0) name (m1_f1)
-5 >Emitted(9, 25) Source(8, 25) + SourceIndex(0) name (m1_f1)
+1->Emitted(9, 5) Source(8, 5) + SourceIndex(0)
+2 >Emitted(9, 11) Source(8, 11) + SourceIndex(0)
+3 >Emitted(9, 12) Source(8, 12) + SourceIndex(0)
+4 >Emitted(9, 24) Source(8, 24) + SourceIndex(0)
+5 >Emitted(9, 25) Source(8, 25) + SourceIndex(0)
 ---
 >>>}
 1 >
@@ -138,8 +138,8 @@ sourceFile:../../ref/m1.ts
 1 >
   >
 2 >}
-1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) name (m1_f1)
-2 >Emitted(10, 2) Source(9, 2) + SourceIndex(0) name (m1_f1)
+1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0)
+2 >Emitted(10, 2) Source(9, 2) + SourceIndex(0)
 ---
 >>>//# sourceMappingURL=/tests/cases/projects/outputdir_mixed_subfolder/mapFiles/ref/m1.js.map===================================================================
 JsFile: m2.js
@@ -182,7 +182,7 @@ sourceFile:../../ref/m2.ts
 1->^^^^^^^^
 2 >        ^^->
 1->
-1->Emitted(5, 9) Source(2, 1) + SourceIndex(0) name (m2_c1)
+1->Emitted(5, 9) Source(2, 1) + SourceIndex(0)
 ---
 >>>        }
 1->^^^^^^^^
@@ -192,16 +192,16 @@ sourceFile:../../ref/m2.ts
   >    public m2_c1_p1: number;
   >
 2 >        }
-1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor)
-2 >Emitted(6, 10) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor)
+1->Emitted(6, 9) Source(4, 1) + SourceIndex(0)
+2 >Emitted(6, 10) Source(4, 2) + SourceIndex(0)
 ---
 >>>        return m2_c1;
 1->^^^^^^^^
 2 >        ^^^^^^^^^^^^
 1->
 2 >        }
-1->Emitted(7, 9) Source(4, 1) + SourceIndex(0) name (m2_c1)
-2 >Emitted(7, 21) Source(4, 2) + SourceIndex(0) name (m2_c1)
+1->Emitted(7, 9) Source(4, 1) + SourceIndex(0)
+2 >Emitted(7, 21) Source(4, 2) + SourceIndex(0)
 ---
 >>>    })();
 1 >^^^^
@@ -215,8 +215,8 @@ sourceFile:../../ref/m2.ts
 4 >     export class m2_c1 {
   >         public m2_c1_p1: number;
   >     }
-1 >Emitted(8, 5) Source(4, 1) + SourceIndex(0) name (m2_c1)
-2 >Emitted(8, 6) Source(4, 2) + SourceIndex(0) name (m2_c1)
+1 >Emitted(8, 5) Source(4, 1) + SourceIndex(0)
+2 >Emitted(8, 6) Source(4, 2) + SourceIndex(0)
 3 >Emitted(8, 6) Source(2, 1) + SourceIndex(0)
 4 >Emitted(8, 10) Source(4, 2) + SourceIndex(0)
 ---
@@ -281,11 +281,11 @@ sourceFile:../../ref/m2.ts
 3 >               
 4 >               m2_instance1
 5 >                                   ;
-1->Emitted(12, 9) Source(8, 5) + SourceIndex(0) name (m2_f1)
-2 >Emitted(12, 15) Source(8, 11) + SourceIndex(0) name (m2_f1)
-3 >Emitted(12, 16) Source(8, 12) + SourceIndex(0) name (m2_f1)
-4 >Emitted(12, 36) Source(8, 24) + SourceIndex(0) name (m2_f1)
-5 >Emitted(12, 37) Source(8, 25) + SourceIndex(0) name (m2_f1)
+1->Emitted(12, 9) Source(8, 5) + SourceIndex(0)
+2 >Emitted(12, 15) Source(8, 11) + SourceIndex(0)
+3 >Emitted(12, 16) Source(8, 12) + SourceIndex(0)
+4 >Emitted(12, 36) Source(8, 24) + SourceIndex(0)
+5 >Emitted(12, 37) Source(8, 25) + SourceIndex(0)
 ---
 >>>    }
 1 >^^^^
@@ -294,8 +294,8 @@ sourceFile:../../ref/m2.ts
 1 >
   >
 2 >    }
-1 >Emitted(13, 5) Source(9, 1) + SourceIndex(0) name (m2_f1)
-2 >Emitted(13, 6) Source(9, 2) + SourceIndex(0) name (m2_f1)
+1 >Emitted(13, 5) Source(9, 1) + SourceIndex(0)
+2 >Emitted(13, 6) Source(9, 2) + SourceIndex(0)
 ---
 >>>    exports.m2_f1 = m2_f1;
 1->^^^^
@@ -375,7 +375,7 @@ sourceFile:../test.ts
 1->^^^^
 2 >    ^^->
 1->
-1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (c1)
+1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 ---
 >>>    }
 1->^^^^
@@ -385,16 +385,16 @@ sourceFile:../test.ts
   >    public p1: number;
   >
 2 >    }
-1->Emitted(6, 5) Source(6, 1) + SourceIndex(0) name (c1.constructor)
-2 >Emitted(6, 6) Source(6, 2) + SourceIndex(0) name (c1.constructor)
+1->Emitted(6, 5) Source(6, 1) + SourceIndex(0)
+2 >Emitted(6, 6) Source(6, 2) + SourceIndex(0)
 ---
 >>>    return c1;
 1->^^^^
 2 >    ^^^^^^^^^
 1->
 2 >    }
-1->Emitted(7, 5) Source(6, 1) + SourceIndex(0) name (c1)
-2 >Emitted(7, 14) Source(6, 2) + SourceIndex(0) name (c1)
+1->Emitted(7, 5) Source(6, 1) + SourceIndex(0)
+2 >Emitted(7, 14) Source(6, 2) + SourceIndex(0)
 ---
 >>>})();
 1 >
@@ -408,8 +408,8 @@ sourceFile:../test.ts
 4 > class c1 {
   >     public p1: number;
   > }
-1 >Emitted(8, 1) Source(6, 1) + SourceIndex(0) name (c1)
-2 >Emitted(8, 2) Source(6, 2) + SourceIndex(0) name (c1)
+1 >Emitted(8, 1) Source(6, 1) + SourceIndex(0)
+2 >Emitted(8, 2) Source(6, 2) + SourceIndex(0)
 3 >Emitted(8, 2) Source(4, 1) + SourceIndex(0)
 4 >Emitted(8, 6) Source(6, 2) + SourceIndex(0)
 ---
@@ -460,11 +460,11 @@ sourceFile:../test.ts
 3 >           
 4 >           instance1
 5 >                    ;
-1->Emitted(11, 5) Source(10, 5) + SourceIndex(0) name (f1)
-2 >Emitted(11, 11) Source(10, 11) + SourceIndex(0) name (f1)
-3 >Emitted(11, 12) Source(10, 12) + SourceIndex(0) name (f1)
-4 >Emitted(11, 21) Source(10, 21) + SourceIndex(0) name (f1)
-5 >Emitted(11, 22) Source(10, 22) + SourceIndex(0) name (f1)
+1->Emitted(11, 5) Source(10, 5) + SourceIndex(0)
+2 >Emitted(11, 11) Source(10, 11) + SourceIndex(0)
+3 >Emitted(11, 12) Source(10, 12) + SourceIndex(0)
+4 >Emitted(11, 21) Source(10, 21) + SourceIndex(0)
+5 >Emitted(11, 22) Source(10, 22) + SourceIndex(0)
 ---
 >>>}
 1 >
@@ -473,7 +473,7 @@ sourceFile:../test.ts
 1 >
   >
 2 >}
-1 >Emitted(12, 1) Source(11, 1) + SourceIndex(0) name (f1)
-2 >Emitted(12, 2) Source(11, 2) + SourceIndex(0) name (f1)
+1 >Emitted(12, 1) Source(11, 1) + SourceIndex(0)
+2 >Emitted(12, 2) Source(11, 2) + SourceIndex(0)
 ---
 >>>//# sourceMappingURL=/tests/cases/projects/outputdir_mixed_subfolder/mapFiles/test.js.map

tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m1.js.map

@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"}
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../ref/m1.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC"}

tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/ref/m2.js.map

@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":";;IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAA;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA"}
+{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../ref/m2.ts"],"names":[],"mappings":";;IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFe,aAAK,QAEpB,CAAA"}

tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/amd/outdir/simple/test.js.map

@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":[],"mappings":"AAAA,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}

tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory.sourcemap.txt

@@ -40,7 +40,7 @@ sourceFile:../../ref/m1.ts
 1->^^^^
 2 >    ^^->
 1->
-1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1)
+1->Emitted(3, 5) Source(2, 1) + SourceIndex(0)
 ---
 >>>    }
 1->^^^^
@@ -50,16 +50,16 @@ sourceFile:../../ref/m1.ts
   >    public m1_c1_p1: number;
   >
 2 >    }
-1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor)
-2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor)
+1->Emitted(4, 5) Source(4, 1) + SourceIndex(0)
+2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0)
 ---
 >>>    return m1_c1;
 1->^^^^
 2 >    ^^^^^^^^^^^^
 1->
 2 >    }
-1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (m1_c1)
-2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) name (m1_c1)
+1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
+2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
 >>>})();
 1 >
@@ -73,8 +73,8 @@ sourceFile:../../ref/m1.ts
 4 > class m1_c1 {
   >     public m1_c1_p1: number;
   > }
-1 >Emitted(6, 1) Source(4, 1) + SourceIndex(0) name (m1_c1)
-2 >Emitted(6, 2) Source(4, 2) + SourceIndex(0) name (m1_c1)
+1 >Emitted(6, 1) Source(4, 1) + SourceIndex(0)
+2 >Emitted(6, 2) Source(4, 2) + SourceIndex(0)
 3 >Emitted(6, 2) Source(2, 1) + SourceIndex(0)
 4 >Emitted(6, 6) Source(4, 2) + SourceIndex(0)
 ---
@@ -125,11 +125,11 @@ sourceFile:../../ref/m1.ts
 3 >           
 4 >           m1_instance1
 5 >                       ;
-1->Emitted(9, 5) Source(8, 5) + SourceIndex(0) name (m1_f1)
-2 >Emitted(9, 11) Source(8, 11) + SourceIndex(0) name (m1_f1)
-3 >Emitted(9, 12) Source(8, 12) + SourceIndex(0) name (m1_f1)
-4 >Emitted(9, 24) Source(8, 24) + SourceIndex(0) name (m1_f1)
-5 >Emitted(9, 25) Source(8, 25) + SourceIndex(0) name (m1_f1)
+1->Emitted(9, 5) Source(8, 5) + SourceIndex(0)
+2 >Emitted(9, 11) Source(8, 11) + SourceIndex(0)
+3 >Emitted(9, 12) Source(8, 12) + SourceIndex(0)
+4 >Emitted(9, 24) Source(8, 24) + SourceIndex(0)
+5 >Emitted(9, 25) Source(8, 25) + SourceIndex(0)
 ---
 >>>}
 1 >
@@ -138,8 +138,8 @@ sourceFile:../../ref/m1.ts
 1 >
   >
 2 >}
-1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) name (m1_f1)
-2 >Emitted(10, 2) Source(9, 2) + SourceIndex(0) name (m1_f1)
+1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0)
+2 >Emitted(10, 2) Source(9, 2) + SourceIndex(0)
 ---
 >>>//# sourceMappingURL=/tests/cases/projects/outputdir_mixed_subfolder/mapFiles/ref/m1.js.map===================================================================
 JsFile: m2.js
@@ -181,7 +181,7 @@ sourceFile:../../ref/m2.ts
 1->^^^^
 2 >    ^^->
 1->
-1->Emitted(4, 5) Source(2, 1) + SourceIndex(0) name (m2_c1)
+1->Emitted(4, 5) Source(2, 1) + SourceIndex(0)
 ---
 >>>    }
 1->^^^^
@@ -191,16 +191,16 @@ sourceFile:../../ref/m2.ts
   >    public m2_c1_p1: number;
   >
 2 >    }
-1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor)
-2 >Emitted(5, 6) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor)
+1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
+2 >Emitted(5, 6) Source(4, 2) + SourceIndex(0)
 ---
 >>>    return m2_c1;
 1->^^^^
 2 >    ^^^^^^^^^^^^
 1->
 2 >    }
-1->Emitted(6, 5) Source(4, 1) + SourceIndex(0) name (m2_c1)
-2 >Emitted(6, 17) Source(4, 2) + SourceIndex(0) name (m2_c1)
+1->Emitted(6, 5) Source(4, 1) + SourceIndex(0)
+2 >Emitted(6, 17) Source(4, 2) + SourceIndex(0)
 ---
 >>>})();
 1 >
@@ -214,8 +214,8 @@ sourceFile:../../ref/m2.ts
 4 > export class m2_c1 {
   >     public m2_c1_p1: number;
   > }
-1 >Emitted(7, 1) Source(4, 1) + SourceIndex(0) name (m2_c1)
-2 >Emitted(7, 2) Source(4, 2) + SourceIndex(0) name (m2_c1)
+1 >Emitted(7, 1) Source(4, 1) + SourceIndex(0)
+2 >Emitted(7, 2) Source(4, 2) + SourceIndex(0)
 3 >Emitted(7, 2) Source(2, 1) + SourceIndex(0)
 4 >Emitted(7, 6) Source(4, 2) + SourceIndex(0)
 ---
@@ -280,11 +280,11 @@ sourceFile:../../ref/m2.ts
 3 >           
 4 >           m2_instance1
 5 >                               ;
-1->Emitted(11, 5) Source(8, 5) + SourceIndex(0) name (m2_f1)
-2 >Emitted(11, 11) Source(8, 11) + SourceIndex(0) name (m2_f1)
-3 >Emitted(11, 12) Source(8, 12) + SourceIndex(0) name (m2_f1)
-4 >Emitted(11, 32) Source(8, 24) + SourceIndex(0) name (m2_f1)
-5 >Emitted(11, 33) Source(8, 25) + SourceIndex(0) name (m2_f1)
+1->Emitted(11, 5) Source(8, 5) + SourceIndex(0)
+2 >Emitted(11, 11) Source(8, 11) + SourceIndex(0)
+3 >Emitted(11, 12) Source(8, 12) + SourceIndex(0)
+4 >Emitted(11, 32) Source(8, 24) + SourceIndex(0)
+5 >Emitted(11, 33) Source(8, 25) + SourceIndex(0)
 ---
 >>>}
 1 >
@@ -293,8 +293,8 @@ sourceFile:../../ref/m2.ts
 1 >
   >
 2 >}
-1 >Emitted(12, 1) Source(9, 1) + SourceIndex(0) name (m2_f1)
-2 >Emitted(12, 2) Source(9, 2) + SourceIndex(0) name (m2_f1)
+1 >Emitted(12, 1) Source(9, 1) + SourceIndex(0)
+2 >Emitted(12, 2) Source(9, 2) + SourceIndex(0)
 ---
 >>>exports.m2_f1 = m2_f1;
 1->
@@ -374,7 +374,7 @@ sourceFile:../test.ts
 1->^^^^
 2 >    ^^->
 1->
-1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (c1)
+1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
 ---
 >>>    }
 1->^^^^
@@ -384,16 +384,16 @@ sourceFile:../test.ts
   >    public p1: number;
   >
 2 >    }
-1->Emitted(6, 5) Source(6, 1) + SourceIndex(0) name (c1.constructor)
-2 >Emitted(6, 6) Source(6, 2) + SourceIndex(0) name (c1.constructor)
+1->Emitted(6, 5) Source(6, 1) + SourceIndex(0)
+2 >Emitted(6, 6) Source(6, 2) + SourceIndex(0)
 ---
 >>>    return c1;
 1->^^^^
 2 >    ^^^^^^^^^
 1->
 2 >    }
-1->Emitted(7, 5) Source(6, 1) + SourceIndex(0) name (c1)
-2 >Emitted(7, 14) Source(6, 2) + SourceIndex(0) name (c1)
+1->Emitted(7, 5) Source(6, 1) + SourceIndex(0)
+2 >Emitted(7, 14) Source(6, 2) + SourceIndex(0)
 ---
 >>>})();
 1 >
@@ -407,8 +407,8 @@ sourceFile:../test.ts
 4 > class c1 {
   >     public p1: number;
   > }
-1 >Emitted(8, 1) Source(6, 1) + SourceIndex(0) name (c1)
-2 >Emitted(8, 2) Source(6, 2) + SourceIndex(0) name (c1)
+1 >Emitted(8, 1) Source(6, 1) + SourceIndex(0)
+2 >Emitted(8, 2) Source(6, 2) + SourceIndex(0)
 3 >Emitted(8, 2) Source(4, 1) + SourceIndex(0)
 4 >Emitted(8, 6) Source(6, 2) + SourceIndex(0)
 ---
@@ -459,11 +459,11 @@ sourceFile:../test.ts
 3 >           
 4 >           instance1
 5 >                    ;
-1->Emitted(11, 5) Source(10, 5) + SourceIndex(0) name (f1)
-2 >Emitted(11, 11) Source(10, 11) + SourceIndex(0) name (f1)
-3 >Emitted(11, 12) Source(10, 12) + SourceIndex(0) name (f1)
-4 >Emitted(11, 21) Source(10, 21) + SourceIndex(0) name (f1)
-5 >Emitted(11, 22) Source(10, 22) + SourceIndex(0) name (f1)
+1->Emitted(11, 5) Source(10, 5) + SourceIndex(0)
+2 >Emitted(11, 11) Source(10, 11) + SourceIndex(0)
+3 >Emitted(11, 12) Source(10, 12) + SourceIndex(0)
+4 >Emitted(11, 21) Source(10, 21) + SourceIndex(0)
+5 >Emitted(11, 22) Source(10, 22) + SourceIndex(0)
 ---
 >>>}
 1 >
@@ -472,7 +472,7 @@ sourceFile:../test.ts
 1 >
   >
 2 >}
-1 >Emitted(12, 1) Source(11, 1) + SourceIndex(0) name (f1)
-2 >Emitted(12, 2) Source(11, 2) + SourceIndex(0) name (f1)
+1 >Emitted(12, 1) Source(11, 1) + SourceIndex(0)
+2 >Emitted(12, 2) Source(11, 2) + SourceIndex(0)
 ---
 >>>//# sourceMappingURL=/tests/cases/projects/outputdir_mixed_subfolder/mapFiles/test.js.map

tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m1.js.map

@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA"}
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../ref/m1.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC"}

tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/ref/m2.js.map

@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":";AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACIE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,QAEpB,CAAA"}
+{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../ref/m2.ts"],"names":[],"mappings":";AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFe,aAAK,QAEpB,CAAA"}

tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputDirectory/node/outdir/simple/test.js.map

@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":"AAAA,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../test.ts"],"names":[],"mappings":"AAAA,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}

tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/bin/test.js.map

@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../ref/m1.ts","../ref/m2.ts","../test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","m2_c1","m2_c1.constructor","m2_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;;;ICRU,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAC;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA;;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAC;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../ref/m1.ts","../ref/m2.ts","../test.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC;;;ICRU,aAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFe,aAAK,QAEpB,CAAA;;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}

tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/amd/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile.sourcemap.txt

@@ -40,7 +40,7 @@ sourceFile:../ref/m1.ts
 1->^^^^
 2 >    ^^->
 1->
-1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1)
+1->Emitted(3, 5) Source(2, 1) + SourceIndex(0)
 ---
 >>>    }
 1->^^^^
@@ -50,16 +50,16 @@ sourceFile:../ref/m1.ts
   >    public m1_c1_p1: number;
   >
 2 >    }
-1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor)
-2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor)
+1->Emitted(4, 5) Source(4, 1) + SourceIndex(0)
+2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0)
 ---
 >>>    return m1_c1;
 1->^^^^
 2 >    ^^^^^^^^^^^^
 1->
 2 >    }
-1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (m1_c1)
-2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) name (m1_c1)
+1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
+2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
 >>>})();
 1 >
@@ -73,8 +73,8 @@ sourceFile:../ref/m1.ts
 4 > class m1_c1 {
   >     public m1_c1_p1: number;
   > }
-1 >Emitted(6, 1) Source(4, 1) + SourceIndex(0) name (m1_c1)
-2 >Emitted(6, 2) Source(4, 2) + SourceIndex(0) name (m1_c1)
+1 >Emitted(6, 1) Source(4, 1) + SourceIndex(0)
+2 >Emitted(6, 2) Source(4, 2) + SourceIndex(0)
 3 >Emitted(6, 2) Source(2, 1) + SourceIndex(0)
 4 >Emitted(6, 6) Source(4, 2) + SourceIndex(0)
 ---
@@ -125,11 +125,11 @@ sourceFile:../ref/m1.ts
 3 >           
 4 >           m1_instance1
 5 >                       ;
-1->Emitted(9, 5) Source(8, 5) + SourceIndex(0) name (m1_f1)
-2 >Emitted(9, 11) Source(8, 11) + SourceIndex(0) name (m1_f1)
-3 >Emitted(9, 12) Source(8, 12) + SourceIndex(0) name (m1_f1)
-4 >Emitted(9, 24) Source(8, 24) + SourceIndex(0) name (m1_f1)
-5 >Emitted(9, 25) Source(8, 25) + SourceIndex(0) name (m1_f1)
+1->Emitted(9, 5) Source(8, 5) + SourceIndex(0)
+2 >Emitted(9, 11) Source(8, 11) + SourceIndex(0)
+3 >Emitted(9, 12) Source(8, 12) + SourceIndex(0)
+4 >Emitted(9, 24) Source(8, 24) + SourceIndex(0)
+5 >Emitted(9, 25) Source(8, 25) + SourceIndex(0)
 ---
 >>>}
 1 >
@@ -138,8 +138,8 @@ sourceFile:../ref/m1.ts
 1 >
   >
 2 >}
-1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) name (m1_f1)
-2 >Emitted(10, 2) Source(9, 2) + SourceIndex(0) name (m1_f1)
+1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0)
+2 >Emitted(10, 2) Source(9, 2) + SourceIndex(0)
 ---
 -------------------------------------------------------------------
 emittedFile:bin/test.js
@@ -176,7 +176,7 @@ sourceFile:../ref/m2.ts
 1->^^^^^^^^
 2 >        ^^->
 1->
-1->Emitted(15, 9) Source(2, 1) + SourceIndex(1) name (m2_c1)
+1->Emitted(15, 9) Source(2, 1) + SourceIndex(1)
 ---
 >>>        }
 1->^^^^^^^^
@@ -186,16 +186,16 @@ sourceFile:../ref/m2.ts
   >    public m2_c1_p1: number;
   >
 2 >        }
-1->Emitted(16, 9) Source(4, 1) + SourceIndex(1) name (m2_c1.constructor)
-2 >Emitted(16, 10) Source(4, 2) + SourceIndex(1) name (m2_c1.constructor)
+1->Emitted(16, 9) Source(4, 1) + SourceIndex(1)
+2 >Emitted(16, 10) Source(4, 2) + SourceIndex(1)
 ---
 >>>        return m2_c1;
 1->^^^^^^^^
 2 >        ^^^^^^^^^^^^
 1->
 2 >        }
-1->Emitted(17, 9) Source(4, 1) + SourceIndex(1) name (m2_c1)
-2 >Emitted(17, 21) Source(4, 2) + SourceIndex(1) name (m2_c1)
+1->Emitted(17, 9) Source(4, 1) + SourceIndex(1)
+2 >Emitted(17, 21) Source(4, 2) + SourceIndex(1)
 ---
 >>>    })();
 1 >^^^^
@@ -209,8 +209,8 @@ sourceFile:../ref/m2.ts
 4 >     export class m2_c1 {
   >         public m2_c1_p1: number;
   >     }
-1 >Emitted(18, 5) Source(4, 1) + SourceIndex(1) name (m2_c1)
-2 >Emitted(18, 6) Source(4, 2) + SourceIndex(1) name (m2_c1)
+1 >Emitted(18, 5) Source(4, 1) + SourceIndex(1)
+2 >Emitted(18, 6) Source(4, 2) + SourceIndex(1)
 3 >Emitted(18, 6) Source(2, 1) + SourceIndex(1)
 4 >Emitted(18, 10) Source(4, 2) + SourceIndex(1)
 ---
@@ -275,11 +275,11 @@ sourceFile:../ref/m2.ts
 3 >               
 4 >               m2_instance1
 5 >                                   ;
-1->Emitted(22, 9) Source(8, 5) + SourceIndex(1) name (m2_f1)
-2 >Emitted(22, 15) Source(8, 11) + SourceIndex(1) name (m2_f1)
-3 >Emitted(22, 16) Source(8, 12) + SourceIndex(1) name (m2_f1)
-4 >Emitted(22, 36) Source(8, 24) + SourceIndex(1) name (m2_f1)
-5 >Emitted(22, 37) Source(8, 25) + SourceIndex(1) name (m2_f1)
+1->Emitted(22, 9) Source(8, 5) + SourceIndex(1)
+2 >Emitted(22, 15) Source(8, 11) + SourceIndex(1)
+3 >Emitted(22, 16) Source(8, 12) + SourceIndex(1)
+4 >Emitted(22, 36) Source(8, 24) + SourceIndex(1)
+5 >Emitted(22, 37) Source(8, 25) + SourceIndex(1)
 ---
 >>>    }
 1 >^^^^
@@ -288,8 +288,8 @@ sourceFile:../ref/m2.ts
 1 >
   >
 2 >    }
-1 >Emitted(23, 5) Source(9, 1) + SourceIndex(1) name (m2_f1)
-2 >Emitted(23, 6) Source(9, 2) + SourceIndex(1) name (m2_f1)
+1 >Emitted(23, 5) Source(9, 1) + SourceIndex(1)
+2 >Emitted(23, 6) Source(9, 2) + SourceIndex(1)
 ---
 >>>    exports.m2_f1 = m2_f1;
 1->^^^^
@@ -363,7 +363,7 @@ sourceFile:../test.ts
 1->^^^^
 2 >    ^^->
 1->
-1->Emitted(30, 5) Source(4, 1) + SourceIndex(2) name (c1)
+1->Emitted(30, 5) Source(4, 1) + SourceIndex(2)
 ---
 >>>    }
 1->^^^^
@@ -373,16 +373,16 @@ sourceFile:../test.ts
   >    public p1: number;
   >
 2 >    }
-1->Emitted(31, 5) Source(6, 1) + SourceIndex(2) name (c1.constructor)
-2 >Emitted(31, 6) Source(6, 2) + SourceIndex(2) name (c1.constructor)
+1->Emitted(31, 5) Source(6, 1) + SourceIndex(2)
+2 >Emitted(31, 6) Source(6, 2) + SourceIndex(2)
 ---
 >>>    return c1;
 1->^^^^
 2 >    ^^^^^^^^^
 1->
 2 >    }
-1->Emitted(32, 5) Source(6, 1) + SourceIndex(2) name (c1)
-2 >Emitted(32, 14) Source(6, 2) + SourceIndex(2) name (c1)
+1->Emitted(32, 5) Source(6, 1) + SourceIndex(2)
+2 >Emitted(32, 14) Source(6, 2) + SourceIndex(2)
 ---
 >>>})();
 1 >
@@ -396,8 +396,8 @@ sourceFile:../test.ts
 4 > class c1 {
   >     public p1: number;
   > }
-1 >Emitted(33, 1) Source(6, 1) + SourceIndex(2) name (c1)
-2 >Emitted(33, 2) Source(6, 2) + SourceIndex(2) name (c1)
+1 >Emitted(33, 1) Source(6, 1) + SourceIndex(2)
+2 >Emitted(33, 2) Source(6, 2) + SourceIndex(2)
 3 >Emitted(33, 2) Source(4, 1) + SourceIndex(2)
 4 >Emitted(33, 6) Source(6, 2) + SourceIndex(2)
 ---
@@ -448,11 +448,11 @@ sourceFile:../test.ts
 3 >           
 4 >           instance1
 5 >                    ;
-1->Emitted(36, 5) Source(10, 5) + SourceIndex(2) name (f1)
-2 >Emitted(36, 11) Source(10, 11) + SourceIndex(2) name (f1)
-3 >Emitted(36, 12) Source(10, 12) + SourceIndex(2) name (f1)
-4 >Emitted(36, 21) Source(10, 21) + SourceIndex(2) name (f1)
-5 >Emitted(36, 22) Source(10, 22) + SourceIndex(2) name (f1)
+1->Emitted(36, 5) Source(10, 5) + SourceIndex(2)
+2 >Emitted(36, 11) Source(10, 11) + SourceIndex(2)
+3 >Emitted(36, 12) Source(10, 12) + SourceIndex(2)
+4 >Emitted(36, 21) Source(10, 21) + SourceIndex(2)
+5 >Emitted(36, 22) Source(10, 22) + SourceIndex(2)
 ---
 >>>}
 1 >
@@ -461,7 +461,7 @@ sourceFile:../test.ts
 1 >
   >
 2 >}
-1 >Emitted(37, 1) Source(11, 1) + SourceIndex(2) name (f1)
-2 >Emitted(37, 2) Source(11, 2) + SourceIndex(2) name (f1)
+1 >Emitted(37, 1) Source(11, 1) + SourceIndex(2)
+2 >Emitted(37, 2) Source(11, 2) + SourceIndex(2)
 ---
 >>>//# sourceMappingURL=/tests/cases/projects/outputdir_mixed_subfolder/mapFiles/test.js.map

tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/bin/test.js.map

@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../ref/m1.ts","../ref/m2.ts","../test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;AERD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAC;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../ref/m1.ts","../ref/m2.ts","../test.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC;AERD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}

tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile/node/mapRootAbsolutePathMixedSubfolderSpecifyOutputFile.sourcemap.txt

@@ -40,7 +40,7 @@ sourceFile:../ref/m1.ts
 1->^^^^
 2 >    ^^->
 1->
-1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1)
+1->Emitted(3, 5) Source(2, 1) + SourceIndex(0)
 ---
 >>>    }
 1->^^^^
@@ -50,16 +50,16 @@ sourceFile:../ref/m1.ts
   >    public m1_c1_p1: number;
   >
 2 >    }
-1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor)
-2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor)
+1->Emitted(4, 5) Source(4, 1) + SourceIndex(0)
+2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0)
 ---
 >>>    return m1_c1;
 1->^^^^
 2 >    ^^^^^^^^^^^^
 1->
 2 >    }
-1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (m1_c1)
-2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) name (m1_c1)
+1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
+2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
 >>>})();
 1 >
@@ -73,8 +73,8 @@ sourceFile:../ref/m1.ts
 4 > class m1_c1 {
   >     public m1_c1_p1: number;
   > }
-1 >Emitted(6, 1) Source(4, 1) + SourceIndex(0) name (m1_c1)
-2 >Emitted(6, 2) Source(4, 2) + SourceIndex(0) name (m1_c1)
+1 >Emitted(6, 1) Source(4, 1) + SourceIndex(0)
+2 >Emitted(6, 2) Source(4, 2) + SourceIndex(0)
 3 >Emitted(6, 2) Source(2, 1) + SourceIndex(0)
 4 >Emitted(6, 6) Source(4, 2) + SourceIndex(0)
 ---
@@ -125,11 +125,11 @@ sourceFile:../ref/m1.ts
 3 >           
 4 >           m1_instance1
 5 >                       ;
-1->Emitted(9, 5) Source(8, 5) + SourceIndex(0) name (m1_f1)
-2 >Emitted(9, 11) Source(8, 11) + SourceIndex(0) name (m1_f1)
-3 >Emitted(9, 12) Source(8, 12) + SourceIndex(0) name (m1_f1)
-4 >Emitted(9, 24) Source(8, 24) + SourceIndex(0) name (m1_f1)
-5 >Emitted(9, 25) Source(8, 25) + SourceIndex(0) name (m1_f1)
+1->Emitted(9, 5) Source(8, 5) + SourceIndex(0)
+2 >Emitted(9, 11) Source(8, 11) + SourceIndex(0)
+3 >Emitted(9, 12) Source(8, 12) + SourceIndex(0)
+4 >Emitted(9, 24) Source(8, 24) + SourceIndex(0)
+5 >Emitted(9, 25) Source(8, 25) + SourceIndex(0)
 ---
 >>>}
 1 >
@@ -138,8 +138,8 @@ sourceFile:../ref/m1.ts
 1 >
   >
 2 >}
-1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) name (m1_f1)
-2 >Emitted(10, 2) Source(9, 2) + SourceIndex(0) name (m1_f1)
+1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0)
+2 >Emitted(10, 2) Source(9, 2) + SourceIndex(0)
 ---
 -------------------------------------------------------------------
 emittedFile:bin/test.js
@@ -196,7 +196,7 @@ sourceFile:../test.ts
 1->^^^^
 2 >    ^^->
 1->
-1->Emitted(15, 5) Source(4, 1) + SourceIndex(2) name (c1)
+1->Emitted(15, 5) Source(4, 1) + SourceIndex(2)
 ---
 >>>    }
 1->^^^^
@@ -206,16 +206,16 @@ sourceFile:../test.ts
   >    public p1: number;
   >
 2 >    }
-1->Emitted(16, 5) Source(6, 1) + SourceIndex(2) name (c1.constructor)
-2 >Emitted(16, 6) Source(6, 2) + SourceIndex(2) name (c1.constructor)
+1->Emitted(16, 5) Source(6, 1) + SourceIndex(2)
+2 >Emitted(16, 6) Source(6, 2) + SourceIndex(2)
 ---
 >>>    return c1;
 1->^^^^
 2 >    ^^^^^^^^^
 1->
 2 >    }
-1->Emitted(17, 5) Source(6, 1) + SourceIndex(2) name (c1)
-2 >Emitted(17, 14) Source(6, 2) + SourceIndex(2) name (c1)
+1->Emitted(17, 5) Source(6, 1) + SourceIndex(2)
+2 >Emitted(17, 14) Source(6, 2) + SourceIndex(2)
 ---
 >>>})();
 1 >
@@ -229,8 +229,8 @@ sourceFile:../test.ts
 4 > class c1 {
   >     public p1: number;
   > }
-1 >Emitted(18, 1) Source(6, 1) + SourceIndex(2) name (c1)
-2 >Emitted(18, 2) Source(6, 2) + SourceIndex(2) name (c1)
+1 >Emitted(18, 1) Source(6, 1) + SourceIndex(2)
+2 >Emitted(18, 2) Source(6, 2) + SourceIndex(2)
 3 >Emitted(18, 2) Source(4, 1) + SourceIndex(2)
 4 >Emitted(18, 6) Source(6, 2) + SourceIndex(2)
 ---
@@ -281,11 +281,11 @@ sourceFile:../test.ts
 3 >           
 4 >           instance1
 5 >                    ;
-1->Emitted(21, 5) Source(10, 5) + SourceIndex(2) name (f1)
-2 >Emitted(21, 11) Source(10, 11) + SourceIndex(2) name (f1)
-3 >Emitted(21, 12) Source(10, 12) + SourceIndex(2) name (f1)
-4 >Emitted(21, 21) Source(10, 21) + SourceIndex(2) name (f1)
-5 >Emitted(21, 22) Source(10, 22) + SourceIndex(2) name (f1)
+1->Emitted(21, 5) Source(10, 5) + SourceIndex(2)
+2 >Emitted(21, 11) Source(10, 11) + SourceIndex(2)
+3 >Emitted(21, 12) Source(10, 12) + SourceIndex(2)
+4 >Emitted(21, 21) Source(10, 21) + SourceIndex(2)
+5 >Emitted(21, 22) Source(10, 22) + SourceIndex(2)
 ---
 >>>}
 1 >
@@ -294,7 +294,7 @@ sourceFile:../test.ts
 1 >
   >
 2 >}
-1 >Emitted(22, 1) Source(11, 1) + SourceIndex(2) name (f1)
-2 >Emitted(22, 2) Source(11, 2) + SourceIndex(2) name (f1)
+1 >Emitted(22, 1) Source(11, 1) + SourceIndex(2)
+2 >Emitted(22, 2) Source(11, 2) + SourceIndex(2)
 ---
 >>>//# sourceMappingURL=/tests/cases/projects/outputdir_mixed_subfolder/mapFiles/test.js.map

tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/bin/outAndOutDirFile.js.map

@@ -1 +1 @@
-{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"","sources":["../ref/m1.ts","../ref/m2.ts","../test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","m2_c1","m2_c1.constructor","m2_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;;;ICRU,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAC;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA;;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAC;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
+{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"","sources":["../ref/m1.ts","../ref/m2.ts","../test.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC;;;ICRU,aAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFe,aAAK,QAEpB,CAAA;;ACRD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}

tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/amd/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt

@@ -40,7 +40,7 @@ sourceFile:../ref/m1.ts
 1->^^^^
 2 >    ^^->
 1->
-1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1)
+1->Emitted(3, 5) Source(2, 1) + SourceIndex(0)
 ---
 >>>    }
 1->^^^^
@@ -50,16 +50,16 @@ sourceFile:../ref/m1.ts
   >    public m1_c1_p1: number;
   >
 2 >    }
-1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor)
-2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor)
+1->Emitted(4, 5) Source(4, 1) + SourceIndex(0)
+2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0)
 ---
 >>>    return m1_c1;
 1->^^^^
 2 >    ^^^^^^^^^^^^
 1->
 2 >    }
-1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (m1_c1)
-2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) name (m1_c1)
+1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
+2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
 >>>})();
 1 >
@@ -73,8 +73,8 @@ sourceFile:../ref/m1.ts
 4 > class m1_c1 {
   >     public m1_c1_p1: number;
   > }
-1 >Emitted(6, 1) Source(4, 1) + SourceIndex(0) name (m1_c1)
-2 >Emitted(6, 2) Source(4, 2) + SourceIndex(0) name (m1_c1)
+1 >Emitted(6, 1) Source(4, 1) + SourceIndex(0)
+2 >Emitted(6, 2) Source(4, 2) + SourceIndex(0)
 3 >Emitted(6, 2) Source(2, 1) + SourceIndex(0)
 4 >Emitted(6, 6) Source(4, 2) + SourceIndex(0)
 ---
@@ -125,11 +125,11 @@ sourceFile:../ref/m1.ts
 3 >           
 4 >           m1_instance1
 5 >                       ;
-1->Emitted(9, 5) Source(8, 5) + SourceIndex(0) name (m1_f1)
-2 >Emitted(9, 11) Source(8, 11) + SourceIndex(0) name (m1_f1)
-3 >Emitted(9, 12) Source(8, 12) + SourceIndex(0) name (m1_f1)
-4 >Emitted(9, 24) Source(8, 24) + SourceIndex(0) name (m1_f1)
-5 >Emitted(9, 25) Source(8, 25) + SourceIndex(0) name (m1_f1)
+1->Emitted(9, 5) Source(8, 5) + SourceIndex(0)
+2 >Emitted(9, 11) Source(8, 11) + SourceIndex(0)
+3 >Emitted(9, 12) Source(8, 12) + SourceIndex(0)
+4 >Emitted(9, 24) Source(8, 24) + SourceIndex(0)
+5 >Emitted(9, 25) Source(8, 25) + SourceIndex(0)
 ---
 >>>}
 1 >
@@ -138,8 +138,8 @@ sourceFile:../ref/m1.ts
 1 >
   >
 2 >}
-1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) name (m1_f1)
-2 >Emitted(10, 2) Source(9, 2) + SourceIndex(0) name (m1_f1)
+1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0)
+2 >Emitted(10, 2) Source(9, 2) + SourceIndex(0)
 ---
 -------------------------------------------------------------------
 emittedFile:bin/outAndOutDirFile.js
@@ -176,7 +176,7 @@ sourceFile:../ref/m2.ts
 1->^^^^^^^^
 2 >        ^^->
 1->
-1->Emitted(15, 9) Source(2, 1) + SourceIndex(1) name (m2_c1)
+1->Emitted(15, 9) Source(2, 1) + SourceIndex(1)
 ---
 >>>        }
 1->^^^^^^^^
@@ -186,16 +186,16 @@ sourceFile:../ref/m2.ts
   >    public m2_c1_p1: number;
   >
 2 >        }
-1->Emitted(16, 9) Source(4, 1) + SourceIndex(1) name (m2_c1.constructor)
-2 >Emitted(16, 10) Source(4, 2) + SourceIndex(1) name (m2_c1.constructor)
+1->Emitted(16, 9) Source(4, 1) + SourceIndex(1)
+2 >Emitted(16, 10) Source(4, 2) + SourceIndex(1)
 ---
 >>>        return m2_c1;
 1->^^^^^^^^
 2 >        ^^^^^^^^^^^^
 1->
 2 >        }
-1->Emitted(17, 9) Source(4, 1) + SourceIndex(1) name (m2_c1)
-2 >Emitted(17, 21) Source(4, 2) + SourceIndex(1) name (m2_c1)
+1->Emitted(17, 9) Source(4, 1) + SourceIndex(1)
+2 >Emitted(17, 21) Source(4, 2) + SourceIndex(1)
 ---
 >>>    })();
 1 >^^^^
@@ -209,8 +209,8 @@ sourceFile:../ref/m2.ts
 4 >     export class m2_c1 {
   >         public m2_c1_p1: number;
   >     }
-1 >Emitted(18, 5) Source(4, 1) + SourceIndex(1) name (m2_c1)
-2 >Emitted(18, 6) Source(4, 2) + SourceIndex(1) name (m2_c1)
+1 >Emitted(18, 5) Source(4, 1) + SourceIndex(1)
+2 >Emitted(18, 6) Source(4, 2) + SourceIndex(1)
 3 >Emitted(18, 6) Source(2, 1) + SourceIndex(1)
 4 >Emitted(18, 10) Source(4, 2) + SourceIndex(1)
 ---
@@ -275,11 +275,11 @@ sourceFile:../ref/m2.ts
 3 >               
 4 >               m2_instance1
 5 >                                   ;
-1->Emitted(22, 9) Source(8, 5) + SourceIndex(1) name (m2_f1)
-2 >Emitted(22, 15) Source(8, 11) + SourceIndex(1) name (m2_f1)
-3 >Emitted(22, 16) Source(8, 12) + SourceIndex(1) name (m2_f1)
-4 >Emitted(22, 36) Source(8, 24) + SourceIndex(1) name (m2_f1)
-5 >Emitted(22, 37) Source(8, 25) + SourceIndex(1) name (m2_f1)
+1->Emitted(22, 9) Source(8, 5) + SourceIndex(1)
+2 >Emitted(22, 15) Source(8, 11) + SourceIndex(1)
+3 >Emitted(22, 16) Source(8, 12) + SourceIndex(1)
+4 >Emitted(22, 36) Source(8, 24) + SourceIndex(1)
+5 >Emitted(22, 37) Source(8, 25) + SourceIndex(1)
 ---
 >>>    }
 1 >^^^^
@@ -288,8 +288,8 @@ sourceFile:../ref/m2.ts
 1 >
   >
 2 >    }
-1 >Emitted(23, 5) Source(9, 1) + SourceIndex(1) name (m2_f1)
-2 >Emitted(23, 6) Source(9, 2) + SourceIndex(1) name (m2_f1)
+1 >Emitted(23, 5) Source(9, 1) + SourceIndex(1)
+2 >Emitted(23, 6) Source(9, 2) + SourceIndex(1)
 ---
 >>>    exports.m2_f1 = m2_f1;
 1->^^^^
@@ -363,7 +363,7 @@ sourceFile:../test.ts
 1->^^^^
 2 >    ^^->
 1->
-1->Emitted(30, 5) Source(4, 1) + SourceIndex(2) name (c1)
+1->Emitted(30, 5) Source(4, 1) + SourceIndex(2)
 ---
 >>>    }
 1->^^^^
@@ -373,16 +373,16 @@ sourceFile:../test.ts
   >    public p1: number;
   >
 2 >    }
-1->Emitted(31, 5) Source(6, 1) + SourceIndex(2) name (c1.constructor)
-2 >Emitted(31, 6) Source(6, 2) + SourceIndex(2) name (c1.constructor)
+1->Emitted(31, 5) Source(6, 1) + SourceIndex(2)
+2 >Emitted(31, 6) Source(6, 2) + SourceIndex(2)
 ---
 >>>    return c1;
 1->^^^^
 2 >    ^^^^^^^^^
 1->
 2 >    }
-1->Emitted(32, 5) Source(6, 1) + SourceIndex(2) name (c1)
-2 >Emitted(32, 14) Source(6, 2) + SourceIndex(2) name (c1)
+1->Emitted(32, 5) Source(6, 1) + SourceIndex(2)
+2 >Emitted(32, 14) Source(6, 2) + SourceIndex(2)
 ---
 >>>})();
 1 >
@@ -396,8 +396,8 @@ sourceFile:../test.ts
 4 > class c1 {
   >     public p1: number;
   > }
-1 >Emitted(33, 1) Source(6, 1) + SourceIndex(2) name (c1)
-2 >Emitted(33, 2) Source(6, 2) + SourceIndex(2) name (c1)
+1 >Emitted(33, 1) Source(6, 1) + SourceIndex(2)
+2 >Emitted(33, 2) Source(6, 2) + SourceIndex(2)
 3 >Emitted(33, 2) Source(4, 1) + SourceIndex(2)
 4 >Emitted(33, 6) Source(6, 2) + SourceIndex(2)
 ---
@@ -448,11 +448,11 @@ sourceFile:../test.ts
 3 >           
 4 >           instance1
 5 >                    ;
-1->Emitted(36, 5) Source(10, 5) + SourceIndex(2) name (f1)
-2 >Emitted(36, 11) Source(10, 11) + SourceIndex(2) name (f1)
-3 >Emitted(36, 12) Source(10, 12) + SourceIndex(2) name (f1)
-4 >Emitted(36, 21) Source(10, 21) + SourceIndex(2) name (f1)
-5 >Emitted(36, 22) Source(10, 22) + SourceIndex(2) name (f1)
+1->Emitted(36, 5) Source(10, 5) + SourceIndex(2)
+2 >Emitted(36, 11) Source(10, 11) + SourceIndex(2)
+3 >Emitted(36, 12) Source(10, 12) + SourceIndex(2)
+4 >Emitted(36, 21) Source(10, 21) + SourceIndex(2)
+5 >Emitted(36, 22) Source(10, 22) + SourceIndex(2)
 ---
 >>>}
 1 >
@@ -461,7 +461,7 @@ sourceFile:../test.ts
 1 >
   >
 2 >}
-1 >Emitted(37, 1) Source(11, 1) + SourceIndex(2) name (f1)
-2 >Emitted(37, 2) Source(11, 2) + SourceIndex(2) name (f1)
+1 >Emitted(37, 1) Source(11, 1) + SourceIndex(2)
+2 >Emitted(37, 2) Source(11, 2) + SourceIndex(2)
 ---
 >>>//# sourceMappingURL=/tests/cases/projects/outputdir_mixed_subfolder/mapFiles/outAndOutDirFile.js.map

tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/bin/outAndOutDirFile.js.map

@@ -1 +1 @@
-{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"","sources":["../ref/m1.ts","../ref/m2.ts","../test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","c1","c1.constructor","f1"],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACIE,MAAMA,CAACA,YAAYA,CAACA;AACxBA,CAACA;AERD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAAC;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACIE,MAAMA,CAACA,SAASA,CAACA;AACrBA,CAACA"}
+{"version":3,"file":"outAndOutDirFile.js","sourceRoot":"","sources":["../ref/m1.ts","../ref/m2.ts","../test.ts"],"names":[],"mappings":"AAAA,IAAI,KAAK,GAAG,EAAE,CAAC;AACf;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AAC/B;IACI,MAAM,CAAC,YAAY,CAAC;AACxB,CAAC;AERD,iCAAiC;AACjC,iCAAiC;AACjC,IAAI,EAAE,GAAG,EAAE,CAAC;AACZ;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAED,IAAI,SAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AACzB;IACI,MAAM,CAAC,SAAS,CAAC;AACrB,CAAC"}

tests/baselines/reference/project/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory/node/mapRootAbsolutePathMixedSubfolderSpecifyOutputFileAndOutputDirectory.sourcemap.txt

@@ -40,7 +40,7 @@ sourceFile:../ref/m1.ts
 1->^^^^
 2 >    ^^->
 1->
-1->Emitted(3, 5) Source(2, 1) + SourceIndex(0) name (m1_c1)
+1->Emitted(3, 5) Source(2, 1) + SourceIndex(0)
 ---
 >>>    }
 1->^^^^
@@ -50,16 +50,16 @@ sourceFile:../ref/m1.ts
   >    public m1_c1_p1: number;
   >
 2 >    }
-1->Emitted(4, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor)
-2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor)
+1->Emitted(4, 5) Source(4, 1) + SourceIndex(0)
+2 >Emitted(4, 6) Source(4, 2) + SourceIndex(0)
 ---
 >>>    return m1_c1;
 1->^^^^
 2 >    ^^^^^^^^^^^^
 1->
 2 >    }
-1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (m1_c1)
-2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0) name (m1_c1)
+1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
+2 >Emitted(5, 17) Source(4, 2) + SourceIndex(0)
 ---
 >>>})();
 1 >
@@ -73,8 +73,8 @@ sourceFile:../ref/m1.ts
 4 > class m1_c1 {
   >     public m1_c1_p1: number;
   > }
-1 >Emitted(6, 1) Source(4, 1) + SourceIndex(0) name (m1_c1)
-2 >Emitted(6, 2) Source(4, 2) + SourceIndex(0) name (m1_c1)
+1 >Emitted(6, 1) Source(4, 1) + SourceIndex(0)
+2 >Emitted(6, 2) Source(4, 2) + SourceIndex(0)
 3 >Emitted(6, 2) Source(2, 1) + SourceIndex(0)
 4 >Emitted(6, 6) Source(4, 2) + SourceIndex(0)
 ---
@@ -125,11 +125,11 @@ sourceFile:../ref/m1.ts
 3 >           
 4 >           m1_instance1
 5 >                       ;
-1->Emitted(9, 5) Source(8, 5) + SourceIndex(0) name (m1_f1)
-2 >Emitted(9, 11) Source(8, 11) + SourceIndex(0) name (m1_f1)
-3 >Emitted(9, 12) Source(8, 12) + SourceIndex(0) name (m1_f1)
-4 >Emitted(9, 24) Source(8, 24) + SourceIndex(0) name (m1_f1)
-5 >Emitted(9, 25) Source(8, 25) + SourceIndex(0) name (m1_f1)
+1->Emitted(9, 5) Source(8, 5) + SourceIndex(0)
+2 >Emitted(9, 11) Source(8, 11) + SourceIndex(0)
+3 >Emitted(9, 12) Source(8, 12) + SourceIndex(0)
+4 >Emitted(9, 24) Source(8, 24) + SourceIndex(0)
+5 >Emitted(9, 25) Source(8, 25) + SourceIndex(0)
 ---
 >>>}
 1 >
@@ -138,8 +138,8 @@ sourceFile:../ref/m1.ts
 1 >
   >
 2 >}
-1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0) name (m1_f1)
-2 >Emitted(10, 2) Source(9, 2) + SourceIndex(0) name (m1_f1)
+1 >Emitted(10, 1) Source(9, 1) + SourceIndex(0)
+2 >Emitted(10, 2) Source(9, 2) + SourceIndex(0)
 ---
 -------------------------------------------------------------------
 emittedFile:bin/outAndOutDirFile.js
@@ -196,7 +196,7 @@ sourceFile:../test.ts
 1->^^^^
 2 >    ^^->
 1->
-1->Emitted(15, 5) Source(4, 1) + SourceIndex(2) name (c1)
+1->Emitted(15, 5) Source(4, 1) + SourceIndex(2)
 ---
 >>>    }
 1->^^^^
@@ -206,16 +206,16 @@ sourceFile:../test.ts
   >    public p1: number;
   >
 2 >    }
-1->Emitted(16, 5) Source(6, 1) + SourceIndex(2) name (c1.constructor)
-2 >Emitted(16, 6) Source(6, 2) + SourceIndex(2) name (c1.constructor)
+1->Emitted(16, 5) Source(6, 1) + SourceIndex(2)
+2 >Emitted(16, 6) Source(6, 2) + SourceIndex(2)
 ---
 >>>    return c1;
 1->^^^^
 2 >    ^^^^^^^^^
 1->
 2 >    }
-1->Emitted(17, 5) Source(6, 1) + SourceIndex(2) name (c1)
-2 >Emitted(17, 14) Source(6, 2) + SourceIndex(2) name (c1)
+1->Emitted(17, 5) Source(6, 1) + SourceIndex(2)
+2 >Emitted(17, 14) Source(6, 2) + SourceIndex(2)
 ---
 >>>})();
 1 >
@@ -229,8 +229,8 @@ sourceFile:../test.ts
 4 > class c1 {
   >     public p1: number;
   > }
-1 >Emitted(18, 1) Source(6, 1) + SourceIndex(2) name (c1)
-2 >Emitted(18, 2) Source(6, 2) + SourceIndex(2) name (c1)
+1 >Emitted(18, 1) Source(6, 1) + SourceIndex(2)
+2 >Emitted(18, 2) Source(6, 2) + SourceIndex(2)
 3 >Emitted(18, 2) Source(4, 1) + SourceIndex(2)
 4 >Emitted(18, 6) Source(6, 2) + SourceIndex(2)
 ---
@@ -281,11 +281,11 @@ sourceFile:../test.ts
 3 >           
 4 >           instance1
 5 >                    ;
-1->Emitted(21, 5) Source(10, 5) + SourceIndex(2) name (f1)
-2 >Emitted(21, 11) Source(10, 11) + SourceIndex(2) name (f1)
-3 >Emitted(21, 12) Source(10, 12) + SourceIndex(2) name (f1)
-4 >Emitted(21, 21) Source(10, 21) + SourceIndex(2) name (f1)
-5 >Emitted(21, 22) Source(10, 22) + SourceIndex(2) name (f1)
+1->Emitted(21, 5) Source(10, 5) + SourceIndex(2)
+2 >Emitted(21, 11) Source(10, 11) + SourceIndex(2)
+3 >Emitted(21, 12) Source(10, 12) + SourceIndex(2)
+4 >Emitted(21, 21) Source(10, 21) + SourceIndex(2)
+5 >Emitted(21, 22) Source(10, 22) + SourceIndex(2)
 ---
 >>>}
 1 >
@@ -294,7 +294,7 @@ sourceFile:../test.ts
 1 >
   >
 2 >}
-1 >Emitted(22, 1) Source(11, 1) + SourceIndex(2) name (f1)
-2 >Emitted(22, 2) Source(11, 2) + SourceIndex(2) name (f1)
+1 >Emitted(22, 1) Source(11, 1) + SourceIndex(2)
+2 >Emitted(22, 2) Source(11, 2) + SourceIndex(2)
 ---
 >>>//# sourceMappingURL=/tests/cases/projects/outputdir_mixed_subfolder/mapFiles/outAndOutDirFile.js.map

tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/diskFile0.js.map

@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../../outputdir_module_multifolder_ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":";;IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAA;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA"}
+{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../../outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFe,aAAK,QAEpB,CAAA"}

tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/mapRootAbsolutePathModuleMultifolderNoOutdir.sourcemap.txt

@@ -39,7 +39,7 @@ sourceFile:../../../ref/m1.ts
 1->^^^^^^^^
 2 >        ^^->
 1->
-1->Emitted(5, 9) Source(2, 1) + SourceIndex(0) name (m1_c1)
+1->Emitted(5, 9) Source(2, 1) + SourceIndex(0)
 ---
 >>>        }
 1->^^^^^^^^
@@ -49,16 +49,16 @@ sourceFile:../../../ref/m1.ts
   >    public m1_c1_p1: number;
   >
 2 >        }
-1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor)
-2 >Emitted(6, 10) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor)
+1->Emitted(6, 9) Source(4, 1) + SourceIndex(0)
+2 >Emitted(6, 10) Source(4, 2) + SourceIndex(0)
 ---
 >>>        return m1_c1;
 1->^^^^^^^^
 2 >        ^^^^^^^^^^^^
 1->
 2 >        }
-1->Emitted(7, 9) Source(4, 1) + SourceIndex(0) name (m1_c1)
-2 >Emitted(7, 21) Source(4, 2) + SourceIndex(0) name (m1_c1)
+1->Emitted(7, 9) Source(4, 1) + SourceIndex(0)
+2 >Emitted(7, 21) Source(4, 2) + SourceIndex(0)
 ---
 >>>    })();
 1 >^^^^
@@ -72,8 +72,8 @@ sourceFile:../../../ref/m1.ts
 4 >     export class m1_c1 {
   >         public m1_c1_p1: number;
   >     }
-1 >Emitted(8, 5) Source(4, 1) + SourceIndex(0) name (m1_c1)
-2 >Emitted(8, 6) Source(4, 2) + SourceIndex(0) name (m1_c1)
+1 >Emitted(8, 5) Source(4, 1) + SourceIndex(0)
+2 >Emitted(8, 6) Source(4, 2) + SourceIndex(0)
 3 >Emitted(8, 6) Source(2, 1) + SourceIndex(0)
 4 >Emitted(8, 10) Source(4, 2) + SourceIndex(0)
 ---
@@ -138,11 +138,11 @@ sourceFile:../../../ref/m1.ts
 3 >               
 4 >               m1_instance1
 5 >                                   ;
-1->Emitted(12, 9) Source(8, 5) + SourceIndex(0) name (m1_f1)
-2 >Emitted(12, 15) Source(8, 11) + SourceIndex(0) name (m1_f1)
-3 >Emitted(12, 16) Source(8, 12) + SourceIndex(0) name (m1_f1)
-4 >Emitted(12, 36) Source(8, 24) + SourceIndex(0) name (m1_f1)
-5 >Emitted(12, 37) Source(8, 25) + SourceIndex(0) name (m1_f1)
+1->Emitted(12, 9) Source(8, 5) + SourceIndex(0)
+2 >Emitted(12, 15) Source(8, 11) + SourceIndex(0)
+3 >Emitted(12, 16) Source(8, 12) + SourceIndex(0)
+4 >Emitted(12, 36) Source(8, 24) + SourceIndex(0)
+5 >Emitted(12, 37) Source(8, 25) + SourceIndex(0)
 ---
 >>>    }
 1 >^^^^
@@ -151,8 +151,8 @@ sourceFile:../../../ref/m1.ts
 1 >
   >
 2 >    }
-1 >Emitted(13, 5) Source(9, 1) + SourceIndex(0) name (m1_f1)
-2 >Emitted(13, 6) Source(9, 2) + SourceIndex(0) name (m1_f1)
+1 >Emitted(13, 5) Source(9, 1) + SourceIndex(0)
+2 >Emitted(13, 6) Source(9, 2) + SourceIndex(0)
 ---
 >>>    exports.m1_f1 = m1_f1;
 1->^^^^
@@ -212,7 +212,7 @@ sourceFile:../../../outputdir_module_multifolder_ref/m2.ts
 1->^^^^^^^^
 2 >        ^^->
 1->
-1->Emitted(5, 9) Source(2, 1) + SourceIndex(0) name (m2_c1)
+1->Emitted(5, 9) Source(2, 1) + SourceIndex(0)
 ---
 >>>        }
 1->^^^^^^^^
@@ -222,16 +222,16 @@ sourceFile:../../../outputdir_module_multifolder_ref/m2.ts
   >    public m2_c1_p1: number;
   >
 2 >        }
-1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor)
-2 >Emitted(6, 10) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor)
+1->Emitted(6, 9) Source(4, 1) + SourceIndex(0)
+2 >Emitted(6, 10) Source(4, 2) + SourceIndex(0)
 ---
 >>>        return m2_c1;
 1->^^^^^^^^
 2 >        ^^^^^^^^^^^^
 1->
 2 >        }
-1->Emitted(7, 9) Source(4, 1) + SourceIndex(0) name (m2_c1)
-2 >Emitted(7, 21) Source(4, 2) + SourceIndex(0) name (m2_c1)
+1->Emitted(7, 9) Source(4, 1) + SourceIndex(0)
+2 >Emitted(7, 21) Source(4, 2) + SourceIndex(0)
 ---
 >>>    })();
 1 >^^^^
@@ -245,8 +245,8 @@ sourceFile:../../../outputdir_module_multifolder_ref/m2.ts
 4 >     export class m2_c1 {
   >         public m2_c1_p1: number;
   >     }
-1 >Emitted(8, 5) Source(4, 1) + SourceIndex(0) name (m2_c1)
-2 >Emitted(8, 6) Source(4, 2) + SourceIndex(0) name (m2_c1)
+1 >Emitted(8, 5) Source(4, 1) + SourceIndex(0)
+2 >Emitted(8, 6) Source(4, 2) + SourceIndex(0)
 3 >Emitted(8, 6) Source(2, 1) + SourceIndex(0)
 4 >Emitted(8, 10) Source(4, 2) + SourceIndex(0)
 ---
@@ -311,11 +311,11 @@ sourceFile:../../../outputdir_module_multifolder_ref/m2.ts
 3 >               
 4 >               m2_instance1
 5 >                                   ;
-1->Emitted(12, 9) Source(8, 5) + SourceIndex(0) name (m2_f1)
-2 >Emitted(12, 15) Source(8, 11) + SourceIndex(0) name (m2_f1)
-3 >Emitted(12, 16) Source(8, 12) + SourceIndex(0) name (m2_f1)
-4 >Emitted(12, 36) Source(8, 24) + SourceIndex(0) name (m2_f1)
-5 >Emitted(12, 37) Source(8, 25) + SourceIndex(0) name (m2_f1)
+1->Emitted(12, 9) Source(8, 5) + SourceIndex(0)
+2 >Emitted(12, 15) Source(8, 11) + SourceIndex(0)
+3 >Emitted(12, 16) Source(8, 12) + SourceIndex(0)
+4 >Emitted(12, 36) Source(8, 24) + SourceIndex(0)
+5 >Emitted(12, 37) Source(8, 25) + SourceIndex(0)
 ---
 >>>    }
 1 >^^^^
@@ -324,8 +324,8 @@ sourceFile:../../../outputdir_module_multifolder_ref/m2.ts
 1 >
   >
 2 >    }
-1 >Emitted(13, 5) Source(9, 1) + SourceIndex(0) name (m2_f1)
-2 >Emitted(13, 6) Source(9, 2) + SourceIndex(0) name (m2_f1)
+1 >Emitted(13, 5) Source(9, 1) + SourceIndex(0)
+2 >Emitted(13, 6) Source(9, 2) + SourceIndex(0)
 ---
 >>>    exports.m2_f1 = m2_f1;
 1->^^^^
@@ -387,7 +387,7 @@ sourceFile:../../test.ts
 1->^^^^^^^^
 2 >        ^^->
 1->
-1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (c1)
+1->Emitted(5, 9) Source(4, 1) + SourceIndex(0)
 ---
 >>>        }
 1->^^^^^^^^
@@ -397,16 +397,16 @@ sourceFile:../../test.ts
   >    public p1: number;
   >
 2 >        }
-1->Emitted(6, 9) Source(6, 1) + SourceIndex(0) name (c1.constructor)
-2 >Emitted(6, 10) Source(6, 2) + SourceIndex(0) name (c1.constructor)
+1->Emitted(6, 9) Source(6, 1) + SourceIndex(0)
+2 >Emitted(6, 10) Source(6, 2) + SourceIndex(0)
 ---
 >>>        return c1;
 1->^^^^^^^^
 2 >        ^^^^^^^^^
 1->
 2 >        }
-1->Emitted(7, 9) Source(6, 1) + SourceIndex(0) name (c1)
-2 >Emitted(7, 18) Source(6, 2) + SourceIndex(0) name (c1)
+1->Emitted(7, 9) Source(6, 1) + SourceIndex(0)
+2 >Emitted(7, 18) Source(6, 2) + SourceIndex(0)
 ---
 >>>    })();
 1 >^^^^
@@ -420,8 +420,8 @@ sourceFile:../../test.ts
 4 >     export class c1 {
   >         public p1: number;
   >     }
-1 >Emitted(8, 5) Source(6, 1) + SourceIndex(0) name (c1)
-2 >Emitted(8, 6) Source(6, 2) + SourceIndex(0) name (c1)
+1 >Emitted(8, 5) Source(6, 1) + SourceIndex(0)
+2 >Emitted(8, 6) Source(6, 2) + SourceIndex(0)
 3 >Emitted(8, 6) Source(4, 1) + SourceIndex(0)
 4 >Emitted(8, 10) Source(6, 2) + SourceIndex(0)
 ---
@@ -486,11 +486,11 @@ sourceFile:../../test.ts
 3 >               
 4 >               instance1
 5 >                                ;
-1->Emitted(12, 9) Source(10, 5) + SourceIndex(0) name (f1)
-2 >Emitted(12, 15) Source(10, 11) + SourceIndex(0) name (f1)
-3 >Emitted(12, 16) Source(10, 12) + SourceIndex(0) name (f1)
-4 >Emitted(12, 33) Source(10, 21) + SourceIndex(0) name (f1)
-5 >Emitted(12, 34) Source(10, 22) + SourceIndex(0) name (f1)
+1->Emitted(12, 9) Source(10, 5) + SourceIndex(0)
+2 >Emitted(12, 15) Source(10, 11) + SourceIndex(0)
+3 >Emitted(12, 16) Source(10, 12) + SourceIndex(0)
+4 >Emitted(12, 33) Source(10, 21) + SourceIndex(0)
+5 >Emitted(12, 34) Source(10, 22) + SourceIndex(0)
 ---
 >>>    }
 1 >^^^^
@@ -499,8 +499,8 @@ sourceFile:../../test.ts
 1 >
   >
 2 >    }
-1 >Emitted(13, 5) Source(11, 1) + SourceIndex(0) name (f1)
-2 >Emitted(13, 6) Source(11, 2) + SourceIndex(0) name (f1)
+1 >Emitted(13, 5) Source(11, 1) + SourceIndex(0)
+2 >Emitted(13, 6) Source(11, 2) + SourceIndex(0)
 ---
 >>>    exports.f1 = f1;
 1->^^^^

tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/ref/m1.js.map

@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":";;IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAA;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA"}
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../ref/m1.ts"],"names":[],"mappings":";;IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFe,aAAK,QAEpB,CAAA"}

tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/amd/test.js.map

@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":";;IAEW,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../../test.ts"],"names":[],"mappings":";;IAEW,UAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}

tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/diskFile0.js.map

@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../../outputdir_module_multifolder_ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":";AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACIE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,QAEpB,CAAA"}
+{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../../outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFe,aAAK,QAEpB,CAAA"}

tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/mapRootAbsolutePathModuleMultifolderNoOutdir.sourcemap.txt

@@ -38,7 +38,7 @@ sourceFile:../../../ref/m1.ts
 1->^^^^
 2 >    ^^->
 1->
-1->Emitted(4, 5) Source(2, 1) + SourceIndex(0) name (m1_c1)
+1->Emitted(4, 5) Source(2, 1) + SourceIndex(0)
 ---
 >>>    }
 1->^^^^
@@ -48,16 +48,16 @@ sourceFile:../../../ref/m1.ts
   >    public m1_c1_p1: number;
   >
 2 >    }
-1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor)
-2 >Emitted(5, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor)
+1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
+2 >Emitted(5, 6) Source(4, 2) + SourceIndex(0)
 ---
 >>>    return m1_c1;
 1->^^^^
 2 >    ^^^^^^^^^^^^
 1->
 2 >    }
-1->Emitted(6, 5) Source(4, 1) + SourceIndex(0) name (m1_c1)
-2 >Emitted(6, 17) Source(4, 2) + SourceIndex(0) name (m1_c1)
+1->Emitted(6, 5) Source(4, 1) + SourceIndex(0)
+2 >Emitted(6, 17) Source(4, 2) + SourceIndex(0)
 ---
 >>>})();
 1 >
@@ -71,8 +71,8 @@ sourceFile:../../../ref/m1.ts
 4 > export class m1_c1 {
   >     public m1_c1_p1: number;
   > }
-1 >Emitted(7, 1) Source(4, 1) + SourceIndex(0) name (m1_c1)
-2 >Emitted(7, 2) Source(4, 2) + SourceIndex(0) name (m1_c1)
+1 >Emitted(7, 1) Source(4, 1) + SourceIndex(0)
+2 >Emitted(7, 2) Source(4, 2) + SourceIndex(0)
 3 >Emitted(7, 2) Source(2, 1) + SourceIndex(0)
 4 >Emitted(7, 6) Source(4, 2) + SourceIndex(0)
 ---
@@ -137,11 +137,11 @@ sourceFile:../../../ref/m1.ts
 3 >           
 4 >           m1_instance1
 5 >                               ;
-1->Emitted(11, 5) Source(8, 5) + SourceIndex(0) name (m1_f1)
-2 >Emitted(11, 11) Source(8, 11) + SourceIndex(0) name (m1_f1)
-3 >Emitted(11, 12) Source(8, 12) + SourceIndex(0) name (m1_f1)
-4 >Emitted(11, 32) Source(8, 24) + SourceIndex(0) name (m1_f1)
-5 >Emitted(11, 33) Source(8, 25) + SourceIndex(0) name (m1_f1)
+1->Emitted(11, 5) Source(8, 5) + SourceIndex(0)
+2 >Emitted(11, 11) Source(8, 11) + SourceIndex(0)
+3 >Emitted(11, 12) Source(8, 12) + SourceIndex(0)
+4 >Emitted(11, 32) Source(8, 24) + SourceIndex(0)
+5 >Emitted(11, 33) Source(8, 25) + SourceIndex(0)
 ---
 >>>}
 1 >
@@ -150,8 +150,8 @@ sourceFile:../../../ref/m1.ts
 1 >
   >
 2 >}
-1 >Emitted(12, 1) Source(9, 1) + SourceIndex(0) name (m1_f1)
-2 >Emitted(12, 2) Source(9, 2) + SourceIndex(0) name (m1_f1)
+1 >Emitted(12, 1) Source(9, 1) + SourceIndex(0)
+2 >Emitted(12, 2) Source(9, 2) + SourceIndex(0)
 ---
 >>>exports.m1_f1 = m1_f1;
 1->
@@ -210,7 +210,7 @@ sourceFile:../../../outputdir_module_multifolder_ref/m2.ts
 1->^^^^
 2 >    ^^->
 1->
-1->Emitted(4, 5) Source(2, 1) + SourceIndex(0) name (m2_c1)
+1->Emitted(4, 5) Source(2, 1) + SourceIndex(0)
 ---
 >>>    }
 1->^^^^
@@ -220,16 +220,16 @@ sourceFile:../../../outputdir_module_multifolder_ref/m2.ts
   >    public m2_c1_p1: number;
   >
 2 >    }
-1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor)
-2 >Emitted(5, 6) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor)
+1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
+2 >Emitted(5, 6) Source(4, 2) + SourceIndex(0)
 ---
 >>>    return m2_c1;
 1->^^^^
 2 >    ^^^^^^^^^^^^
 1->
 2 >    }
-1->Emitted(6, 5) Source(4, 1) + SourceIndex(0) name (m2_c1)
-2 >Emitted(6, 17) Source(4, 2) + SourceIndex(0) name (m2_c1)
+1->Emitted(6, 5) Source(4, 1) + SourceIndex(0)
+2 >Emitted(6, 17) Source(4, 2) + SourceIndex(0)
 ---
 >>>})();
 1 >
@@ -243,8 +243,8 @@ sourceFile:../../../outputdir_module_multifolder_ref/m2.ts
 4 > export class m2_c1 {
   >     public m2_c1_p1: number;
   > }
-1 >Emitted(7, 1) Source(4, 1) + SourceIndex(0) name (m2_c1)
-2 >Emitted(7, 2) Source(4, 2) + SourceIndex(0) name (m2_c1)
+1 >Emitted(7, 1) Source(4, 1) + SourceIndex(0)
+2 >Emitted(7, 2) Source(4, 2) + SourceIndex(0)
 3 >Emitted(7, 2) Source(2, 1) + SourceIndex(0)
 4 >Emitted(7, 6) Source(4, 2) + SourceIndex(0)
 ---
@@ -309,11 +309,11 @@ sourceFile:../../../outputdir_module_multifolder_ref/m2.ts
 3 >           
 4 >           m2_instance1
 5 >                               ;
-1->Emitted(11, 5) Source(8, 5) + SourceIndex(0) name (m2_f1)
-2 >Emitted(11, 11) Source(8, 11) + SourceIndex(0) name (m2_f1)
-3 >Emitted(11, 12) Source(8, 12) + SourceIndex(0) name (m2_f1)
-4 >Emitted(11, 32) Source(8, 24) + SourceIndex(0) name (m2_f1)
-5 >Emitted(11, 33) Source(8, 25) + SourceIndex(0) name (m2_f1)
+1->Emitted(11, 5) Source(8, 5) + SourceIndex(0)
+2 >Emitted(11, 11) Source(8, 11) + SourceIndex(0)
+3 >Emitted(11, 12) Source(8, 12) + SourceIndex(0)
+4 >Emitted(11, 32) Source(8, 24) + SourceIndex(0)
+5 >Emitted(11, 33) Source(8, 25) + SourceIndex(0)
 ---
 >>>}
 1 >
@@ -322,8 +322,8 @@ sourceFile:../../../outputdir_module_multifolder_ref/m2.ts
 1 >
   >
 2 >}
-1 >Emitted(12, 1) Source(9, 1) + SourceIndex(0) name (m2_f1)
-2 >Emitted(12, 2) Source(9, 2) + SourceIndex(0) name (m2_f1)
+1 >Emitted(12, 1) Source(9, 1) + SourceIndex(0)
+2 >Emitted(12, 2) Source(9, 2) + SourceIndex(0)
 ---
 >>>exports.m2_f1 = m2_f1;
 1->
@@ -431,7 +431,7 @@ sourceFile:../../test.ts
 1->^^^^
 2 >    ^^->
 1->
-1->Emitted(6, 5) Source(4, 1) + SourceIndex(0) name (c1)
+1->Emitted(6, 5) Source(4, 1) + SourceIndex(0)
 ---
 >>>    }
 1->^^^^
@@ -441,16 +441,16 @@ sourceFile:../../test.ts
   >    public p1: number;
   >
 2 >    }
-1->Emitted(7, 5) Source(6, 1) + SourceIndex(0) name (c1.constructor)
-2 >Emitted(7, 6) Source(6, 2) + SourceIndex(0) name (c1.constructor)
+1->Emitted(7, 5) Source(6, 1) + SourceIndex(0)
+2 >Emitted(7, 6) Source(6, 2) + SourceIndex(0)
 ---
 >>>    return c1;
 1->^^^^
 2 >    ^^^^^^^^^
 1->
 2 >    }
-1->Emitted(8, 5) Source(6, 1) + SourceIndex(0) name (c1)
-2 >Emitted(8, 14) Source(6, 2) + SourceIndex(0) name (c1)
+1->Emitted(8, 5) Source(6, 1) + SourceIndex(0)
+2 >Emitted(8, 14) Source(6, 2) + SourceIndex(0)
 ---
 >>>})();
 1 >
@@ -464,8 +464,8 @@ sourceFile:../../test.ts
 4 > export class c1 {
   >     public p1: number;
   > }
-1 >Emitted(9, 1) Source(6, 1) + SourceIndex(0) name (c1)
-2 >Emitted(9, 2) Source(6, 2) + SourceIndex(0) name (c1)
+1 >Emitted(9, 1) Source(6, 1) + SourceIndex(0)
+2 >Emitted(9, 2) Source(6, 2) + SourceIndex(0)
 3 >Emitted(9, 2) Source(4, 1) + SourceIndex(0)
 4 >Emitted(9, 6) Source(6, 2) + SourceIndex(0)
 ---
@@ -530,11 +530,11 @@ sourceFile:../../test.ts
 3 >           
 4 >           instance1
 5 >                            ;
-1->Emitted(13, 5) Source(10, 5) + SourceIndex(0) name (f1)
-2 >Emitted(13, 11) Source(10, 11) + SourceIndex(0) name (f1)
-3 >Emitted(13, 12) Source(10, 12) + SourceIndex(0) name (f1)
-4 >Emitted(13, 29) Source(10, 21) + SourceIndex(0) name (f1)
-5 >Emitted(13, 30) Source(10, 22) + SourceIndex(0) name (f1)
+1->Emitted(13, 5) Source(10, 5) + SourceIndex(0)
+2 >Emitted(13, 11) Source(10, 11) + SourceIndex(0)
+3 >Emitted(13, 12) Source(10, 12) + SourceIndex(0)
+4 >Emitted(13, 29) Source(10, 21) + SourceIndex(0)
+5 >Emitted(13, 30) Source(10, 22) + SourceIndex(0)
 ---
 >>>}
 1 >
@@ -543,8 +543,8 @@ sourceFile:../../test.ts
 1 >
   >
 2 >}
-1 >Emitted(14, 1) Source(11, 1) + SourceIndex(0) name (f1)
-2 >Emitted(14, 2) Source(11, 2) + SourceIndex(0) name (f1)
+1 >Emitted(14, 1) Source(11, 1) + SourceIndex(0)
+2 >Emitted(14, 2) Source(11, 2) + SourceIndex(0)
 ---
 >>>exports.f1 = f1;
 1->

tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/ref/m1.js.map

@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":";AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACIE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,QAEpB,CAAA"}
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../ref/m1.ts"],"names":[],"mappings":";AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFe,aAAK,QAEpB,CAAA"}

tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderNoOutdir/node/test.js.map

@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":";AAAA,IAAO,EAAE,WAAW,QAAQ,CAAC,CAAC;AAC9B,IAAO,EAAE,WAAW,wCAAwC,CAAC,CAAC;AACnD,UAAE,GAAG,EAAE,CAAC;AACnB;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAFY,UAAE,KAEd,CAAA;AAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACIE,MAAMA,CAACA,iBAASA,CAACA;AACrBA,CAACA;AAFe,UAAE,KAEjB,CAAA;AAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../../test.ts"],"names":[],"mappings":";AAAA,IAAO,EAAE,WAAW,QAAQ,CAAC,CAAC;AAC9B,IAAO,EAAE,WAAW,wCAAwC,CAAC,CAAC;AACnD,UAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,UAAE,KAEd,CAAA;AAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFe,UAAE,KAEjB,CAAA;AAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}

tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory.sourcemap.txt

@@ -39,7 +39,7 @@ sourceFile:../../../ref/m1.ts
 1->^^^^^^^^
 2 >        ^^->
 1->
-1->Emitted(5, 9) Source(2, 1) + SourceIndex(0) name (m1_c1)
+1->Emitted(5, 9) Source(2, 1) + SourceIndex(0)
 ---
 >>>        }
 1->^^^^^^^^
@@ -49,16 +49,16 @@ sourceFile:../../../ref/m1.ts
   >    public m1_c1_p1: number;
   >
 2 >        }
-1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor)
-2 >Emitted(6, 10) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor)
+1->Emitted(6, 9) Source(4, 1) + SourceIndex(0)
+2 >Emitted(6, 10) Source(4, 2) + SourceIndex(0)
 ---
 >>>        return m1_c1;
 1->^^^^^^^^
 2 >        ^^^^^^^^^^^^
 1->
 2 >        }
-1->Emitted(7, 9) Source(4, 1) + SourceIndex(0) name (m1_c1)
-2 >Emitted(7, 21) Source(4, 2) + SourceIndex(0) name (m1_c1)
+1->Emitted(7, 9) Source(4, 1) + SourceIndex(0)
+2 >Emitted(7, 21) Source(4, 2) + SourceIndex(0)
 ---
 >>>    })();
 1 >^^^^
@@ -72,8 +72,8 @@ sourceFile:../../../ref/m1.ts
 4 >     export class m1_c1 {
   >         public m1_c1_p1: number;
   >     }
-1 >Emitted(8, 5) Source(4, 1) + SourceIndex(0) name (m1_c1)
-2 >Emitted(8, 6) Source(4, 2) + SourceIndex(0) name (m1_c1)
+1 >Emitted(8, 5) Source(4, 1) + SourceIndex(0)
+2 >Emitted(8, 6) Source(4, 2) + SourceIndex(0)
 3 >Emitted(8, 6) Source(2, 1) + SourceIndex(0)
 4 >Emitted(8, 10) Source(4, 2) + SourceIndex(0)
 ---
@@ -138,11 +138,11 @@ sourceFile:../../../ref/m1.ts
 3 >               
 4 >               m1_instance1
 5 >                                   ;
-1->Emitted(12, 9) Source(8, 5) + SourceIndex(0) name (m1_f1)
-2 >Emitted(12, 15) Source(8, 11) + SourceIndex(0) name (m1_f1)
-3 >Emitted(12, 16) Source(8, 12) + SourceIndex(0) name (m1_f1)
-4 >Emitted(12, 36) Source(8, 24) + SourceIndex(0) name (m1_f1)
-5 >Emitted(12, 37) Source(8, 25) + SourceIndex(0) name (m1_f1)
+1->Emitted(12, 9) Source(8, 5) + SourceIndex(0)
+2 >Emitted(12, 15) Source(8, 11) + SourceIndex(0)
+3 >Emitted(12, 16) Source(8, 12) + SourceIndex(0)
+4 >Emitted(12, 36) Source(8, 24) + SourceIndex(0)
+5 >Emitted(12, 37) Source(8, 25) + SourceIndex(0)
 ---
 >>>    }
 1 >^^^^
@@ -151,8 +151,8 @@ sourceFile:../../../ref/m1.ts
 1 >
   >
 2 >    }
-1 >Emitted(13, 5) Source(9, 1) + SourceIndex(0) name (m1_f1)
-2 >Emitted(13, 6) Source(9, 2) + SourceIndex(0) name (m1_f1)
+1 >Emitted(13, 5) Source(9, 1) + SourceIndex(0)
+2 >Emitted(13, 6) Source(9, 2) + SourceIndex(0)
 ---
 >>>    exports.m1_f1 = m1_f1;
 1->^^^^
@@ -212,7 +212,7 @@ sourceFile:../../../outputdir_module_multifolder_ref/m2.ts
 1->^^^^^^^^
 2 >        ^^->
 1->
-1->Emitted(5, 9) Source(2, 1) + SourceIndex(0) name (m2_c1)
+1->Emitted(5, 9) Source(2, 1) + SourceIndex(0)
 ---
 >>>        }
 1->^^^^^^^^
@@ -222,16 +222,16 @@ sourceFile:../../../outputdir_module_multifolder_ref/m2.ts
   >    public m2_c1_p1: number;
   >
 2 >        }
-1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor)
-2 >Emitted(6, 10) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor)
+1->Emitted(6, 9) Source(4, 1) + SourceIndex(0)
+2 >Emitted(6, 10) Source(4, 2) + SourceIndex(0)
 ---
 >>>        return m2_c1;
 1->^^^^^^^^
 2 >        ^^^^^^^^^^^^
 1->
 2 >        }
-1->Emitted(7, 9) Source(4, 1) + SourceIndex(0) name (m2_c1)
-2 >Emitted(7, 21) Source(4, 2) + SourceIndex(0) name (m2_c1)
+1->Emitted(7, 9) Source(4, 1) + SourceIndex(0)
+2 >Emitted(7, 21) Source(4, 2) + SourceIndex(0)
 ---
 >>>    })();
 1 >^^^^
@@ -245,8 +245,8 @@ sourceFile:../../../outputdir_module_multifolder_ref/m2.ts
 4 >     export class m2_c1 {
   >         public m2_c1_p1: number;
   >     }
-1 >Emitted(8, 5) Source(4, 1) + SourceIndex(0) name (m2_c1)
-2 >Emitted(8, 6) Source(4, 2) + SourceIndex(0) name (m2_c1)
+1 >Emitted(8, 5) Source(4, 1) + SourceIndex(0)
+2 >Emitted(8, 6) Source(4, 2) + SourceIndex(0)
 3 >Emitted(8, 6) Source(2, 1) + SourceIndex(0)
 4 >Emitted(8, 10) Source(4, 2) + SourceIndex(0)
 ---
@@ -311,11 +311,11 @@ sourceFile:../../../outputdir_module_multifolder_ref/m2.ts
 3 >               
 4 >               m2_instance1
 5 >                                   ;
-1->Emitted(12, 9) Source(8, 5) + SourceIndex(0) name (m2_f1)
-2 >Emitted(12, 15) Source(8, 11) + SourceIndex(0) name (m2_f1)
-3 >Emitted(12, 16) Source(8, 12) + SourceIndex(0) name (m2_f1)
-4 >Emitted(12, 36) Source(8, 24) + SourceIndex(0) name (m2_f1)
-5 >Emitted(12, 37) Source(8, 25) + SourceIndex(0) name (m2_f1)
+1->Emitted(12, 9) Source(8, 5) + SourceIndex(0)
+2 >Emitted(12, 15) Source(8, 11) + SourceIndex(0)
+3 >Emitted(12, 16) Source(8, 12) + SourceIndex(0)
+4 >Emitted(12, 36) Source(8, 24) + SourceIndex(0)
+5 >Emitted(12, 37) Source(8, 25) + SourceIndex(0)
 ---
 >>>    }
 1 >^^^^
@@ -324,8 +324,8 @@ sourceFile:../../../outputdir_module_multifolder_ref/m2.ts
 1 >
   >
 2 >    }
-1 >Emitted(13, 5) Source(9, 1) + SourceIndex(0) name (m2_f1)
-2 >Emitted(13, 6) Source(9, 2) + SourceIndex(0) name (m2_f1)
+1 >Emitted(13, 5) Source(9, 1) + SourceIndex(0)
+2 >Emitted(13, 6) Source(9, 2) + SourceIndex(0)
 ---
 >>>    exports.m2_f1 = m2_f1;
 1->^^^^
@@ -387,7 +387,7 @@ sourceFile:../../test.ts
 1->^^^^^^^^
 2 >        ^^->
 1->
-1->Emitted(5, 9) Source(4, 1) + SourceIndex(0) name (c1)
+1->Emitted(5, 9) Source(4, 1) + SourceIndex(0)
 ---
 >>>        }
 1->^^^^^^^^
@@ -397,16 +397,16 @@ sourceFile:../../test.ts
   >    public p1: number;
   >
 2 >        }
-1->Emitted(6, 9) Source(6, 1) + SourceIndex(0) name (c1.constructor)
-2 >Emitted(6, 10) Source(6, 2) + SourceIndex(0) name (c1.constructor)
+1->Emitted(6, 9) Source(6, 1) + SourceIndex(0)
+2 >Emitted(6, 10) Source(6, 2) + SourceIndex(0)
 ---
 >>>        return c1;
 1->^^^^^^^^
 2 >        ^^^^^^^^^
 1->
 2 >        }
-1->Emitted(7, 9) Source(6, 1) + SourceIndex(0) name (c1)
-2 >Emitted(7, 18) Source(6, 2) + SourceIndex(0) name (c1)
+1->Emitted(7, 9) Source(6, 1) + SourceIndex(0)
+2 >Emitted(7, 18) Source(6, 2) + SourceIndex(0)
 ---
 >>>    })();
 1 >^^^^
@@ -420,8 +420,8 @@ sourceFile:../../test.ts
 4 >     export class c1 {
   >         public p1: number;
   >     }
-1 >Emitted(8, 5) Source(6, 1) + SourceIndex(0) name (c1)
-2 >Emitted(8, 6) Source(6, 2) + SourceIndex(0) name (c1)
+1 >Emitted(8, 5) Source(6, 1) + SourceIndex(0)
+2 >Emitted(8, 6) Source(6, 2) + SourceIndex(0)
 3 >Emitted(8, 6) Source(4, 1) + SourceIndex(0)
 4 >Emitted(8, 10) Source(6, 2) + SourceIndex(0)
 ---
@@ -486,11 +486,11 @@ sourceFile:../../test.ts
 3 >               
 4 >               instance1
 5 >                                ;
-1->Emitted(12, 9) Source(10, 5) + SourceIndex(0) name (f1)
-2 >Emitted(12, 15) Source(10, 11) + SourceIndex(0) name (f1)
-3 >Emitted(12, 16) Source(10, 12) + SourceIndex(0) name (f1)
-4 >Emitted(12, 33) Source(10, 21) + SourceIndex(0) name (f1)
-5 >Emitted(12, 34) Source(10, 22) + SourceIndex(0) name (f1)
+1->Emitted(12, 9) Source(10, 5) + SourceIndex(0)
+2 >Emitted(12, 15) Source(10, 11) + SourceIndex(0)
+3 >Emitted(12, 16) Source(10, 12) + SourceIndex(0)
+4 >Emitted(12, 33) Source(10, 21) + SourceIndex(0)
+5 >Emitted(12, 34) Source(10, 22) + SourceIndex(0)
 ---
 >>>    }
 1 >^^^^
@@ -499,8 +499,8 @@ sourceFile:../../test.ts
 1 >
   >
 2 >    }
-1 >Emitted(13, 5) Source(11, 1) + SourceIndex(0) name (f1)
-2 >Emitted(13, 6) Source(11, 2) + SourceIndex(0) name (f1)
+1 >Emitted(13, 5) Source(11, 1) + SourceIndex(0)
+2 >Emitted(13, 6) Source(11, 2) + SourceIndex(0)
 ---
 >>>    exports.f1 = f1;
 1->^^^^

tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/ref/m1.js.map

@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":";;IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAA;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA"}
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../ref/m1.ts"],"names":[],"mappings":";;IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFe,aAAK,QAEpB,CAAA"}

tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder/test.js.map

@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":";;IAEW,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAA;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../../test.ts"],"names":[],"mappings":";;IAEW,UAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}

tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/amd/outdir/simple/outputdir_module_multifolder_ref/m2.js.map

@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../../outputdir_module_multifolder_ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":";;IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAA;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA"}
+{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../../outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";;IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFe,aAAK,QAEpB,CAAA"}

tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory.sourcemap.txt

@@ -38,7 +38,7 @@ sourceFile:../../../ref/m1.ts
 1->^^^^
 2 >    ^^->
 1->
-1->Emitted(4, 5) Source(2, 1) + SourceIndex(0) name (m1_c1)
+1->Emitted(4, 5) Source(2, 1) + SourceIndex(0)
 ---
 >>>    }
 1->^^^^
@@ -48,16 +48,16 @@ sourceFile:../../../ref/m1.ts
   >    public m1_c1_p1: number;
   >
 2 >    }
-1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor)
-2 >Emitted(5, 6) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor)
+1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
+2 >Emitted(5, 6) Source(4, 2) + SourceIndex(0)
 ---
 >>>    return m1_c1;
 1->^^^^
 2 >    ^^^^^^^^^^^^
 1->
 2 >    }
-1->Emitted(6, 5) Source(4, 1) + SourceIndex(0) name (m1_c1)
-2 >Emitted(6, 17) Source(4, 2) + SourceIndex(0) name (m1_c1)
+1->Emitted(6, 5) Source(4, 1) + SourceIndex(0)
+2 >Emitted(6, 17) Source(4, 2) + SourceIndex(0)
 ---
 >>>})();
 1 >
@@ -71,8 +71,8 @@ sourceFile:../../../ref/m1.ts
 4 > export class m1_c1 {
   >     public m1_c1_p1: number;
   > }
-1 >Emitted(7, 1) Source(4, 1) + SourceIndex(0) name (m1_c1)
-2 >Emitted(7, 2) Source(4, 2) + SourceIndex(0) name (m1_c1)
+1 >Emitted(7, 1) Source(4, 1) + SourceIndex(0)
+2 >Emitted(7, 2) Source(4, 2) + SourceIndex(0)
 3 >Emitted(7, 2) Source(2, 1) + SourceIndex(0)
 4 >Emitted(7, 6) Source(4, 2) + SourceIndex(0)
 ---
@@ -137,11 +137,11 @@ sourceFile:../../../ref/m1.ts
 3 >           
 4 >           m1_instance1
 5 >                               ;
-1->Emitted(11, 5) Source(8, 5) + SourceIndex(0) name (m1_f1)
-2 >Emitted(11, 11) Source(8, 11) + SourceIndex(0) name (m1_f1)
-3 >Emitted(11, 12) Source(8, 12) + SourceIndex(0) name (m1_f1)
-4 >Emitted(11, 32) Source(8, 24) + SourceIndex(0) name (m1_f1)
-5 >Emitted(11, 33) Source(8, 25) + SourceIndex(0) name (m1_f1)
+1->Emitted(11, 5) Source(8, 5) + SourceIndex(0)
+2 >Emitted(11, 11) Source(8, 11) + SourceIndex(0)
+3 >Emitted(11, 12) Source(8, 12) + SourceIndex(0)
+4 >Emitted(11, 32) Source(8, 24) + SourceIndex(0)
+5 >Emitted(11, 33) Source(8, 25) + SourceIndex(0)
 ---
 >>>}
 1 >
@@ -150,8 +150,8 @@ sourceFile:../../../ref/m1.ts
 1 >
   >
 2 >}
-1 >Emitted(12, 1) Source(9, 1) + SourceIndex(0) name (m1_f1)
-2 >Emitted(12, 2) Source(9, 2) + SourceIndex(0) name (m1_f1)
+1 >Emitted(12, 1) Source(9, 1) + SourceIndex(0)
+2 >Emitted(12, 2) Source(9, 2) + SourceIndex(0)
 ---
 >>>exports.m1_f1 = m1_f1;
 1->
@@ -210,7 +210,7 @@ sourceFile:../../../outputdir_module_multifolder_ref/m2.ts
 1->^^^^
 2 >    ^^->
 1->
-1->Emitted(4, 5) Source(2, 1) + SourceIndex(0) name (m2_c1)
+1->Emitted(4, 5) Source(2, 1) + SourceIndex(0)
 ---
 >>>    }
 1->^^^^
@@ -220,16 +220,16 @@ sourceFile:../../../outputdir_module_multifolder_ref/m2.ts
   >    public m2_c1_p1: number;
   >
 2 >    }
-1->Emitted(5, 5) Source(4, 1) + SourceIndex(0) name (m2_c1.constructor)
-2 >Emitted(5, 6) Source(4, 2) + SourceIndex(0) name (m2_c1.constructor)
+1->Emitted(5, 5) Source(4, 1) + SourceIndex(0)
+2 >Emitted(5, 6) Source(4, 2) + SourceIndex(0)
 ---
 >>>    return m2_c1;
 1->^^^^
 2 >    ^^^^^^^^^^^^
 1->
 2 >    }
-1->Emitted(6, 5) Source(4, 1) + SourceIndex(0) name (m2_c1)
-2 >Emitted(6, 17) Source(4, 2) + SourceIndex(0) name (m2_c1)
+1->Emitted(6, 5) Source(4, 1) + SourceIndex(0)
+2 >Emitted(6, 17) Source(4, 2) + SourceIndex(0)
 ---
 >>>})();
 1 >
@@ -243,8 +243,8 @@ sourceFile:../../../outputdir_module_multifolder_ref/m2.ts
 4 > export class m2_c1 {
   >     public m2_c1_p1: number;
   > }
-1 >Emitted(7, 1) Source(4, 1) + SourceIndex(0) name (m2_c1)
-2 >Emitted(7, 2) Source(4, 2) + SourceIndex(0) name (m2_c1)
+1 >Emitted(7, 1) Source(4, 1) + SourceIndex(0)
+2 >Emitted(7, 2) Source(4, 2) + SourceIndex(0)
 3 >Emitted(7, 2) Source(2, 1) + SourceIndex(0)
 4 >Emitted(7, 6) Source(4, 2) + SourceIndex(0)
 ---
@@ -309,11 +309,11 @@ sourceFile:../../../outputdir_module_multifolder_ref/m2.ts
 3 >           
 4 >           m2_instance1
 5 >                               ;
-1->Emitted(11, 5) Source(8, 5) + SourceIndex(0) name (m2_f1)
-2 >Emitted(11, 11) Source(8, 11) + SourceIndex(0) name (m2_f1)
-3 >Emitted(11, 12) Source(8, 12) + SourceIndex(0) name (m2_f1)
-4 >Emitted(11, 32) Source(8, 24) + SourceIndex(0) name (m2_f1)
-5 >Emitted(11, 33) Source(8, 25) + SourceIndex(0) name (m2_f1)
+1->Emitted(11, 5) Source(8, 5) + SourceIndex(0)
+2 >Emitted(11, 11) Source(8, 11) + SourceIndex(0)
+3 >Emitted(11, 12) Source(8, 12) + SourceIndex(0)
+4 >Emitted(11, 32) Source(8, 24) + SourceIndex(0)
+5 >Emitted(11, 33) Source(8, 25) + SourceIndex(0)
 ---
 >>>}
 1 >
@@ -322,8 +322,8 @@ sourceFile:../../../outputdir_module_multifolder_ref/m2.ts
 1 >
   >
 2 >}
-1 >Emitted(12, 1) Source(9, 1) + SourceIndex(0) name (m2_f1)
-2 >Emitted(12, 2) Source(9, 2) + SourceIndex(0) name (m2_f1)
+1 >Emitted(12, 1) Source(9, 1) + SourceIndex(0)
+2 >Emitted(12, 2) Source(9, 2) + SourceIndex(0)
 ---
 >>>exports.m2_f1 = m2_f1;
 1->
@@ -431,7 +431,7 @@ sourceFile:../../test.ts
 1->^^^^
 2 >    ^^->
 1->
-1->Emitted(6, 5) Source(4, 1) + SourceIndex(0) name (c1)
+1->Emitted(6, 5) Source(4, 1) + SourceIndex(0)
 ---
 >>>    }
 1->^^^^
@@ -441,16 +441,16 @@ sourceFile:../../test.ts
   >    public p1: number;
   >
 2 >    }
-1->Emitted(7, 5) Source(6, 1) + SourceIndex(0) name (c1.constructor)
-2 >Emitted(7, 6) Source(6, 2) + SourceIndex(0) name (c1.constructor)
+1->Emitted(7, 5) Source(6, 1) + SourceIndex(0)
+2 >Emitted(7, 6) Source(6, 2) + SourceIndex(0)
 ---
 >>>    return c1;
 1->^^^^
 2 >    ^^^^^^^^^
 1->
 2 >    }
-1->Emitted(8, 5) Source(6, 1) + SourceIndex(0) name (c1)
-2 >Emitted(8, 14) Source(6, 2) + SourceIndex(0) name (c1)
+1->Emitted(8, 5) Source(6, 1) + SourceIndex(0)
+2 >Emitted(8, 14) Source(6, 2) + SourceIndex(0)
 ---
 >>>})();
 1 >
@@ -464,8 +464,8 @@ sourceFile:../../test.ts
 4 > export class c1 {
   >     public p1: number;
   > }
-1 >Emitted(9, 1) Source(6, 1) + SourceIndex(0) name (c1)
-2 >Emitted(9, 2) Source(6, 2) + SourceIndex(0) name (c1)
+1 >Emitted(9, 1) Source(6, 1) + SourceIndex(0)
+2 >Emitted(9, 2) Source(6, 2) + SourceIndex(0)
 3 >Emitted(9, 2) Source(4, 1) + SourceIndex(0)
 4 >Emitted(9, 6) Source(6, 2) + SourceIndex(0)
 ---
@@ -530,11 +530,11 @@ sourceFile:../../test.ts
 3 >           
 4 >           instance1
 5 >                            ;
-1->Emitted(13, 5) Source(10, 5) + SourceIndex(0) name (f1)
-2 >Emitted(13, 11) Source(10, 11) + SourceIndex(0) name (f1)
-3 >Emitted(13, 12) Source(10, 12) + SourceIndex(0) name (f1)
-4 >Emitted(13, 29) Source(10, 21) + SourceIndex(0) name (f1)
-5 >Emitted(13, 30) Source(10, 22) + SourceIndex(0) name (f1)
+1->Emitted(13, 5) Source(10, 5) + SourceIndex(0)
+2 >Emitted(13, 11) Source(10, 11) + SourceIndex(0)
+3 >Emitted(13, 12) Source(10, 12) + SourceIndex(0)
+4 >Emitted(13, 29) Source(10, 21) + SourceIndex(0)
+5 >Emitted(13, 30) Source(10, 22) + SourceIndex(0)
 ---
 >>>}
 1 >
@@ -543,8 +543,8 @@ sourceFile:../../test.ts
 1 >
   >
 2 >}
-1 >Emitted(14, 1) Source(11, 1) + SourceIndex(0) name (f1)
-2 >Emitted(14, 2) Source(11, 2) + SourceIndex(0) name (f1)
+1 >Emitted(14, 1) Source(11, 1) + SourceIndex(0)
+2 >Emitted(14, 2) Source(11, 2) + SourceIndex(0)
 ---
 >>>exports.f1 = f1;
 1->

tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/ref/m1.js.map

@@ -1 +1 @@
-{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../ref/m1.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1"],"mappings":";AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACIE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,QAEpB,CAAA"}
+{"version":3,"file":"m1.js","sourceRoot":"","sources":["../../../ref/m1.ts"],"names":[],"mappings":";AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFe,aAAK,QAEpB,CAAA"}

tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder/test.js.map

@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../../test.ts"],"names":["c1","c1.constructor","f1"],"mappings":";AAAA,IAAO,EAAE,WAAW,QAAQ,CAAC,CAAC;AAC9B,IAAO,EAAE,WAAW,wCAAwC,CAAC,CAAC;AACnD,UAAE,GAAG,EAAE,CAAC;AACnB;IAAAA;IAEAC,CAACA;IAADD,SAACA;AAADA,CAACA,AAFD,IAEC;AAFY,UAAE,KAEd,CAAA;AAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACIE,MAAMA,CAACA,iBAASA,CAACA;AACrBA,CAACA;AAFe,UAAE,KAEjB,CAAA;AAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../../test.ts"],"names":[],"mappings":";AAAA,IAAO,EAAE,WAAW,QAAQ,CAAC,CAAC;AAC9B,IAAO,EAAE,WAAW,wCAAwC,CAAC,CAAC;AACnD,UAAE,GAAG,EAAE,CAAC;AACnB;IAAA;IAEA,CAAC;IAAD,SAAC;AAAD,CAAC,AAFD,IAEC;AAFY,UAAE,KAEd,CAAA;AAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;AAChC;IACI,MAAM,CAAC,iBAAS,CAAC;AACrB,CAAC;AAFe,UAAE,KAEjB,CAAA;AAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC;AACd,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}

tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputDirectory/node/outdir/simple/outputdir_module_multifolder_ref/m2.js.map

@@ -1 +1 @@
-{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../../outputdir_module_multifolder_ref/m2.ts"],"names":["m2_c1","m2_c1.constructor","m2_f1"],"mappings":";AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAAA;IAEAC,CAACA;IAADD,YAACA;AAADA,CAACA,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACIE,MAAMA,CAACA,oBAAYA,CAACA;AACxBA,CAACA;AAFe,aAAK,QAEpB,CAAA"}
+{"version":3,"file":"m2.js","sourceRoot":"","sources":["../../../outputdir_module_multifolder_ref/m2.ts"],"names":[],"mappings":";AAAW,aAAK,GAAG,EAAE,CAAC;AACtB;IAAA;IAEA,CAAC;IAAD,YAAC;AAAD,CAAC,AAFD,IAEC;AAFY,aAAK,QAEjB,CAAA;AAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;AACtC;IACI,MAAM,CAAC,oBAAY,CAAC;AACxB,CAAC;AAFe,aAAK,QAEpB,CAAA"}

tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/bin/test.js.map

@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../ref/m1.ts","../../outputdir_module_multifolder_ref/m2.ts","../test.ts"],"names":["m1_c1","m1_c1.constructor","m1_f1","m2_c1","m2_c1.constructor","m2_f1","c1","c1.constructor","f1"],"mappings":";;IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAA;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA;;;;ICRU,aAAK,GAAG,EAAE,CAAC;IACtB;QAAAC;QAEAC,CAACA;QAADD,YAACA;IAADA,CAACA,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACIE,MAAMA,CAACA,oBAAYA,CAACA;IACxBA,CAACA;IAFe,aAAK,QAEpB,CAAA;;;;ICNU,UAAE,GAAG,EAAE,CAAC;IACnB;QAAAC;QAEAC,CAACA;QAADD,SAACA;IAADA,CAACA,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACIE,MAAMA,CAACA,iBAASA,CAACA;IACrBA,CAACA;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../ref/m1.ts","../../outputdir_module_multifolder_ref/m2.ts","../test.ts"],"names":[],"mappings":";;IAAW,aAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFe,aAAK,QAEpB,CAAA;;;;ICRU,aAAK,GAAG,EAAE,CAAC;IACtB;QAAA;QAEA,CAAC;QAAD,YAAC;IAAD,CAAC,AAFD,IAEC;IAFY,aAAK,QAEjB,CAAA;IAEU,oBAAY,GAAG,IAAI,KAAK,EAAE,CAAC;IACtC;QACI,MAAM,CAAC,oBAAY,CAAC;IACxB,CAAC;IAFe,aAAK,QAEpB,CAAA;;;;ICNU,UAAE,GAAG,EAAE,CAAC;IACnB;QAAA;QAEA,CAAC;QAAD,SAAC;IAAD,CAAC,AAFD,IAEC;IAFY,UAAE,KAEd,CAAA;IAEU,iBAAS,GAAG,IAAI,EAAE,EAAE,CAAC;IAChC;QACI,MAAM,CAAC,iBAAS,CAAC;IACrB,CAAC;IAFe,UAAE,KAEjB,CAAA;IAEU,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC;IACd,UAAE,GAAG,EAAE,CAAC,KAAK,CAAC"}

tests/baselines/reference/project/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile/amd/mapRootAbsolutePathModuleMultifolderSpecifyOutputFile.sourcemap.txt

@@ -39,7 +39,7 @@ sourceFile:../ref/m1.ts
 1->^^^^^^^^
 2 >        ^^->
 1->
-1->Emitted(5, 9) Source(2, 1) + SourceIndex(0) name (m1_c1)
+1->Emitted(5, 9) Source(2, 1) + SourceIndex(0)
 ---
 >>>        }
 1->^^^^^^^^
@@ -49,16 +49,16 @@ sourceFile:../ref/m1.ts
   >    public m1_c1_p1: number;
   >
 2 >        }
-1->Emitted(6, 9) Source(4, 1) + SourceIndex(0) name (m1_c1.constructor)
-2 >Emitted(6, 10) Source(4, 2) + SourceIndex(0) name (m1_c1.constructor)
+1->Emitted(6, 9) Source(4, 1) + SourceIndex(0)
+2 >Emitted(6, 10) Source(4, 2) + SourceIndex(0)
 ---
 >>>        return m1_c1;
 1->^^^^^^^^
 2 >        ^^^^^^^^^^^^
 1->
 2 >        }
-1->Emitted(7, 9) Source(4, 1) + SourceIndex(0) name (m1_c1)
-2 >Emitted(7, 21) Source(4, 2) + SourceIndex(0) name (m1_c1)
+1->Emitted(7, 9) Source(4, 1) + SourceIndex(0)
+2 >Emitted(7, 21) Source(4, 2) + SourceIndex(0)
 ---
 >>>    })();
 1 >^^^^
@@ -72,8 +72,8 @@ sourceFile:../ref/m1.ts
 4 >     export class m1_c1 {
   >         public m1_c1_p1: number;
   >     }
-1 >Emitted(8, 5) Source(4, 1) + SourceIndex(0) name (m1_c1)
-2 >Emitted(8, 6) Source(4, 2) + SourceIndex(0) name (m1_c1)
+1 >Emitted(8, 5) Source(4, 1) + SourceIndex(0)
+2 >Emitted(8, 6) Source(4, 2) + SourceIndex(0)
 3 >Emitted(8, 6) Source(2, 1) + SourceIndex(0)
 4 >Emitted(8, 10) Source(4, 2) + SourceIndex(0)
 ---
@@ -138,11 +138,11 @@ sourceFile:../ref/m1.ts
 3 >               
 4 >               m1_instance1
 5 >                                   ;
-1->Emitted(12, 9) Source(8, 5) + SourceIndex(0) name (m1_f1)
-2 >Emitted(12, 15) Source(8, 11) + SourceIndex(0) name (m1_f1)
-3 >Emitted(12, 16) Source(8, 12) + SourceIndex(0) name (m1_f1)
-4 >Emitted(12, 36) Source(8, 24) + SourceIndex(0) name (m1_f1)
-5 >Emitted(12, 37) Source(8, 25) + SourceIndex(0) name (m1_f1)
+1->Emitted(12, 9) Source(8, 5) + SourceIndex(0)
+2 >Emitted(12, 15) Source(8, 11) + SourceIndex(0)
+3 >Emitted(12, 16) Source(8, 12) + SourceIndex(0)
+4 >Emitted(12, 36) Source(8, 24) + SourceIndex(0)
+5 >Emitted(12, 37) Source(8, 25) + SourceIndex(0)
 ---
 >>>    }
 1 >^^^^
@@ -151,8 +151,8 @@ sourceFile:../ref/m1.ts
 1 >
   >
 2 >    }
-1 >Emitted(13, 5) Source(9, 1) + SourceIndex(0) name (m1_f1)
-2 >Emitted(13, 6) Source(9, 2) + SourceIndex(0) name (m1_f1)
+1 >Emitted(13, 5) Source(9, 1) + SourceIndex(0)
+2 >Emitted(13, 6) Source(9, 2) + SourceIndex(0)
 ---
 >>>    exports.m1_f1 = m1_f1;
 1->^^^^
@@ -206,7 +206,7 @@ sourceFile:../../outputdir_module_multifolder_ref/m2.ts
 1->^^^^^^^^
 2 >        ^^->
 1->
-1->Emitted(20, 9) Source(2, 1) + SourceIndex(1) name (m2_c1)
+1->Emitted(20, 9) Source(2, 1) + SourceIndex(1)
 ---
 >>>        }
 1->^^^^^^^^
@@ -216,16 +216,16 @@ sourceFile:../../outputdir_module_multifolder_ref/m2.ts
   >    public m2_c1_p1: number;
   >
 2 >        }
-1->Emitted(21, 9) Source(4, 1) + SourceIndex(1) name (m2_c1.constructor)
-2 >Emitted(21, 10) Source(4, 2) + SourceIndex(1) name (m2_c1.constructor)
+1->Emitted(21, 9) Source(4, 1) + SourceIndex(1)
+2 >Emitted(21, 10) Source(4, 2) + SourceIndex(1)
 ---
 >>>        return m2_c1;
 1->^^^^^^^^
 2 >        ^^^^^^^^^^^^
 1->
 2 >        }
-1->Emitted(22, 9) Source(4, 1) + SourceIndex(1) name (m2_c1)
-2 >Emitted(22, 21) Source(4, 2) + SourceIndex(1) name (m2_c1)
+1->Emitted(22, 9) Source(4, 1) + SourceIndex(1)
+2 >Emitted(22, 21) Source(4, 2) + SourceIndex(1)
 ---
 >>>    })();
 1 >^^^^
@@ -239,8 +239,8 @@ sourceFile:../../outputdir_module_multifolder_ref/m2.ts
 4 >     export class m2_c1 {
   >         public m2_c1_p1: number;
   >     }
-1 >Emitted(23, 5) Source(4, 1) + SourceIndex(1) name (m2_c1)
-2 >Emitted(23, 6) Source(4, 2) + SourceIndex(1) name (m2_c1)
+1 >Emitted(23, 5) Source(4, 1) + SourceIndex(1)
+2 >Emitted(23, 6) Source(4, 2) + SourceIndex(1)
 3 >Emitted(23, 6) Source(2, 1) + SourceIndex(1)
 4 >Emitted(23, 10) Source(4, 2) + SourceIndex(1)
 ---
@@ -305,11 +305,11 @@ sourceFile:../../outputdir_module_multifolder_ref/m2.ts
 3 >               
 4 >               m2_instance1
 5 >                                   ;
-1->Emitted(27, 9) Source(8, 5) + SourceIndex(1) name (m2_f1)
-2 >Emitted(27, 15) Source(8, 11) + SourceIndex(1) name (m2_f1)
-3 >Emitted(27, 16) Source(8, 12) + SourceIndex(1) name (m2_f1)
-4 >Emitted(27, 36) Source(8, 24) + SourceIndex(1) name (m2_f1)
-5 >Emitted(27, 37) Source(8, 25) + SourceIndex(1) name (m2_f1)
+1->Emitted(27, 9) Source(8, 5) + SourceIndex(1)
+2 >Emitted(27, 15) Source(8, 11) + SourceIndex(1)
+3 >Emitted(27, 16) Source(8, 12) + SourceIndex(1)
+4 >Emitted(27, 36) Source(8, 24) + SourceIndex(1)
+5 >Emitted(27, 37) Source(8, 25) + SourceIndex(1)
 ---
 >>>    }
 1 >^^^^
@@ -318,8 +318,8 @@ sourceFile:../../outputdir_module_multifolder_ref/m2.ts
 1 >
   >
 2 >    }
-1 >Emitted(28, 5) Source(9, 1) + SourceIndex(1) name (m2_f1)
-2 >Emitted(28, 6) Source(9, 2) + SourceIndex(1) name (m2_f1)
+1 >Emitted(28, 5) Source(9, 1) + SourceIndex(1)
+2 >Emitted(28, 6) Source(9, 2) + SourceIndex(1)
 ---
 >>>    exports.m2_f1 = m2_f1;
 1->^^^^
@@ -375,7 +375,7 @@ sourceFile:../test.ts
 1->^^^^^^^^
 2 >        ^^->
 1->
-1->Emitted(35, 9) Source(4, 1) + SourceIndex(2) name (c1)
+1->Emitted(35, 9) Source(4, 1) + SourceIndex(2)
 ---
 >>>        }
 1->^^^^^^^^
@@ -385,16 +385,16 @@ sourceFile:../test.ts
   >    public p1: number;
   >
 2 >        }
-1->Emitted(36, 9) Source(6, 1) + SourceIndex(2) name (c1.constructor)
-2 >Emitted(36, 10) Source(6, 2) + SourceIndex(2) name (c1.constructor)
+1->Emitted(36, 9) Source(6, 1) + SourceIndex(2)
+2 >Emitted(36, 10) Source(6, 2) + SourceIndex(2)
 ---
 >>>        return c1;
 1->^^^^^^^^
 2 >        ^^^^^^^^^
 1->
 2 >        }
-1->Emitted(37, 9) Source(6, 1) + SourceIndex(2) name (c1)
-2 >Emitted(37, 18) Source(6, 2) + SourceIndex(2) name (c1)
+1->Emitted(37, 9) Source(6, 1) + SourceIndex(2)
+2 >Emitted(37, 18) Source(6, 2) + SourceIndex(2)
 ---
 >>>    })();
 1 >^^^^
@@ -408,8 +408,8 @@ sourceFile:../test.ts
 4 >     export class c1 {
   >         public p1: number;
   >     }
-1 >Emitted(38, 5) Source(6, 1) + SourceIndex(2) name (c1)
-2 >Emitted(38, 6) Source(6, 2) + SourceIndex(2) name (c1)
+1 >Emitted(38, 5) Source(6, 1) + SourceIndex(2)
+2 >Emitted(38, 6) Source(6, 2) + SourceIndex(2)
 3 >Emitted(38, 6) Source(4, 1) + SourceIndex(2)
 4 >Emitted(38, 10) Source(6, 2) + SourceIndex(2)
 ---
@@ -474,11 +474,11 @@ sourceFile:../test.ts
 3 >               
 4 >               instance1
 5 >                                ;
-1->Emitted(42, 9) Source(10, 5) + SourceIndex(2) name (f1)
-2 >Emitted(42, 15) Source(10, 11) + SourceIndex(2) name (f1)
-3 >Emitted(42, 16) Source(10, 12) + SourceIndex(2) name (f1)
-4 >Emitted(42, 33) Source(10, 21) + SourceIndex(2) name (f1)
-5 >Emitted(42, 34) Source(10, 22) + SourceIndex(2) name (f1)
+1->Emitted(42, 9) Source(10, 5) + SourceIndex(2)
+2 >Emitted(42, 15) Source(10, 11) + SourceIndex(2)
+3 >Emitted(42, 16) Source(10, 12) + SourceIndex(2)
+4 >Emitted(42, 33) Source(10, 21) + SourceIndex(2)
+5 >Emitted(42, 34) Source(10, 22) + SourceIndex(2)
 ---
 >>>    }
 1 >^^^^
@@ -487,8 +487,8 @@ sourceFile:../test.ts
 1 >
   >
 2 >    }
-1 >Emitted(43, 5) Source(11, 1) + SourceIndex(2) name (f1)
-2 >Emitted(43, 6) Source(11, 2) + SourceIndex(2) name (f1)
+1 >Emitted(43, 5) Source(11, 1) + SourceIndex(2)
+2 >Emitted(43, 6) Source(11, 2) + SourceIndex(2)
 ---
 >>>    exports.f1 = f1;
 1->^^^^